am 2646e1d8: [SetupWizardLib] Changed project hierarchy

* commit '2646e1d82ec6d133b35b775f044e156fca6d9d75':
  [SetupWizardLib] Changed project hierarchy

85 files changed, 9 insertions, 8 deletions

diff --git a/library/Android.mk b/library/Android.mk
index 1c43edb..cd5462c 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -2,8 +2,9 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SDK_VERSION := current
+LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
 LOCAL_MODULE := setup-wizard-lib
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/main/res
+LOCAL_SRC_FILES := $(call all-java-files-under, main/src)
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/library/build.gradle b/library/build.gradle
index 9d0a4bc..1076110 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -7,10 +7,10 @@ android {
 
     sourceSets {
         main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            res.srcDirs = ['res']
+            manifest.srcFile 'main/AndroidManifest.xml'
+            java.srcDirs = ['main/src']
+            resources.srcDirs = ['main/src']
+            res.srcDirs = ['main/res']
         }
 
         productFlavors {
@@ -29,7 +29,7 @@ android {
         }
 
         icsCompat {
-            res.srcDirs = ['res-ics']
+            res.srcDirs = ['ics/res']
         }
 
         androidTest {
diff --git a/library/common.mk b/library/common.mk
index 6a62ead..fcf0ae2 100644
--- a/library/common.mk
+++ b/library/common.mk
@@ -12,6 +12,6 @@
 #   include frameworks/opt/setupwizard/library/common.mk
 #
 
-LOCAL_RESOURCE_DIR += $(call my-dir)/res
+LOCAL_RESOURCE_DIR += $(call my-dir)/main/res
 LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.setupwizardlib
 LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib
diff --git a/library/res-ics/drawable-hdpi/suw_navbar_ic_left_arrow_dark.png b/library/ics/res/drawable-hdpi/suw_navbar_ic_left_arrow_dark.png
index 9ef990a..9ef990a 100644
--- a/library/res-ics/drawable-hdpi/suw_navbar_ic_left_arrow_dark.png
+++ b/library/ics/res/drawable-hdpi/suw_navbar_ic_left_arrow_dark.png
diff --git a/library/res-ics/drawable-hdpi/suw_navbar_ic_left_arrow_light.png b/library/ics/res/drawable-hdpi/suw_navbar_ic_left_arrow_light.png
index 1364d5c..1364d5c 100644
--- a/library/res-ics/drawable-hdpi/suw_navbar_ic_left_arrow_light.png
+++ b/library/ics/res/drawable-hdpi/suw_navbar_ic_left_arrow_light.png
diff --git a/library/res-ics/drawable-hdpi/suw_navbar_ic_right_arrow_dark.png b/library/ics/res/drawable-hdpi/suw_navbar_ic_right_arrow_dark.png
index 5df1343..5df1343 100644
--- a/library/res-ics/drawable-hdpi/suw_navbar_ic_right_arrow_dark.png
+++ b/library/ics/res/drawable-hdpi/suw_navbar_ic_right_arrow_dark.png
diff --git a/library/res-ics/drawable-hdpi/suw_navbar_ic_right_arrow_light.png b/library/ics/res/drawable-hdpi/suw_navbar_ic_right_arrow_light.png
index ff7a66e..ff7a66e 100644
--- a/library/res-ics/drawable-hdpi/suw_navbar_ic_right_arrow_light.png
+++ b/library/ics/res/drawable-hdpi/suw_navbar_ic_right_arrow_light.png
diff --git a/library/res-ics/drawable-ldrtl/suw_navbar_ic_back_dark.xml b/library/ics/res/drawable-ldrtl/suw_navbar_ic_back_dark.xml
index 8256fc6..8256fc6 100644
--- a/library/res-ics/drawable-ldrtl/suw_navbar_ic_back_dark.xml
+++ b/library/ics/res/drawable-ldrtl/suw_navbar_ic_back_dark.xml
diff --git a/library/res-ics/drawable-ldrtl/suw_navbar_ic_back_light.xml b/library/ics/res/drawable-ldrtl/suw_navbar_ic_back_light.xml
index 8fbd5fc..8fbd5fc 100644
--- a/library/res-ics/drawable-ldrtl/suw_navbar_ic_back_light.xml
+++ b/library/ics/res/drawable-ldrtl/suw_navbar_ic_back_light.xml
diff --git a/library/res-ics/drawable-ldrtl/suw_navbar_ic_next_dark.xml b/library/ics/res/drawable-ldrtl/suw_navbar_ic_next_dark.xml
index 0a825f3..0a825f3 100644
--- a/library/res-ics/drawable-ldrtl/suw_navbar_ic_next_dark.xml
+++ b/library/ics/res/drawable-ldrtl/suw_navbar_ic_next_dark.xml
diff --git a/library/res-ics/drawable-ldrtl/suw_navbar_ic_next_light.xml b/library/ics/res/drawable-ldrtl/suw_navbar_ic_next_light.xml
index 894398f..894398f 100644
--- a/library/res-ics/drawable-ldrtl/suw_navbar_ic_next_light.xml
+++ b/library/ics/res/drawable-ldrtl/suw_navbar_ic_next_light.xml
diff --git a/library/res-ics/drawable-mdpi/suw_navbar_ic_left_arrow_dark.png b/library/ics/res/drawable-mdpi/suw_navbar_ic_left_arrow_dark.png
index 284b1f0..284b1f0 100644
--- a/library/res-ics/drawable-mdpi/suw_navbar_ic_left_arrow_dark.png
+++ b/library/ics/res/drawable-mdpi/suw_navbar_ic_left_arrow_dark.png
diff --git a/library/res-ics/drawable-mdpi/suw_navbar_ic_left_arrow_light.png b/library/ics/res/drawable-mdpi/suw_navbar_ic_left_arrow_light.png
index 0bd2a76..0bd2a76 100644
--- a/library/res-ics/drawable-mdpi/suw_navbar_ic_left_arrow_light.png
+++ b/library/ics/res/drawable-mdpi/suw_navbar_ic_left_arrow_light.png
diff --git a/library/res-ics/drawable-mdpi/suw_navbar_ic_right_arrow_dark.png b/library/ics/res/drawable-mdpi/suw_navbar_ic_right_arrow_dark.png
index 5565575..5565575 100644
--- a/library/res-ics/drawable-mdpi/suw_navbar_ic_right_arrow_dark.png
+++ b/library/ics/res/drawable-mdpi/suw_navbar_ic_right_arrow_dark.png
diff --git a/library/res-ics/drawable-mdpi/suw_navbar_ic_right_arrow_light.png b/library/ics/res/drawable-mdpi/suw_navbar_ic_right_arrow_light.png
index c367b7f..c367b7f 100644
--- a/library/res-ics/drawable-mdpi/suw_navbar_ic_right_arrow_light.png
+++ b/library/ics/res/drawable-mdpi/suw_navbar_ic_right_arrow_light.png
diff --git a/library/res-ics/drawable-xhdpi/suw_navbar_ic_left_arrow_dark.png b/library/ics/res/drawable-xhdpi/suw_navbar_ic_left_arrow_dark.png
index 50c15b3..50c15b3 100644
--- a/library/res-ics/drawable-xhdpi/suw_navbar_ic_left_arrow_dark.png
+++ b/library/ics/res/drawable-xhdpi/suw_navbar_ic_left_arrow_dark.png
diff --git a/library/res-ics/drawable-xhdpi/suw_navbar_ic_left_arrow_light.png b/library/ics/res/drawable-xhdpi/suw_navbar_ic_left_arrow_light.png
index 2fac071..2fac071 100644
--- a/library/res-ics/drawable-xhdpi/suw_navbar_ic_left_arrow_light.png
+++ b/library/ics/res/drawable-xhdpi/suw_navbar_ic_left_arrow_light.png
diff --git a/library/res-ics/drawable-xhdpi/suw_navbar_ic_right_arrow_dark.png b/library/ics/res/drawable-xhdpi/suw_navbar_ic_right_arrow_dark.png
index 53a294d..53a294d 100644
--- a/library/res-ics/drawable-xhdpi/suw_navbar_ic_right_arrow_dark.png
+++ b/library/ics/res/drawable-xhdpi/suw_navbar_ic_right_arrow_dark.png
diff --git a/library/res-ics/drawable-xhdpi/suw_navbar_ic_right_arrow_light.png b/library/ics/res/drawable-xhdpi/suw_navbar_ic_right_arrow_light.png
index c1a0765..c1a0765 100644
--- a/library/res-ics/drawable-xhdpi/suw_navbar_ic_right_arrow_light.png
+++ b/library/ics/res/drawable-xhdpi/suw_navbar_ic_right_arrow_light.png
diff --git a/library/res-ics/drawable-xxhdpi/suw_navbar_ic_left_arrow_dark.png b/library/ics/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_dark.png
index d0a219b..d0a219b 100644
--- a/library/res-ics/drawable-xxhdpi/suw_navbar_ic_left_arrow_dark.png
+++ b/library/ics/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_dark.png
diff --git a/library/res-ics/drawable-xxhdpi/suw_navbar_ic_left_arrow_light.png b/library/ics/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_light.png
index ea343d0..ea343d0 100644
--- a/library/res-ics/drawable-xxhdpi/suw_navbar_ic_left_arrow_light.png
+++ b/library/ics/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_light.png
diff --git a/library/res-ics/drawable-xxhdpi/suw_navbar_ic_right_arrow_dark.png b/library/ics/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_dark.png
index 1c017f4..1c017f4 100644
--- a/library/res-ics/drawable-xxhdpi/suw_navbar_ic_right_arrow_dark.png
+++ b/library/ics/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_dark.png
diff --git a/library/res-ics/drawable-xxhdpi/suw_navbar_ic_right_arrow_light.png b/library/ics/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_light.png
index ae30d61..ae30d61 100644
--- a/library/res-ics/drawable-xxhdpi/suw_navbar_ic_right_arrow_light.png
+++ b/library/ics/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_light.png
diff --git a/library/res-ics/drawable-xxxhdpi/suw_navbar_ic_left_arrow_dark.png b/library/ics/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_dark.png
index 038d2f8..038d2f8 100644
--- a/library/res-ics/drawable-xxxhdpi/suw_navbar_ic_left_arrow_dark.png
+++ b/library/ics/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_dark.png
diff --git a/library/res-ics/drawable-xxxhdpi/suw_navbar_ic_left_arrow_light.png b/library/ics/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_light.png
index fcd2c64..fcd2c64 100644
--- a/library/res-ics/drawable-xxxhdpi/suw_navbar_ic_left_arrow_light.png
+++ b/library/ics/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_light.png
diff --git a/library/res-ics/drawable-xxxhdpi/suw_navbar_ic_right_arrow_dark.png b/library/ics/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_dark.png
index b640ddc..b640ddc 100644
--- a/library/res-ics/drawable-xxxhdpi/suw_navbar_ic_right_arrow_dark.png
+++ b/library/ics/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_dark.png
diff --git a/library/res-ics/drawable-xxxhdpi/suw_navbar_ic_right_arrow_light.png b/library/ics/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_light.png
index eacab40..eacab40 100644
--- a/library/res-ics/drawable-xxxhdpi/suw_navbar_ic_right_arrow_light.png
+++ b/library/ics/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_light.png
diff --git a/library/res-ics/drawable/suw_card_bg_dark.xml b/library/ics/res/drawable/suw_card_bg_dark.xml
index e3d29d7..e3d29d7 100644
--- a/library/res-ics/drawable/suw_card_bg_dark.xml
+++ b/library/ics/res/drawable/suw_card_bg_dark.xml
diff --git a/library/res-ics/drawable/suw_card_bg_light.xml b/library/ics/res/drawable/suw_card_bg_light.xml
index b6d6233..b6d6233 100644
--- a/library/res-ics/drawable/suw_card_bg_light.xml
+++ b/library/ics/res/drawable/suw_card_bg_light.xml
diff --git a/library/res-ics/drawable/suw_navbar_btn_bg_dark.xml b/library/ics/res/drawable/suw_navbar_btn_bg_dark.xml
index 7f7f378..7f7f378 100644
--- a/library/res-ics/drawable/suw_navbar_btn_bg_dark.xml
+++ b/library/ics/res/drawable/suw_navbar_btn_bg_dark.xml
diff --git a/library/res-ics/drawable/suw_navbar_btn_bg_light.xml b/library/ics/res/drawable/suw_navbar_btn_bg_light.xml
index 15b567c..15b567c 100644
--- a/library/res-ics/drawable/suw_navbar_btn_bg_light.xml
+++ b/library/ics/res/drawable/suw_navbar_btn_bg_light.xml
diff --git a/library/res-ics/drawable/suw_navbar_ic_back_dark.xml b/library/ics/res/drawable/suw_navbar_ic_back_dark.xml
index 0a825f3..0a825f3 100644
--- a/library/res-ics/drawable/suw_navbar_ic_back_dark.xml
+++ b/library/ics/res/drawable/suw_navbar_ic_back_dark.xml
diff --git a/library/res-ics/drawable/suw_navbar_ic_back_light.xml b/library/ics/res/drawable/suw_navbar_ic_back_light.xml
index 894398f..894398f 100644
--- a/library/res-ics/drawable/suw_navbar_ic_back_light.xml
+++ b/library/ics/res/drawable/suw_navbar_ic_back_light.xml
diff --git a/library/res-ics/drawable/suw_navbar_ic_next_dark.xml b/library/ics/res/drawable/suw_navbar_ic_next_dark.xml
index 8256fc6..8256fc6 100644
--- a/library/res-ics/drawable/suw_navbar_ic_next_dark.xml
+++ b/library/ics/res/drawable/suw_navbar_ic_next_dark.xml
diff --git a/library/res-ics/drawable/suw_navbar_ic_next_light.xml b/library/ics/res/drawable/suw_navbar_ic_next_light.xml
index 8fbd5fc..8fbd5fc 100644
--- a/library/res-ics/drawable/suw_navbar_ic_next_light.xml
+++ b/library/ics/res/drawable/suw_navbar_ic_next_light.xml
diff --git a/library/res-ics/values/styles.xml b/library/ics/res/values/styles.xml
index 57be61a..57be61a 100644
--- a/library/res-ics/values/styles.xml
+++ b/library/ics/res/values/styles.xml
diff --git a/library/AndroidManifest.xml b/library/main/AndroidManifest.xml
index 308a7e5..308a7e5 100644
--- a/library/AndroidManifest.xml
+++ b/library/main/AndroidManifest.xml
diff --git a/library/res/anim-ldrtl/suw_slide_back_in.xml b/library/main/res/anim-ldrtl/suw_slide_back_in.xml
index 18e6e80..18e6e80 100644
--- a/library/res/anim-ldrtl/suw_slide_back_in.xml
+++ b/library/main/res/anim-ldrtl/suw_slide_back_in.xml
diff --git a/library/res/anim-ldrtl/suw_slide_back_out.xml b/library/main/res/anim-ldrtl/suw_slide_back_out.xml
index a8d1ebf..a8d1ebf 100644
--- a/library/res/anim-ldrtl/suw_slide_back_out.xml
+++ b/library/main/res/anim-ldrtl/suw_slide_back_out.xml
diff --git a/library/res/anim-ldrtl/suw_slide_next_in.xml b/library/main/res/anim-ldrtl/suw_slide_next_in.xml
index f0144c5..f0144c5 100644
--- a/library/res/anim-ldrtl/suw_slide_next_in.xml
+++ b/library/main/res/anim-ldrtl/suw_slide_next_in.xml
diff --git a/library/res/anim-ldrtl/suw_slide_next_out.xml b/library/main/res/anim-ldrtl/suw_slide_next_out.xml
index 3b68945..3b68945 100644
--- a/library/res/anim-ldrtl/suw_slide_next_out.xml
+++ b/library/main/res/anim-ldrtl/suw_slide_next_out.xml
diff --git a/library/res/anim/suw_slide_back_in.xml b/library/main/res/anim/suw_slide_back_in.xml
index f0144c5..f0144c5 100644
--- a/library/res/anim/suw_slide_back_in.xml
+++ b/library/main/res/anim/suw_slide_back_in.xml
diff --git a/library/res/anim/suw_slide_back_out.xml b/library/main/res/anim/suw_slide_back_out.xml
index 3b68945..3b68945 100644
--- a/library/res/anim/suw_slide_back_out.xml
+++ b/library/main/res/anim/suw_slide_back_out.xml
diff --git a/library/res/anim/suw_slide_next_in.xml b/library/main/res/anim/suw_slide_next_in.xml
index 18e6e80..18e6e80 100644
--- a/library/res/anim/suw_slide_next_in.xml
+++ b/library/main/res/anim/suw_slide_next_in.xml
diff --git a/library/res/anim/suw_slide_next_out.xml b/library/main/res/anim/suw_slide_next_out.xml
index a8d1ebf..a8d1ebf 100644
--- a/library/res/anim/suw_slide_next_out.xml
+++ b/library/main/res/anim/suw_slide_next_out.xml
diff --git a/library/res/drawable-v21/suw_card_bg.xml b/library/main/res/drawable-v21/suw_card_bg.xml
index 13d1d4e..13d1d4e 100644
--- a/library/res/drawable-v21/suw_card_bg.xml
+++ b/library/main/res/drawable-v21/suw_card_bg.xml
diff --git a/library/res/drawable-v21/suw_navbar_btn_bg.xml b/library/main/res/drawable-v21/suw_navbar_btn_bg.xml
index 198f7f0..198f7f0 100644
--- a/library/res/drawable-v21/suw_navbar_btn_bg.xml
+++ b/library/main/res/drawable-v21/suw_navbar_btn_bg.xml
diff --git a/library/res/drawable-v21/suw_navbar_ic_back.xml b/library/main/res/drawable-v21/suw_navbar_ic_back.xml
index d0ea84c..d0ea84c 100644
--- a/library/res/drawable-v21/suw_navbar_ic_back.xml
+++ b/library/main/res/drawable-v21/suw_navbar_ic_back.xml
diff --git a/library/res/drawable-v21/suw_navbar_ic_next.xml b/library/main/res/drawable-v21/suw_navbar_ic_next.xml
index a91dc76..a91dc76 100644
--- a/library/res/drawable-v21/suw_navbar_ic_next.xml
+++ b/library/main/res/drawable-v21/suw_navbar_ic_next.xml
diff --git a/library/res/drawable/suw_layout_background.xml b/library/main/res/drawable/suw_layout_background.xml
index affe95f..affe95f 100644
--- a/library/res/drawable/suw_layout_background.xml
+++ b/library/main/res/drawable/suw_layout_background.xml
diff --git a/library/res/layout/suw_list_header.xml b/library/main/res/layout/suw_list_header.xml
index 8d1cefa..8d1cefa 100644
--- a/library/res/layout/suw_list_header.xml
+++ b/library/main/res/layout/suw_list_header.xml
diff --git a/library/res/layout/suw_list_template_card.xml b/library/main/res/layout/suw_list_template_card.xml
index 26099ee..26099ee 100644
--- a/library/res/layout/suw_list_template_card.xml
+++ b/library/main/res/layout/suw_list_template_card.xml
diff --git a/library/res/layout/suw_list_template_card_wide.xml b/library/main/res/layout/suw_list_template_card_wide.xml
index 40d9090..40d9090 100644
--- a/library/res/layout/suw_list_template_card_wide.xml
+++ b/library/main/res/layout/suw_list_template_card_wide.xml
diff --git a/library/res/layout/suw_list_template_header.xml b/library/main/res/layout/suw_list_template_header.xml
index 59d75d4..59d75d4 100644
--- a/library/res/layout/suw_list_template_header.xml
+++ b/library/main/res/layout/suw_list_template_header.xml
diff --git a/library/res/layout/suw_list_template_header_collapsed.xml b/library/main/res/layout/suw_list_template_header_collapsed.xml
index 85ec091..85ec091 100644
--- a/library/res/layout/suw_list_template_header_collapsed.xml
+++ b/library/main/res/layout/suw_list_template_header_collapsed.xml
diff --git a/library/res/layout/suw_navbar_view.xml b/library/main/res/layout/suw_navbar_view.xml
index 50bfba8..50bfba8 100644
--- a/library/res/layout/suw_navbar_view.xml
+++ b/library/main/res/layout/suw_navbar_view.xml
diff --git a/library/res/layout/suw_template_card.xml b/library/main/res/layout/suw_template_card.xml
index 26e5c71..26e5c71 100644
--- a/library/res/layout/suw_template_card.xml
+++ b/library/main/res/layout/suw_template_card.xml
diff --git a/library/res/layout/suw_template_card_wide.xml b/library/main/res/layout/suw_template_card_wide.xml
index 74f91f1..74f91f1 100644
--- a/library/res/layout/suw_template_card_wide.xml
+++ b/library/main/res/layout/suw_template_card_wide.xml
diff --git a/library/res/layout/suw_template_header.xml b/library/main/res/layout/suw_template_header.xml
index fb6c5b8..fb6c5b8 100644
--- a/library/res/layout/suw_template_header.xml
+++ b/library/main/res/layout/suw_template_header.xml
diff --git a/library/res/layout/suw_template_header_collapsed.xml b/library/main/res/layout/suw_template_header_collapsed.xml
index 22fcb4c..22fcb4c 100644
--- a/library/res/layout/suw_template_header_collapsed.xml
+++ b/library/main/res/layout/suw_template_header_collapsed.xml
diff --git a/library/res/values-land/dimens.xml b/library/main/res/values-land/dimens.xml
index f48548b..f48548b 100644
--- a/library/res/values-land/dimens.xml
+++ b/library/main/res/values-land/dimens.xml
diff --git a/library/res/values-land/layouts.xml b/library/main/res/values-land/layouts.xml
index 879c37b..879c37b 100644
--- a/library/res/values-land/layouts.xml
+++ b/library/main/res/values-land/layouts.xml
diff --git a/library/res/values-sw600dp-land/layouts.xml b/library/main/res/values-sw600dp-land/layouts.xml
index a831766..a831766 100644
--- a/library/res/values-sw600dp-land/layouts.xml
+++ b/library/main/res/values-sw600dp-land/layouts.xml
diff --git a/library/res/values-sw600dp/config.xml b/library/main/res/values-sw600dp/config.xml
index 0cbd5a8..0cbd5a8 100644
--- a/library/res/values-sw600dp/config.xml
+++ b/library/main/res/values-sw600dp/config.xml
diff --git a/library/res/values-sw600dp/layouts.xml b/library/main/res/values-sw600dp/layouts.xml
index a4742e6..a4742e6 100644
--- a/library/res/values-sw600dp/layouts.xml
+++ b/library/main/res/values-sw600dp/layouts.xml
diff --git a/library/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index 2bbbad2..2bbbad2 100644
--- a/library/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
diff --git a/library/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 25bfe6e..25bfe6e 100644
--- a/library/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
diff --git a/library/res/values/colors.xml b/library/main/res/values/colors.xml
index 5c5b7c7..5c5b7c7 100644
--- a/library/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
diff --git a/library/res/values/config.xml b/library/main/res/values/config.xml
index 74e30d3..74e30d3 100644
--- a/library/res/values/config.xml
+++ b/library/main/res/values/config.xml
diff --git a/library/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 81fa53a..81fa53a 100644
--- a/library/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
diff --git a/library/res/values/layouts.xml b/library/main/res/values/layouts.xml
index b574cc4..b574cc4 100644
--- a/library/res/values/layouts.xml
+++ b/library/main/res/values/layouts.xml
diff --git a/library/res/values/strings.xml b/library/main/res/values/strings.xml
index df30031..df30031 100644
--- a/library/res/values/strings.xml
+++ b/library/main/res/values/strings.xml
diff --git a/library/res/values/styles.xml b/library/main/res/values/styles.xml
index 70c444a..70c444a 100644
--- a/library/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
diff --git a/library/src/com/android/annotations/VisibleForTesting.java b/library/main/src/com/android/annotations/VisibleForTesting.java
index d3afc6a..d3afc6a 100644
--- a/library/src/com/android/annotations/VisibleForTesting.java
+++ b/library/main/src/com/android/annotations/VisibleForTesting.java
diff --git a/library/src/com/android/setupwizardlib/SetupWizardLayout.java b/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java
index 2a1000d..2a1000d 100644
--- a/library/src/com/android/setupwizardlib/SetupWizardLayout.java
+++ b/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java
diff --git a/library/src/com/android/setupwizardlib/SetupWizardListLayout.java b/library/main/src/com/android/setupwizardlib/SetupWizardListLayout.java
index 228ff12..228ff12 100644
--- a/library/src/com/android/setupwizardlib/SetupWizardListLayout.java
+++ b/library/main/src/com/android/setupwizardlib/SetupWizardListLayout.java
diff --git a/library/src/com/android/setupwizardlib/util/Partner.java b/library/main/src/com/android/setupwizardlib/util/Partner.java
index 5a81d4c..5a81d4c 100644
--- a/library/src/com/android/setupwizardlib/util/Partner.java
+++ b/library/main/src/com/android/setupwizardlib/util/Partner.java
diff --git a/library/src/com/android/setupwizardlib/util/ResultCodes.java b/library/main/src/com/android/setupwizardlib/util/ResultCodes.java
index a429e73..a429e73 100644
--- a/library/src/com/android/setupwizardlib/util/ResultCodes.java
+++ b/library/main/src/com/android/setupwizardlib/util/ResultCodes.java
diff --git a/library/src/com/android/setupwizardlib/util/SystemBarHelper.java b/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java
index a9fc3f5..a9fc3f5 100644
--- a/library/src/com/android/setupwizardlib/util/SystemBarHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/SystemBarHelper.java
diff --git a/library/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
index 563e97d..563e97d 100644
--- a/library/src/com/android/setupwizardlib/util/WizardManagerHelper.java
+++ b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
diff --git a/library/src/com/android/setupwizardlib/view/BottomScrollView.java b/library/main/src/com/android/setupwizardlib/view/BottomScrollView.java
index 806ecf4..806ecf4 100644
--- a/library/src/com/android/setupwizardlib/view/BottomScrollView.java
+++ b/library/main/src/com/android/setupwizardlib/view/BottomScrollView.java
diff --git a/library/src/com/android/setupwizardlib/view/Illustration.java b/library/main/src/com/android/setupwizardlib/view/Illustration.java
index fd976bc..fd976bc 100644
--- a/library/src/com/android/setupwizardlib/view/Illustration.java
+++ b/library/main/src/com/android/setupwizardlib/view/Illustration.java
diff --git a/library/src/com/android/setupwizardlib/view/NavigationBar.java b/library/main/src/com/android/setupwizardlib/view/NavigationBar.java
index fc99768..fc99768 100644
--- a/library/src/com/android/setupwizardlib/view/NavigationBar.java
+++ b/library/main/src/com/android/setupwizardlib/view/NavigationBar.java
diff --git a/library/src/com/android/setupwizardlib/view/StickyHeaderListView.java b/library/main/src/com/android/setupwizardlib/view/StickyHeaderListView.java
index 5cb8b28..5cb8b28 100644
--- a/library/src/com/android/setupwizardlib/view/StickyHeaderListView.java
+++ b/library/main/src/com/android/setupwizardlib/view/StickyHeaderListView.java
diff --git a/library/src/com/android/setupwizardlib/view/StickyHeaderScrollView.java b/library/main/src/com/android/setupwizardlib/view/StickyHeaderScrollView.java
index a8c942f..a8c942f 100644
--- a/library/src/com/android/setupwizardlib/view/StickyHeaderScrollView.java
+++ b/library/main/src/com/android/setupwizardlib/view/StickyHeaderScrollView.java