Merge "Fix robolectric breakage because of internal resources"

This commit is contained in:
TreeHugger Robot
2017-01-05 19:44:54 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 1 deletions

View File

@@ -111,4 +111,6 @@
<!-- Gestures settings -->
<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>

View File

@@ -155,7 +155,7 @@
<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:statusBarColor">@*android:color/secondary_device_default_settings</item>
<item name="android:statusBarColor">@color/status_bar_color</item>
</style>
<style name="Theme.SubSettings" parent="Theme.Settings">