diff options
| author | Russell Brenner <russellbrenner@google.com> | 2013-09-30 14:16:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-30 14:16:45 -0700 |
| commit | 359f7662e668962902aaf5509155aedfe8e70ebc (patch) | |
| tree | d25b4ca2b0b0800c2509c2f292187da04d11bd70 /res | |
| parent | a5326d11eaf58e1f9b78af6dcdd248ef6a2fa00c (diff) | |
| parent | 93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea (diff) | |
| download | packages_apps_Settings-359f7662e668962902aaf5509155aedfe8e70ebc.zip packages_apps_Settings-359f7662e668962902aaf5509155aedfe8e70ebc.tar.gz packages_apps_Settings-359f7662e668962902aaf5509155aedfe8e70ebc.tar.bz2 | |
am 93e6a023: Merge "Set divider color for light theme" into klp-dev
* commit '93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea':
Set divider color for light theme
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/colors.xml | 3 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | res/values/themes.xml | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index bd385f6..40098f5 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -35,7 +35,8 @@ <color name="divider_color">#20ffffff</color> <color name="title_color">@android:color/holo_blue_light</color> - <color name="setup_divider_color">#333333</color> + <color name="setup_divider_color_dark">#33ffffff</color> + <color name="setup_divider_color_light">#33000000</color> <color name="circle_avatar_frame_color">#ffffffff</color> <color name="circle_avatar_frame_shadow_color">#80000000</color> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4805cb6..eee2cd9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -130,7 +130,7 @@ <style name="TopDivider"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">@dimen/divider_height</item> - <item name="android:background">@color/setup_divider_color</item> + <item name="android:background">?attr/setup_divider_color</item> <item name="android:focusable">false</item> <item name="android:clickable">false</item> <item name="android:layout_marginTop">@dimen/divider_margin_top</item> diff --git a/res/values/themes.xml b/res/values/themes.xml index 19d1e91..a87ad33 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -18,6 +18,7 @@ <attr name="ic_menu_add" format="reference" /> <attr name="ic_menu_moreoverflow" format="reference" /> <attr name="ic_wps" format="reference" /> + <attr name="setup_divider_color" format="reference" /> <attr name="wifi_signal" format="reference" /> <style name="SetupWizardWifiTheme" parent="android:Theme.Holo.NoActionBar"> @@ -27,6 +28,7 @@ <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item> <item name="ic_wps">@drawable/ic_wps_dark</item> + <item name="setup_divider_color">@color/setup_divider_color_dark</item> <item name="wifi_signal">@drawable/wifi_signal_dark</item> </style> @@ -37,6 +39,7 @@ <item name="ic_menu_add">@drawable/ic_menu_add_light</item> <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item> <item name="ic_wps">@drawable/ic_wps_light</item> + <item name="setup_divider_color">@color/setup_divider_color_light</item> <item name="wifi_signal">@drawable/wifi_signal_light</item> </style> |