Merge "Apply the new search bar background color" into sc-dev
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
<color name="homepage_support_background">#3F5FBD</color>
|
||||
<color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
|
||||
<color name="contextual_card_background">@*android:color/material_grey_900</color>
|
||||
<color name="search_bar_background">@*android:color/material_grey_900</color>
|
||||
<!-- Dialog background color. -->
|
||||
<color name="dialog_background">@*android:color/material_grey_800</color>
|
||||
<color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
|
||||
|
@@ -23,12 +23,6 @@
|
||||
<item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay.Settings.SearchBar" parent="Theme.Settings">
|
||||
<item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
|
||||
<item name="cardBackgroundColor">?android:attr/colorPrimary</item>
|
||||
<item name="android:colorControlNormal">?android:attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
|
||||
|
||||
<style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base">
|
||||
|
@@ -14,7 +14,8 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<resources
|
||||
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
|
||||
|
||||
<color name="crypt_keeper_clock_background">#ff9a9a9a</color>
|
||||
<color name="crypt_keeper_clock_foreground">#ff666666</color>
|
||||
@@ -144,7 +145,7 @@
|
||||
<!-- End of QR code scanner colors -->
|
||||
|
||||
<!-- Search bar background color -->
|
||||
<color name="search_bar_background">@android:color/white</color>
|
||||
<color name="search_bar_background">?androidprv:attr/colorSurface</color>
|
||||
|
||||
<!-- Dialog background color -->
|
||||
<color name="dialog_background">@*android:color/background_device_default_light</color>
|
||||
|
Reference in New Issue
Block a user