summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-03-12 23:07:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-12 23:07:10 +0000
commitd2681a80e6cd1764177592a2918ecad8c6afdc44 (patch)
tree01e2661d46ab2bdd21fd822f69d5d7f7d102d949
parent4119053ad23e981fa9d739b7e185560301ddd99e (diff)
parent62aa3106854f10c4b8996ac7b71869254732f950 (diff)
downloadandroid_frameworks_opt_setupwizard-d2681a80e6cd1764177592a2918ecad8c6afdc44.tar.gz
android_frameworks_opt_setupwizard-d2681a80e6cd1764177592a2918ecad8c6afdc44.tar.bz2
android_frameworks_opt_setupwizard-d2681a80e6cd1764177592a2918ecad8c6afdc44.zip
am 62aa3106: [SetupWizardLib] Fix navigation bar theme
* commit '62aa3106854f10c4b8996ac7b71869254732f950': [SetupWizardLib] Fix navigation bar theme
-rw-r--r--library/res/layout/suw_list_template_card.xml1
-rw-r--r--library/res/layout/suw_list_template_card_wide.xml1
-rw-r--r--library/res/layout/suw_list_template_header.xml1
-rw-r--r--library/res/layout/suw_list_template_header_collapsed.xml1
-rw-r--r--library/res/layout/suw_template_card.xml1
-rw-r--r--library/res/layout/suw_template_card_wide.xml1
-rw-r--r--library/res/layout/suw_template_header.xml1
-rw-r--r--library/res/layout/suw_template_header_collapsed.xml1
8 files changed, 8 insertions, 0 deletions
diff --git a/library/res/layout/suw_list_template_card.xml b/library/res/layout/suw_list_template_card.xml
index 5e700f7..26099ee 100644
--- a/library/res/layout/suw_list_template_card.xml
+++ b/library/res/layout/suw_list_template_card.xml
@@ -57,6 +57,7 @@
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_layout_navigation_bar"
+ style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height" />
diff --git a/library/res/layout/suw_list_template_card_wide.xml b/library/res/layout/suw_list_template_card_wide.xml
index c7e8313..40d9090 100644
--- a/library/res/layout/suw_list_template_card_wide.xml
+++ b/library/res/layout/suw_list_template_card_wide.xml
@@ -58,6 +58,7 @@
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_layout_navigation_bar"
+ style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height" />
diff --git a/library/res/layout/suw_list_template_header.xml b/library/res/layout/suw_list_template_header.xml
index d66d90d..59d75d4 100644
--- a/library/res/layout/suw_list_template_header.xml
+++ b/library/res/layout/suw_list_template_header.xml
@@ -30,6 +30,7 @@
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_layout_navigation_bar"
+ style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height" />
diff --git a/library/res/layout/suw_list_template_header_collapsed.xml b/library/res/layout/suw_list_template_header_collapsed.xml
index 56a7802..85ec091 100644
--- a/library/res/layout/suw_list_template_header_collapsed.xml
+++ b/library/res/layout/suw_list_template_header_collapsed.xml
@@ -45,6 +45,7 @@
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_layout_navigation_bar"
+ style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height" />
diff --git a/library/res/layout/suw_template_card.xml b/library/res/layout/suw_template_card.xml
index 6c2ef41..26e5c71 100644
--- a/library/res/layout/suw_template_card.xml
+++ b/library/res/layout/suw_template_card.xml
@@ -66,6 +66,7 @@
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_layout_navigation_bar"
+ style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height" />
diff --git a/library/res/layout/suw_template_card_wide.xml b/library/res/layout/suw_template_card_wide.xml
index ad87ac0..74f91f1 100644
--- a/library/res/layout/suw_template_card_wide.xml
+++ b/library/res/layout/suw_template_card_wide.xml
@@ -66,6 +66,7 @@
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_layout_navigation_bar"
+ style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height" />
diff --git a/library/res/layout/suw_template_header.xml b/library/res/layout/suw_template_header.xml
index 376d079..fb6c5b8 100644
--- a/library/res/layout/suw_template_header.xml
+++ b/library/res/layout/suw_template_header.xml
@@ -66,6 +66,7 @@
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_layout_navigation_bar"
+ style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height" />
diff --git a/library/res/layout/suw_template_header_collapsed.xml b/library/res/layout/suw_template_header_collapsed.xml
index 6d87d46..22fcb4c 100644
--- a/library/res/layout/suw_template_header_collapsed.xml
+++ b/library/res/layout/suw_template_header_collapsed.xml
@@ -53,6 +53,7 @@
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_layout_navigation_bar"
+ style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height" />