PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Setup Wizard Vision Settings colors." into oc-dev am: 221f9245d6

Browse Source 
am: 86d10d65ab

Change-Id: I2e1a87c187bf9182b028402ae01d3504e5a637de
This commit is contained in:
Anna Galusza
2017-04-18 19:48:03 +00:00
committed by android-build-merger
parent eb9e5be803 86d10d65ab
commit 50d359aa38
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/colors.xml
View File

@@ -79,6 +79,8 @@
<!-- Accessibility SUW colors -->
<color name="material_blue_500">#4285F4</color>
<color name="material_blue_700">#3367D6</color>
<color name="material_grey_100">#f5f5f5</color>
<color name="material_grey_200">#ffffff</color>
<color name="message_text_incoming">#ffffffff</color>
<color name="message_text_outgoing">#ff323232</color>

11
res/values/themes.xml
View File

@@ -149,16 +149,17 @@
<!-- Accessibility portion of Setup Wizard -->
<style name="SetupWizardAccessibilityTheme" parent="Theme.SettingsBase">
<item name="android:windowLightStatusBar">false</item>
<item name="android:colorPrimary">@color/material_blue_700</item>
<item name="android:colorPrimaryDark">@color/material_blue_700</item>
<item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
<item name="android:colorPrimary">@color/material_grey_100</item>
<item name="android:colorAccent">@color/material_blue_700</item>
<item name="android:titleTextColor">@color/material_blue_700</item>
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="switchBarTheme">@style/SetupWizardAccessibilitySwitchBarTheme</item>
</style>
<style name="SetupWizardAccessibilitySwitchBarTheme" parent="ThemeOverlay.SwitchBar.Settings">
<item name="switchBarBackgroundColor">@color/material_blue_500</item>
<item name="android:colorControlActivated">@android:color/white</item>
<item name="switchBarBackgroundColor">@color/material_grey_200</item>
<item name="android:colorControlActivated">@color/material_blue_500</item>
<item name="android:textColorPrimary">@android:color/black</item>
</style>
<!-- Theme with no local references, used by AccountPreferenceBase where we have to inflate