[SetupWizardLib] Rename attributes
Rename attributes and styles so that they are using consistent naming
conventions. (suwFooBar for attributes and styles, suw_foo_bar for
colors and dimens)
Change-Id: I189978bc7b11152e72e89a66779175bc0246c778
diff --git a/library/res/anim-ldrtl/suw_slide_back_in.xml b/library/res/anim-ldrtl/suw_slide_back_in.xml
index 76e2948..18e6e80 100644
--- a/library/res/anim-ldrtl/suw_slide_back_in.xml
+++ b/library/res/anim-ldrtl/suw_slide_back_in.xml
@@ -16,7 +16,7 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="@integer/suw_transition_duration"
+ android:duration="@integer/suwTransitionDuration"
android:fromXDelta="100%"
android:toXDelta="0%"
android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/library/res/anim-ldrtl/suw_slide_back_out.xml b/library/res/anim-ldrtl/suw_slide_back_out.xml
index 06c9397..a8d1ebf 100644
--- a/library/res/anim-ldrtl/suw_slide_back_out.xml
+++ b/library/res/anim-ldrtl/suw_slide_back_out.xml
@@ -16,7 +16,7 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="@integer/suw_transition_duration"
+ android:duration="@integer/suwTransitionDuration"
android:fromXDelta="0%"
android:toXDelta="-100%"
android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/library/res/anim-ldrtl/suw_slide_next_in.xml b/library/res/anim-ldrtl/suw_slide_next_in.xml
index da7ffbd..f0144c5 100644
--- a/library/res/anim-ldrtl/suw_slide_next_in.xml
+++ b/library/res/anim-ldrtl/suw_slide_next_in.xml
@@ -16,7 +16,7 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="@integer/suw_transition_duration"
+ android:duration="@integer/suwTransitionDuration"
android:fromXDelta="-100%"
android:toXDelta="0%"
android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/library/res/anim-ldrtl/suw_slide_next_out.xml b/library/res/anim-ldrtl/suw_slide_next_out.xml
index 82c870b..3b68945 100644
--- a/library/res/anim-ldrtl/suw_slide_next_out.xml
+++ b/library/res/anim-ldrtl/suw_slide_next_out.xml
@@ -16,7 +16,7 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="@integer/suw_transition_duration"
+ android:duration="@integer/suwTransitionDuration"
android:fromXDelta="0%"
android:toXDelta="100%"
android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/library/res/anim/suw_slide_back_in.xml b/library/res/anim/suw_slide_back_in.xml
index da7ffbd..f0144c5 100644
--- a/library/res/anim/suw_slide_back_in.xml
+++ b/library/res/anim/suw_slide_back_in.xml
@@ -16,7 +16,7 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="@integer/suw_transition_duration"
+ android:duration="@integer/suwTransitionDuration"
android:fromXDelta="-100%"
android:toXDelta="0%"
android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/library/res/anim/suw_slide_back_out.xml b/library/res/anim/suw_slide_back_out.xml
index 82c870b..3b68945 100644
--- a/library/res/anim/suw_slide_back_out.xml
+++ b/library/res/anim/suw_slide_back_out.xml
@@ -16,7 +16,7 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="@integer/suw_transition_duration"
+ android:duration="@integer/suwTransitionDuration"
android:fromXDelta="0%"
android:toXDelta="100%"
android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/library/res/anim/suw_slide_next_in.xml b/library/res/anim/suw_slide_next_in.xml
index 76e2948..18e6e80 100644
--- a/library/res/anim/suw_slide_next_in.xml
+++ b/library/res/anim/suw_slide_next_in.xml
@@ -16,7 +16,7 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="@integer/suw_transition_duration"
+ android:duration="@integer/suwTransitionDuration"
android:fromXDelta="100%"
android:toXDelta="0%"
android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/library/res/anim/suw_slide_next_out.xml b/library/res/anim/suw_slide_next_out.xml
index 06c9397..a8d1ebf 100644
--- a/library/res/anim/suw_slide_next_out.xml
+++ b/library/res/anim/suw_slide_next_out.xml
@@ -16,7 +16,7 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="@integer/suw_transition_duration"
+ android:duration="@integer/suwTransitionDuration"
android:fromXDelta="0%"
android:toXDelta="-100%"
android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/library/res/drawable-v21/suw_navbar_ic_back.xml b/library/res/drawable-v21/suw_navbar_ic_back.xml
index 60488bb..d0ea84c 100644
--- a/library/res/drawable-v21/suw_navbar_ic_back.xml
+++ b/library/res/drawable-v21/suw_navbar_ic_back.xml
@@ -23,7 +23,7 @@
android:viewportHeight="24">
<path
- android:fillColor="?attr/suw_navbar_text_color"
+ android:fillColor="?attr/suwNavBarTextColor"
android:pathData="M15.4,7.4l-1.4,-1.4 -6,6 6,6 1.4,-1.4 -4.6,-4.6z" />
</vector>
diff --git a/library/res/drawable-v21/suw_navbar_ic_next.xml b/library/res/drawable-v21/suw_navbar_ic_next.xml
index a288199..a91dc76 100644
--- a/library/res/drawable-v21/suw_navbar_ic_next.xml
+++ b/library/res/drawable-v21/suw_navbar_ic_next.xml
@@ -23,7 +23,7 @@
android:viewportHeight="24">
<path
- android:fillColor="?attr/suw_navbar_text_color"
+ android:fillColor="?attr/suwNavBarTextColor"
android:pathData="M10,6 l-1.4,1.4 4.6,4.6 -4.6,4.6 1.4,1.4 6,-6z" />
</vector>
diff --git a/library/res/values-v21/styles.xml b/library/res/values-v21/styles.xml
index 2977ab7..638e3f0 100644
--- a/library/res/values-v21/styles.xml
+++ b/library/res/values-v21/styles.xml
@@ -76,13 +76,13 @@
<!-- Navigation bar styles -->
<style name="SuwNavBarThemeDark">
- <item name="suw_navbar_bg_color">@color/suw_navbar_bg_dark</item>
- <item name="suw_navbar_text_color">@color/suw_navbar_text_dark</item>
+ <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_dark</item>
+ <item name="suwNavBarTextColor">@color/suw_navbar_text_dark</item>
</style>
<style name="SuwNavBarThemeLight">
- <item name="suw_navbar_bg_color">@color/suw_navbar_bg_light</item>
- <item name="suw_navbar_text_color">@color/suw_navbar_text_light</item>
+ <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_light</item>
+ <item name="suwNavBarTextColor">@color/suw_navbar_text_light</item>
</style>
<style name="SuwNavBarButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
@@ -93,7 +93,7 @@
<item name="android:paddingEnd">@dimen/suw_navbar_button_padding_sides</item>
<item name="android:paddingStart">@dimen/suw_navbar_button_padding_sides</item>
<item name="android:textAllCaps">true</item>
- <item name="android:textColor">?attr/suw_navbar_text_color</item>
+ <item name="android:textColor">?attr/suwNavBarTextColor</item>
<item name="android:textSize">@dimen/suw_navbar_text_size</item>
</style>
@@ -104,7 +104,7 @@
<item name="android:layout_height">@dimen/suw_navbar_height</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_alignParentBottom">true</item>
- <item name="android:background">?attr/suw_navbar_bg_color</item>
+ <item name="android:background">?attr/suwNavBarBackgroundColor</item>
<item name="android:paddingStart">@dimen/suw_navbar_padding_sides</item>
<item name="android:paddingEnd">@dimen/suw_navbar_padding_sides</item>
</style>
diff --git a/library/res/values/attrs.xml b/library/res/values/attrs.xml
index ad0ba36..9d4b08e 100644
--- a/library/res/values/attrs.xml
+++ b/library/res/values/attrs.xml
@@ -17,6 +17,10 @@
<resources>
+ <attr name="suwNavBarBackgroundColor" format="color" />
+ <attr name="suwNavBarTextColor" format="color" />
+ <attr name="suwNavBarTheme" format="reference" />
+
<declare-styleable name="SuwIllustration">
<attr name="suwAspectRatio" format="float" />
</declare-styleable>
@@ -29,4 +33,7 @@
<attr name="android:layout" />
</declare-styleable>
+ <!-- deprecated -->
+ <attr name="suw_navbar_text_color" format="color" />
+
</resources>
diff --git a/library/res/values/config.xml b/library/res/values/config.xml
index 902a7e9..f218f67 100644
--- a/library/res/values/config.xml
+++ b/library/res/values/config.xml
@@ -18,6 +18,6 @@
<resources>
<!-- The duration (in milliseconds) of activity transitions -->
- <integer name="suw_transition_duration">300</integer>
+ <integer name="suwTransitionDuration">300</integer>
</resources>
\ No newline at end of file
diff --git a/library/res/values/styles.xml b/library/res/values/styles.xml
deleted file mode 100644
index b6b0d2e..0000000
--- a/library/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
-
- <attr name="suw_navbar_bg_color" format="color" />
- <attr name="suw_navbar_text_color" format="color" />
- <attr name="suw_navbar_theme" format="reference" />
-
-</resources>
diff --git a/library/src/com/android/setupwizardlib/view/NavigationBar.java b/library/src/com/android/setupwizardlib/view/NavigationBar.java
index 53505bb..34b59ca 100644
--- a/library/src/com/android/setupwizardlib/view/NavigationBar.java
+++ b/library/src/com/android/setupwizardlib/view/NavigationBar.java
@@ -39,10 +39,10 @@
private static int getNavbarTheme(Context context) {
// Normally we can automatically guess the theme by comparing the foreground color against
- // the background color. But we also allow specifying explicitly using suw_navbar_theme.
+ // the background color. But we also allow specifying explicitly using suwNavBarTheme.
TypedArray attributes = context.obtainStyledAttributes(
new int[] {
- R.attr.suw_navbar_theme,
+ R.attr.suwNavBarTheme,
android.R.attr.colorForeground,
android.R.attr.colorBackground });
int theme = attributes.getResourceId(0, 0);
