diff options
| author | Maurice Lam <yukl@google.com> | 2014-08-10 14:50:45 -0700 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2014-08-10 18:15:22 -0700 |
| commit | fc4414955c73b11a7975c74a741df00c7b3a005b (patch) | |
| tree | 20dcbc910c65a7c0f79318a20cf5065401864edf | |
| parent | 5859dee3b09ba9a516d37736fd61613cb55184c2 (diff) | |
| download | android_frameworks_opt_setupwizard-fc4414955c73b11a7975c74a741df00c7b3a005b.tar.gz android_frameworks_opt_setupwizard-fc4414955c73b11a7975c74a741df00c7b3a005b.tar.bz2 android_frameworks_opt_setupwizard-fc4414955c73b11a7975c74a741df00c7b3a005b.zip | |
Updated navigation bar colors
Bug: 16919804
Change-Id: I47ea38e02b416b4ada5d626dc8802d326ddaffef
| -rw-r--r-- | navigationbar/res/values/colors.xml | 4 | ||||
| -rw-r--r-- | navigationbar/res/values/styles.xml | 8 | ||||
| -rw-r--r-- | navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/navigationbar/res/values/colors.xml b/navigationbar/res/values/colors.xml index 4ca2756..655cf75 100644 --- a/navigationbar/res/values/colors.xml +++ b/navigationbar/res/values/colors.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="setup_wizard_navbar_bg_dark">#ff121212</color> - <color name="setup_wizard_navbar_bg_light">#fff5f5f5</color> + <color name="setup_wizard_navbar_bg_dark">#ff263238</color> + <color name="setup_wizard_navbar_bg_light">#ffeceff1</color> <color name="setup_wizard_navbar_text_dark">#deffffff</color> <color name="setup_wizard_navbar_text_light">#de000000</color> </resources> diff --git a/navigationbar/res/values/styles.xml b/navigationbar/res/values/styles.xml index 56f43a2..366aa2d 100644 --- a/navigationbar/res/values/styles.xml +++ b/navigationbar/res/values/styles.xml @@ -16,13 +16,13 @@ </style> <style name="setup_wizard_navbar_theme_dark"> - <item name="setup_wizard_navbar_bg_color">#ff121212</item> - <item name="setup_wizard_navbar_text_color">#deffffff</item> + <item name="setup_wizard_navbar_bg_color">@color/setup_wizard_navbar_bg_dark</item> + <item name="setup_wizard_navbar_text_color">@color/setup_wizard_navbar_text_dark</item> </style> <style name="setup_wizard_navbar_theme_light"> - <item name="setup_wizard_navbar_bg_color">#fff5f5f5</item> - <item name="setup_wizard_navbar_text_color">#de000000</item> + <item name="setup_wizard_navbar_bg_color">@color/setup_wizard_navbar_bg_light</item> + <item name="setup_wizard_navbar_text_color">@color/setup_wizard_navbar_text_light</item> </style> <style name="setup_wizard_navbar_button_style" parent="@android:style/Widget.Material.Button.Borderless"> diff --git a/navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java b/navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java index 045a256..e34ad6c 100644 --- a/navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java +++ b/navigationbar/src/com/android/setupwizard/navigationbar/SetupWizardNavBar.java @@ -181,9 +181,10 @@ public class SetupWizardNavBar extends Fragment implements OnPreDrawListener, On @Override public void setEnabled(boolean enabled) { - // Dim the button (50% alpha) when disabled. super.setEnabled(enabled); - setAlpha(enabled ? 1.0f : 0.5f); + // The color of the button is #de000000 / #deffffff when enabled. When disabled, apply + // additional 23% alpha, so the overall opacity is 20%. + setAlpha(enabled ? 1.0f : 0.23f); } } |