Rename SuwLib directories

Rename eclair-mr1 to gingerbread to reflect the min SDK version
change, and full-support to recyclerview to better reflect what's
inside the directory

Also added comments and applied style fixes to keep checkstyle happy.

Test: Existing tests pass
Change-Id: I20332f718f2aae04092d5e45de944b1efce1a596

90 files changed, 92 insertions, 29 deletions

diff --git a/library/Android.mk b/library/Android.mk
index 8333792..6f530cb 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -36,10 +36,10 @@ LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
 LOCAL_MODULE := setup-wizard-lib-gingerbread-compat
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/main/res \
-    $(LOCAL_PATH)/eclair-mr1/res \
-    $(LOCAL_PATH)/full-support/res
+    $(LOCAL_PATH)/gingerbread/res \
+    $(LOCAL_PATH)/recyclerview/res
 LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-java-files-under, main/src eclair-mr1/src full-support/src)
+LOCAL_SRC_FILES := $(call all-java-files-under, main/src gingerbread/src recyclerview/src)
 
 ifdef LOCAL_USE_AAPT2
 
diff --git a/library/common-gingerbread.mk b/library/common-gingerbread.mk
index 3cc58ec..6ced8b0 100644
--- a/library/common-gingerbread.mk
+++ b/library/common-gingerbread.mk
@@ -31,8 +31,8 @@ endif
 ifeq (,$(findstring setup-wizard-lib-gingerbread-compat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
 LOCAL_RESOURCE_DIR += \
     $(suwlib_dir)/main/res \
-    $(suwlib_dir)/eclair-mr1/res \
-    $(suwlib_dir)/full-support/res
+    $(suwlib_dir)/gingerbread/res \
+    $(suwlib_dir)/recyclerview/res
 LOCAL_AAPT_FLAGS += --extra-packages com.android.setupwizardlib
 LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib-gingerbread-compat
 endif
diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow.png b/library/gingerbread/res/drawable-hdpi/suw_navbar_ic_down_arrow.png
index 3d7f83f..3d7f83f 100644
--- a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow.png
+++ b/library/gingerbread/res/drawable-hdpi/suw_navbar_ic_down_arrow.png
diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow.png b/library/gingerbread/res/drawable-hdpi/suw_navbar_ic_left_arrow.png
index decccac..decccac 100644
--- a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow.png
+++ b/library/gingerbread/res/drawable-hdpi/suw_navbar_ic_left_arrow.png
diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow.png b/library/gingerbread/res/drawable-hdpi/suw_navbar_ic_right_arrow.png
index 5ba56b7..5ba56b7 100644
--- a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow.png
+++ b/library/gingerbread/res/drawable-hdpi/suw_navbar_ic_right_arrow.png
diff --git a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back.xml b/library/gingerbread/res/drawable-ldrtl/suw_navbar_ic_back.xml
index e164e8a..e164e8a 100644
--- a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back.xml
+++ b/library/gingerbread/res/drawable-ldrtl/suw_navbar_ic_back.xml
diff --git a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next.xml b/library/gingerbread/res/drawable-ldrtl/suw_navbar_ic_next.xml
index 8a6e137..8a6e137 100644
--- a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next.xml
+++ b/library/gingerbread/res/drawable-ldrtl/suw_navbar_ic_next.xml
diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow.png b/library/gingerbread/res/drawable-mdpi/suw_navbar_ic_down_arrow.png
index 5b1fa06..5b1fa06 100644
--- a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow.png
+++ b/library/gingerbread/res/drawable-mdpi/suw_navbar_ic_down_arrow.png
diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow.png b/library/gingerbread/res/drawable-mdpi/suw_navbar_ic_left_arrow.png
index 1e2984a..1e2984a 100644
--- a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow.png
+++ b/library/gingerbread/res/drawable-mdpi/suw_navbar_ic_left_arrow.png
diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow.png b/library/gingerbread/res/drawable-mdpi/suw_navbar_ic_right_arrow.png
index b8365e6..b8365e6 100644
--- a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow.png
+++ b/library/gingerbread/res/drawable-mdpi/suw_navbar_ic_right_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow.png b/library/gingerbread/res/drawable-xhdpi/suw_navbar_ic_down_arrow.png
index 94016f4..94016f4 100644
--- a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow.png
+++ b/library/gingerbread/res/drawable-xhdpi/suw_navbar_ic_down_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow.png b/library/gingerbread/res/drawable-xhdpi/suw_navbar_ic_left_arrow.png
index 2d2046c..2d2046c 100644
--- a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow.png
+++ b/library/gingerbread/res/drawable-xhdpi/suw_navbar_ic_left_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow.png b/library/gingerbread/res/drawable-xhdpi/suw_navbar_ic_right_arrow.png
index 46abe31..46abe31 100644
--- a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow.png
+++ b/library/gingerbread/res/drawable-xhdpi/suw_navbar_ic_right_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow.png b/library/gingerbread/res/drawable-xxhdpi/suw_navbar_ic_down_arrow.png
index 17811ae..17811ae 100644
--- a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow.png
+++ b/library/gingerbread/res/drawable-xxhdpi/suw_navbar_ic_down_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow.png b/library/gingerbread/res/drawable-xxhdpi/suw_navbar_ic_left_arrow.png
index 97fed92..97fed92 100644
--- a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow.png
+++ b/library/gingerbread/res/drawable-xxhdpi/suw_navbar_ic_left_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow.png b/library/gingerbread/res/drawable-xxhdpi/suw_navbar_ic_right_arrow.png
index f874955..f874955 100644
--- a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow.png
+++ b/library/gingerbread/res/drawable-xxhdpi/suw_navbar_ic_right_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow.png b/library/gingerbread/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow.png
index cb6a422..cb6a422 100644
--- a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow.png
+++ b/library/gingerbread/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow.png b/library/gingerbread/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow.png
index a0ebbb9..a0ebbb9 100644
--- a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow.png
+++ b/library/gingerbread/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow.png
diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow.png b/library/gingerbread/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow.png
index c98b882..c98b882 100644
--- a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow.png
+++ b/library/gingerbread/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow.png
diff --git a/library/eclair-mr1/res/drawable/suw_card_bg_dark.xml b/library/gingerbread/res/drawable/suw_card_bg_dark.xml
index cd115cf..cd115cf 100644
--- a/library/eclair-mr1/res/drawable/suw_card_bg_dark.xml
+++ b/library/gingerbread/res/drawable/suw_card_bg_dark.xml
diff --git a/library/eclair-mr1/res/drawable/suw_card_bg_light.xml b/library/gingerbread/res/drawable/suw_card_bg_light.xml
index cd40dbe..cd40dbe 100644
--- a/library/eclair-mr1/res/drawable/suw_card_bg_light.xml
+++ b/library/gingerbread/res/drawable/suw_card_bg_light.xml
diff --git a/library/eclair-mr1/res/drawable/suw_ic_expand.xml b/library/gingerbread/res/drawable/suw_ic_expand.xml
index 7e79f7d..7e79f7d 100644
--- a/library/eclair-mr1/res/drawable/suw_ic_expand.xml
+++ b/library/gingerbread/res/drawable/suw_ic_expand.xml
diff --git a/library/eclair-mr1/res/drawable/suw_ic_expand_less.xml b/library/gingerbread/res/drawable/suw_ic_expand_less.xml
index e639a61..e639a61 100644
--- a/library/eclair-mr1/res/drawable/suw_ic_expand_less.xml
+++ b/library/gingerbread/res/drawable/suw_ic_expand_less.xml
diff --git a/library/eclair-mr1/res/drawable/suw_ic_expand_more.xml b/library/gingerbread/res/drawable/suw_ic_expand_more.xml
index ed63e21..ed63e21 100644
--- a/library/eclair-mr1/res/drawable/suw_ic_expand_more.xml
+++ b/library/gingerbread/res/drawable/suw_ic_expand_more.xml
diff --git a/library/eclair-mr1/res/drawable/suw_navbar_btn_bg_dark.xml b/library/gingerbread/res/drawable/suw_navbar_btn_bg_dark.xml
index f4131e5..f4131e5 100644
--- a/library/eclair-mr1/res/drawable/suw_navbar_btn_bg_dark.xml
+++ b/library/gingerbread/res/drawable/suw_navbar_btn_bg_dark.xml
diff --git a/library/eclair-mr1/res/drawable/suw_navbar_btn_bg_light.xml b/library/gingerbread/res/drawable/suw_navbar_btn_bg_light.xml
index 5d3bcfa..5d3bcfa 100644
--- a/library/eclair-mr1/res/drawable/suw_navbar_btn_bg_light.xml
+++ b/library/gingerbread/res/drawable/suw_navbar_btn_bg_light.xml
diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_back.xml b/library/gingerbread/res/drawable/suw_navbar_ic_back.xml
index 8a6e137..8a6e137 100644
--- a/library/eclair-mr1/res/drawable/suw_navbar_ic_back.xml
+++ b/library/gingerbread/res/drawable/suw_navbar_ic_back.xml
diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_more.xml b/library/gingerbread/res/drawable/suw_navbar_ic_more.xml
index 603e08d..603e08d 100644
--- a/library/eclair-mr1/res/drawable/suw_navbar_ic_more.xml
+++ b/library/gingerbread/res/drawable/suw_navbar_ic_more.xml
diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_next.xml b/library/gingerbread/res/drawable/suw_navbar_ic_next.xml
index e164e8a..e164e8a 100644
--- a/library/eclair-mr1/res/drawable/suw_navbar_ic_next.xml
+++ b/library/gingerbread/res/drawable/suw_navbar_ic_next.xml
diff --git a/library/eclair-mr1/res/layout/suw_items_expandable_switch.xml b/library/gingerbread/res/layout/suw_items_expandable_switch.xml
index 91e482d..91e482d 100644
--- a/library/eclair-mr1/res/layout/suw_items_expandable_switch.xml
+++ b/library/gingerbread/res/layout/suw_items_expandable_switch.xml
diff --git a/library/eclair-mr1/res/layout/suw_items_switch.xml b/library/gingerbread/res/layout/suw_items_switch.xml
index af326b2..af326b2 100644
--- a/library/eclair-mr1/res/layout/suw_items_switch.xml
+++ b/library/gingerbread/res/layout/suw_items_switch.xml
diff --git a/library/eclair-mr1/res/layout/suw_progress_bar.xml b/library/gingerbread/res/layout/suw_progress_bar.xml
index 35e0faf..35e0faf 100644
--- a/library/eclair-mr1/res/layout/suw_progress_bar.xml
+++ b/library/gingerbread/res/layout/suw_progress_bar.xml
diff --git a/library/eclair-mr1/res/values/attrs.xml b/library/gingerbread/res/values/attrs.xml
index 2a7b5cd..2a7b5cd 100644
--- a/library/eclair-mr1/res/values/attrs.xml
+++ b/library/gingerbread/res/values/attrs.xml
diff --git a/library/eclair-mr1/res/values/dimens.xml b/library/gingerbread/res/values/dimens.xml
index d40d7de..d40d7de 100644
--- a/library/eclair-mr1/res/values/dimens.xml
+++ b/library/gingerbread/res/values/dimens.xml
diff --git a/library/eclair-mr1/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 1ea468d..1ea468d 100644
--- a/library/eclair-mr1/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/items/ExpandableSwitchItem.java b/library/gingerbread/src/com/android/setupwizardlib/items/ExpandableSwitchItem.java
index be9916e..be9916e 100644
--- a/library/eclair-mr1/src/com/android/setupwizardlib/items/ExpandableSwitchItem.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/items/ExpandableSwitchItem.java
diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/items/SwitchItem.java b/library/gingerbread/src/com/android/setupwizardlib/items/SwitchItem.java
index 604e47f..7459d77 100644
--- a/library/eclair-mr1/src/com/android/setupwizardlib/items/SwitchItem.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/items/SwitchItem.java
@@ -33,17 +33,35 @@ import com.android.setupwizardlib.R;
  */
 public class SwitchItem extends Item implements CompoundButton.OnCheckedChangeListener {
 
+    /**
+     * Listener for check state changes of this switch item.
+     */
     public interface OnCheckedChangeListener {
+
+        /**
+         * Callback when checked state of a {@link SwitchItem} is changed.
+         *
+         * @see #setOnCheckedChangeListener(OnCheckedChangeListener)
+         */
         void onCheckedChange(SwitchItem item, boolean isChecked);
     }
 
     private boolean mChecked = false;
     private OnCheckedChangeListener mListener;
 
+    /**
+     * Creates a default switch item.
+     */
     public SwitchItem() {
         super();
     }
 
+    /**
+     * Creates a switch item. This constructor is used for inflation from XML.
+     *
+     * @param context The context which this item is inflated in.
+     * @param attrs The XML attributes defined on the item.
+     */
     public SwitchItem(Context context, AttributeSet attrs) {
         super(context, attrs);
         final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SuwSwitchItem);
@@ -51,6 +69,9 @@ public class SwitchItem extends Item implements CompoundButton.OnCheckedChangeLi
         a.recycle();
     }
 
+    /**
+     * Sets whether this item should be checked.
+     */
     public void setChecked(boolean checked) {
         if (mChecked != checked) {
             mChecked = checked;
@@ -61,6 +82,9 @@ public class SwitchItem extends Item implements CompoundButton.OnCheckedChangeLi
         }
     }
 
+    /**
+     * @return True if this switch item is currently checked.
+     */
     public boolean isChecked() {
         return mChecked;
     }
@@ -91,6 +115,10 @@ public class SwitchItem extends Item implements CompoundButton.OnCheckedChangeLi
         switchView.setEnabled(isEnabled());
     }
 
+    /**
+     * Sets a listener to listen for changes in checked state. This listener is invoked in both
+     * user toggling the switch and calls to {@link #setChecked(boolean)}.
+     */
     public void setOnCheckedChangeListener(OnCheckedChangeListener listener) {
         mListener = listener;
     }
diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
index e6fa497..e6fa497 100644
--- a/library/eclair-mr1/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
index 35e7050..5172c47 100644
--- a/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java
@@ -26,6 +26,10 @@ import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.Button;
 
+/**
+ * Button for navigation bar, which includes tinting of its compound drawables to be used for dark
+ * and light themes.
+ */
 public class NavigationBarButton extends Button {
 
     public NavigationBarButton(Context context) {
@@ -120,7 +124,7 @@ public class NavigationBarButton extends Button {
 
         private ColorStateList mTintList = null;
 
-        public TintedDrawable(Drawable wrapped) {
+        TintedDrawable(Drawable wrapped) {
             super(new Drawable[] { wrapped });
         }
 
diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/view/RichTextView.java b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
index 6ccedf0..6ccedf0 100644
--- a/library/eclair-mr1/src/com/android/setupwizardlib/view/RichTextView.java
+++ b/library/gingerbread/src/com/android/setupwizardlib/view/RichTextView.java
diff --git a/library/eclair-mr1/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
index 74d3be6..74d3be6 100644
--- a/library/eclair-mr1/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
+++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
diff --git a/library/eclair-mr1/test/instrumentation/src/com/android/setupwizardlib/test/LinkAccessibilityHelperTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/LinkAccessibilityHelperTest.java
index a1d01fd..a1d01fd 100644
--- a/library/eclair-mr1/test/instrumentation/src/com/android/setupwizardlib/test/LinkAccessibilityHelperTest.java
+++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/LinkAccessibilityHelperTest.java
diff --git a/library/eclair-mr1/test/instrumentation/src/com/android/setupwizardlib/test/RichTextViewTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/RichTextViewTest.java
index 2e2b01e..2e2b01e 100644
--- a/library/eclair-mr1/test/instrumentation/src/com/android/setupwizardlib/test/RichTextViewTest.java
+++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/RichTextViewTest.java
diff --git a/library/eclair-mr1/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestActivity.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestActivity.java
index 154339a..154339a 100644
--- a/library/eclair-mr1/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestActivity.java
+++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/test/util/DrawingTestActivity.java
diff --git a/library/eclair-mr1/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
index 0ae0737..0ae0737 100644
--- a/library/eclair-mr1/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java
diff --git a/library/eclair-mr1/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
index d391d80..d391d80 100644
--- a/library/eclair-mr1/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
+++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 96712f7..7853ef3 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -116,7 +116,7 @@
     <dimen name="suw_items_preferred_height">56dp</dimen>
 
     <!-- Navigation bar -->
-    <!-- TODO: Move this dimen to eclair-mr1, or see if it should be in platform style as well -->
+    <!-- TODO: Move this dimen to gingerbread, or see if it should be in platform style as well -->
     <dimen name="suw_navbar_button_drawable_padding" tools:ignore="UnusedResources">6dp</dimen>
     <dimen name="suw_navbar_button_padding_sides">10dp</dimen>
     <dimen name="suw_navbar_height">56dp</dimen>
diff --git a/library/full-support/res/layout/suw_glif_preference_recycler_view.xml b/library/recyclerview/res/layout/suw_glif_preference_recycler_view.xml
index af00160..af00160 100644
--- a/library/full-support/res/layout/suw_glif_preference_recycler_view.xml
+++ b/library/recyclerview/res/layout/suw_glif_preference_recycler_view.xml
diff --git a/library/full-support/res/layout/suw_glif_preference_template_header.xml b/library/recyclerview/res/layout/suw_glif_preference_template_header.xml
index b870251..b870251 100644
--- a/library/full-support/res/layout/suw_glif_preference_template_header.xml
+++ b/library/recyclerview/res/layout/suw_glif_preference_template_header.xml
diff --git a/library/full-support/res/layout/suw_glif_recycler_template_card.xml b/library/recyclerview/res/layout/suw_glif_recycler_template_card.xml
index 7b5c6b0..7b5c6b0 100644
--- a/library/full-support/res/layout/suw_glif_recycler_template_card.xml
+++ b/library/recyclerview/res/layout/suw_glif_recycler_template_card.xml
diff --git a/library/full-support/res/layout/suw_glif_recycler_template_compact.xml b/library/recyclerview/res/layout/suw_glif_recycler_template_compact.xml
index 9081efb..9081efb 100644
--- a/library/full-support/res/layout/suw_glif_recycler_template_compact.xml
+++ b/library/recyclerview/res/layout/suw_glif_recycler_template_compact.xml
diff --git a/library/full-support/res/layout/suw_glif_recycler_template_content.xml b/library/recyclerview/res/layout/suw_glif_recycler_template_content.xml
index e8d209b..e8d209b 100644
--- a/library/full-support/res/layout/suw_glif_recycler_template_content.xml
+++ b/library/recyclerview/res/layout/suw_glif_recycler_template_content.xml
diff --git a/library/full-support/res/layout/suw_preference_recycler_view_header.xml b/library/recyclerview/res/layout/suw_preference_recycler_view_header.xml
index 20e1d19..20e1d19 100644
--- a/library/full-support/res/layout/suw_preference_recycler_view_header.xml
+++ b/library/recyclerview/res/layout/suw_preference_recycler_view_header.xml
diff --git a/library/full-support/res/layout/suw_preference_recycler_view_normal.xml b/library/recyclerview/res/layout/suw_preference_recycler_view_normal.xml
index 0979d91..0979d91 100644
--- a/library/full-support/res/layout/suw_preference_recycler_view_normal.xml
+++ b/library/recyclerview/res/layout/suw_preference_recycler_view_normal.xml
diff --git a/library/full-support/res/layout/suw_preference_template_header.xml b/library/recyclerview/res/layout/suw_preference_template_header.xml
index 6377616..6377616 100644
--- a/library/full-support/res/layout/suw_preference_template_header.xml
+++ b/library/recyclerview/res/layout/suw_preference_template_header.xml
diff --git a/library/full-support/res/layout/suw_recycler_template_card.xml b/library/recyclerview/res/layout/suw_recycler_template_card.xml
index 1d7b143..1d7b143 100644
--- a/library/full-support/res/layout/suw_recycler_template_card.xml
+++ b/library/recyclerview/res/layout/suw_recycler_template_card.xml
diff --git a/library/full-support/res/layout/suw_recycler_template_card_wide.xml b/library/recyclerview/res/layout/suw_recycler_template_card_wide.xml
index e5e876f..e5e876f 100644
--- a/library/full-support/res/layout/suw_recycler_template_card_wide.xml
+++ b/library/recyclerview/res/layout/suw_recycler_template_card_wide.xml
diff --git a/library/full-support/res/layout/suw_recycler_template_header.xml b/library/recyclerview/res/layout/suw_recycler_template_header.xml
index d2c9622..d2c9622 100644
--- a/library/full-support/res/layout/suw_recycler_template_header.xml
+++ b/library/recyclerview/res/layout/suw_recycler_template_header.xml
diff --git a/library/full-support/res/layout/suw_recycler_template_header_collapsed.xml b/library/recyclerview/res/layout/suw_recycler_template_header_collapsed.xml
index 1960f0d..1960f0d 100644
--- a/library/full-support/res/layout/suw_recycler_template_header_collapsed.xml
+++ b/library/recyclerview/res/layout/suw_recycler_template_header_collapsed.xml
diff --git a/library/full-support/res/values-land/layouts.xml b/library/recyclerview/res/values-land/layouts.xml
index 3aacec9..3aacec9 100644
--- a/library/full-support/res/values-land/layouts.xml
+++ b/library/recyclerview/res/values-land/layouts.xml
diff --git a/library/full-support/res/values-sw600dp-land/layouts.xml b/library/recyclerview/res/values-sw600dp-land/layouts.xml
index 0feed90..0feed90 100644
--- a/library/full-support/res/values-sw600dp-land/layouts.xml
+++ b/library/recyclerview/res/values-sw600dp-land/layouts.xml
diff --git a/library/full-support/res/values-sw600dp/layouts.xml b/library/recyclerview/res/values-sw600dp/layouts.xml
index bfd4863..bfd4863 100644
--- a/library/full-support/res/values-sw600dp/layouts.xml
+++ b/library/recyclerview/res/values-sw600dp/layouts.xml
diff --git a/library/full-support/res/values/attrs.xml b/library/recyclerview/res/values/attrs.xml
index e4fb41f..e4fb41f 100644
--- a/library/full-support/res/values/attrs.xml
+++ b/library/recyclerview/res/values/attrs.xml
diff --git a/library/full-support/res/values/layouts.xml b/library/recyclerview/res/values/layouts.xml
index f0b1e9d..f0b1e9d 100644
--- a/library/full-support/res/values/layouts.xml
+++ b/library/recyclerview/res/values/layouts.xml
diff --git a/library/full-support/src/com/android/setupwizardlib/DividerItemDecoration.java b/library/recyclerview/src/com/android/setupwizardlib/DividerItemDecoration.java
index bbd7b50..13010ba 100644
--- a/library/full-support/src/com/android/setupwizardlib/DividerItemDecoration.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/DividerItemDecoration.java
@@ -42,6 +42,10 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
 
     /* static section */
 
+    /**
+     * An interface to be implemented by a {@link RecyclerView.ViewHolder} which controls whether
+     * dividers should be shown above and below that item.
+     */
     public interface DividedViewHolder {
 
         /**
diff --git a/library/full-support/src/com/android/setupwizardlib/GlifPreferenceLayout.java b/library/recyclerview/src/com/android/setupwizardlib/GlifPreferenceLayout.java
index d337e84..d337e84 100644
--- a/library/full-support/src/com/android/setupwizardlib/GlifPreferenceLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/GlifPreferenceLayout.java
diff --git a/library/full-support/src/com/android/setupwizardlib/GlifRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
index d1a7947..d1a7947 100644
--- a/library/full-support/src/com/android/setupwizardlib/GlifRecyclerLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/GlifRecyclerLayout.java
diff --git a/library/full-support/src/com/android/setupwizardlib/SetupWizardPreferenceLayout.java b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardPreferenceLayout.java
index f0df24c..6570694 100644
--- a/library/full-support/src/com/android/setupwizardlib/SetupWizardPreferenceLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardPreferenceLayout.java
@@ -59,8 +59,7 @@ import com.android.setupwizardlib.template.RecyclerMixin;
  * }</pre>
  *
  * <p />Fragments using this layout <em>must</em> delegate {@code onCreateRecyclerView} to the
- * implementation in this class:
- * {@link #onCreateRecyclerView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)}
+ * implementation in this class: {@link #onCreateRecyclerView}
  */
 public class SetupWizardPreferenceLayout extends SetupWizardRecyclerLayout {
 
diff --git a/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
index 870a805..870a805 100644
--- a/library/full-support/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/SetupWizardRecyclerLayout.java
diff --git a/library/full-support/src/com/android/setupwizardlib/items/ItemViewHolder.java b/library/recyclerview/src/com/android/setupwizardlib/items/ItemViewHolder.java
index 8f89603..231f81d 100644
--- a/library/full-support/src/com/android/setupwizardlib/items/ItemViewHolder.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/items/ItemViewHolder.java
@@ -27,7 +27,7 @@ class ItemViewHolder extends RecyclerView.ViewHolder
     private boolean mIsEnabled;
     private IItem mItem;
 
-    public ItemViewHolder(View itemView) {
+    ItemViewHolder(View itemView) {
         super(itemView);
     }
 
diff --git a/library/full-support/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java b/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java
index 9b7f6c3..a676c60 100644
--- a/library/full-support/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/items/RecyclerItemAdapter.java
@@ -46,7 +46,16 @@ public class RecyclerItemAdapter extends RecyclerView.Adapter<ItemViewHolder>
      */
     public static final String TAG_NO_BACKGROUND = "noBackground";
 
+    /**
+     * Listener for item selection in this adapter.
+     */
     public interface OnItemSelectedListener {
+
+        /**
+         * Called when an item in this adapter is clicked.
+         *
+         * @param item The Item corresponding to the position being clicked.
+         */
         void onItemSelected(IItem item);
     }
 
@@ -58,6 +67,11 @@ public class RecyclerItemAdapter extends RecyclerView.Adapter<ItemViewHolder>
         mItemHierarchy.registerObserver(this);
     }
 
+    /**
+     * Gets the item at the given position.
+     *
+     * @see ItemHierarchy#getItemAt(int)
+     */
     public IItem getItem(int position) {
         return mItemHierarchy.getItemAt(position);
     }
@@ -177,14 +191,27 @@ public class RecyclerItemAdapter extends RecyclerView.Adapter<ItemViewHolder>
         notifyItemRangeRemoved(positionStart, itemCount);
     }
 
+    /**
+     * Find an item hierarchy within the root hierarchy.
+     *
+     * @see ItemHierarchy#findItemById(int)
+     */
     public ItemHierarchy findItemById(int id) {
         return mItemHierarchy.findItemById(id);
     }
 
+    /**
+     * Gets the root item hierarchy in this adapter.
+     */
     public ItemHierarchy getRootItemHierarchy() {
         return mItemHierarchy;
     }
 
+    /**
+     * Sets the listener to listen for when user clicks on a item.
+     *
+     * @see OnItemSelectedListener
+     */
     public void setOnItemSelectedListener(OnItemSelectedListener listener) {
         mListener = listener;
     }
diff --git a/library/full-support/src/com/android/setupwizardlib/template/RecyclerMixin.java b/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerMixin.java
index 56751d4..56751d4 100644
--- a/library/full-support/src/com/android/setupwizardlib/template/RecyclerMixin.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerMixin.java
diff --git a/library/full-support/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegate.java b/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegate.java
index 41fb03e..41fb03e 100644
--- a/library/full-support/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegate.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegate.java
diff --git a/library/full-support/src/com/android/setupwizardlib/view/HeaderRecyclerView.java b/library/recyclerview/src/com/android/setupwizardlib/view/HeaderRecyclerView.java
index 09ddd33..cf13d01 100644
--- a/library/full-support/src/com/android/setupwizardlib/view/HeaderRecyclerView.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/view/HeaderRecyclerView.java
@@ -16,7 +16,6 @@
 
 package com.android.setupwizardlib.view;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
@@ -41,7 +40,7 @@ public class HeaderRecyclerView extends RecyclerView {
     private static class HeaderViewHolder extends ViewHolder
             implements DividerItemDecoration.DividedViewHolder {
 
-        public HeaderViewHolder(View itemView) {
+        HeaderViewHolder(View itemView) {
             super(itemView);
         }
 
@@ -119,23 +118,18 @@ public class HeaderRecyclerView extends RecyclerView {
             setHasStableIds(mAdapter.hasStableIds());
         }
 
-        @SuppressLint("InlinedApi")  // MATCH_PARENT is the same constant as FILL_PARENT available
-                                     // on earlier versions.
         @Override
         public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            /*
-             * Returning the same view (mHeader) results in crash ".. but view is not a real child."
-             * The framework creates more than one instance of header because of "disappear"
-             * animations applied on the header and this necessitates creation of another headerview
-             * to use after the animation. We work around this restriction by returning an empty
-             * framelayout to which the header is attached using #onBindViewHolder method.
-             */
+            // Returning the same view (mHeader) results in crash ".. but view is not a real child."
+            // The framework creates more than one instance of header because of "disappear"
+            // animations applied on the header and this necessitates creation of another header
+            // view to use after the animation. We work around this restriction by returning an
+            // empty FrameLayout to which the header is attached using #onBindViewHolder method.
             if (viewType == HEADER_VIEW_TYPE) {
                 FrameLayout frameLayout = new FrameLayout(parent.getContext());
                 FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                    FrameLayout.LayoutParams.MATCH_PARENT,
-                    FrameLayout.LayoutParams.WRAP_CONTENT
-                );
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        FrameLayout.LayoutParams.WRAP_CONTENT);
                 frameLayout.setLayoutParams(params);
                 return new HeaderViewHolder(frameLayout);
             } else {
diff --git a/library/full-support/src/com/android/setupwizardlib/view/StickyHeaderRecyclerView.java b/library/recyclerview/src/com/android/setupwizardlib/view/StickyHeaderRecyclerView.java
index a733b6c..d51ea56 100644
--- a/library/full-support/src/com/android/setupwizardlib/view/StickyHeaderRecyclerView.java
+++ b/library/recyclerview/src/com/android/setupwizardlib/view/StickyHeaderRecyclerView.java
@@ -79,6 +79,10 @@ public class StickyHeaderRecyclerView extends HeaderRecyclerView {
         }
     }
 
+    /**
+     * Call this method when the "sticky" view has changed, so this view can update its internal
+     * states as well.
+     */
     public void updateStickyView() {
         final View header = getHeader();
         if (header != null) {
diff --git a/library/full-support/test/instrumentation/res/layout/test_glif_recycler_layout.xml b/library/recyclerview/test/instrumentation/res/layout/test_glif_recycler_layout.xml
index 45a3928..45a3928 100644
--- a/library/full-support/test/instrumentation/res/layout/test_glif_recycler_layout.xml
+++ b/library/recyclerview/test/instrumentation/res/layout/test_glif_recycler_layout.xml
diff --git a/library/full-support/test/instrumentation/res/layout/test_list_item.xml b/library/recyclerview/test/instrumentation/res/layout/test_list_item.xml
index 220067d..220067d 100644
--- a/library/full-support/test/instrumentation/res/layout/test_list_item.xml
+++ b/library/recyclerview/test/instrumentation/res/layout/test_list_item.xml
diff --git a/library/full-support/test/instrumentation/res/layout/test_list_item_no_background.xml b/library/recyclerview/test/instrumentation/res/layout/test_list_item_no_background.xml
index 0968e92..0968e92 100644
--- a/library/full-support/test/instrumentation/res/layout/test_list_item_no_background.xml
+++ b/library/recyclerview/test/instrumentation/res/layout/test_list_item_no_background.xml
diff --git a/library/full-support/test/instrumentation/res/layout/test_recycler_layout.xml b/library/recyclerview/test/instrumentation/res/layout/test_recycler_layout.xml
index 8b7602e..8b7602e 100644
--- a/library/full-support/test/instrumentation/res/layout/test_recycler_layout.xml
+++ b/library/recyclerview/test/instrumentation/res/layout/test_recycler_layout.xml
diff --git a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/items/RecyclerItemAdapterTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/items/RecyclerItemAdapterTest.java
index 3867bfe..3867bfe 100644
--- a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/items/RecyclerItemAdapterTest.java
+++ b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/items/RecyclerItemAdapterTest.java
diff --git a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/template/RecyclerMixinTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/template/RecyclerMixinTest.java
index 79105d6..79105d6 100644
--- a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/template/RecyclerMixinTest.java
+++ b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/template/RecyclerMixinTest.java
diff --git a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/DividerItemDecorationTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/DividerItemDecorationTest.java
index 747d1ba..747d1ba 100644
--- a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/DividerItemDecorationTest.java
+++ b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/DividerItemDecorationTest.java
diff --git a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/GlifPreferenceLayoutTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifPreferenceLayoutTest.java
index 791e11f..791e11f 100644
--- a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/GlifPreferenceLayoutTest.java
+++ b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifPreferenceLayoutTest.java
diff --git a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/GlifRecyclerLayoutTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifRecyclerLayoutTest.java
index b27564d..b27564d 100644
--- a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/GlifRecyclerLayoutTest.java
+++ b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/GlifRecyclerLayoutTest.java
diff --git a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/HeaderRecyclerViewTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/HeaderRecyclerViewTest.java
index d9f52cd..d9f52cd 100644
--- a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/HeaderRecyclerViewTest.java
+++ b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/HeaderRecyclerViewTest.java
diff --git a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardPreferenceLayoutTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardPreferenceLayoutTest.java
index 486d2cf..486d2cf 100644
--- a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardPreferenceLayoutTest.java
+++ b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardPreferenceLayoutTest.java
diff --git a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardRecyclerLayoutTest.java b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardRecyclerLayoutTest.java
index 4a72992..4a72992 100644
--- a/library/full-support/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardRecyclerLayoutTest.java
+++ b/library/recyclerview/test/instrumentation/src/com/android/setupwizardlib/test/SetupWizardRecyclerLayoutTest.java
diff --git a/library/full-support/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
index b509389..b509389 100644
--- a/library/full-support/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
+++ b/library/recyclerview/test/robotest/src/com/android/setupwizardlib/template/RecyclerViewScrollHandlingDelegateTest.java
diff --git a/library/rules.gradle b/library/rules.gradle
index a3868cc..6b0acce 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -63,8 +63,8 @@ android {
         }
 
         gingerbreadCompat {
-            java.srcDirs = ['eclair-mr1/src', 'full-support/src']
-            res.srcDirs = ['eclair-mr1/res', 'full-support/res']
+            java.srcDirs = ['gingerbread/src', 'recyclerview/src']
+            res.srcDirs = ['gingerbread/res', 'recyclerview/res']
         }
     }
 }
diff --git a/library/self.gradle b/library/self.gradle
index f6d14af..fe68744 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -25,8 +25,11 @@ android.sourceSets {
     }
 
     androidTestGingerbreadCompat {
-        java.srcDirs = ['full-support/test/instrumentation/src', 'eclair-mr1/test/instrumentation/src']
-        res.srcDirs = ['full-support/test/instrumentation/res']
+        java.srcDirs = [
+            'gingerbread/test/instrumentation/src',
+            'recyclerview/test/instrumentation/src'
+        ]
+        res.srcDirs = ['recyclerview/test/instrumentation/res']
     }
 
     test {
@@ -43,7 +46,7 @@ android.sourceSets {
     }
 
     testGingerbreadCompat {
-        java.srcDirs = ['eclair-mr1/test/robotest/src', 'full-support/test/robotest/src']
+        java.srcDirs = ['gingerbread/test/robotest/src', 'recyclerview/test/robotest/src']
     }
 }
 android.defaultConfig.testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"