Updated navigation bar colors

Bug: 16919804
Change-Id: I47ea38e02b416b4ada5d626dc8802d326ddaffef
This commit is contained in:
Maurice Lam 2014-08-10 14:50:45 -07:00
parent 5859dee3b0
commit fc4414955c
3 changed files with 9 additions and 8 deletions

View file

@ -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>

View file

@ -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">

View file

@ -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);
}
}