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

Merge "Fix robolectric breakage because of internal resources"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-05 19:44:54 +00:00
committed by Android (Google) Code Review
parent 9445d36eea 8a8f47c6f3
commit f5549ebbb0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/colors.xml
View File

@@ -111,4 +111,6 @@
<!-- Gestures settings --> <!-- Gestures settings -->
<color name="gestures_setting_background_color">#f5f5f5</color> <color name="gestures_setting_background_color">#f5f5f5</color>
<!-- TODO: revert it after the SettingsShadowResources is globally finalized -->
<color name="status_bar_color">#3c3c3c</color>
</resources> </resources>

2
res/values/themes.xml
View File

@@ -155,7 +155,7 @@
<item name="*android:successColor">@color/lock_pattern_view_success_color</item> <item name="*android:successColor">@color/lock_pattern_view_success_color</item>
<item name="*android:errorColor">@color/lock_pattern_view_error_color</item> <item name="*android:errorColor">@color/lock_pattern_view_error_color</item>
<item name="android:statusBarColor">@*android:color/secondary_device_default_settings</item> <item name="android:statusBarColor">@color/status_bar_color</item>
</style> </style>
<style name="Theme.SubSettings" parent="Theme.Settings"> <style name="Theme.SubSettings" parent="Theme.Settings">