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

Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: I66faa39d0996256e30111f8ce13d735ecd989299
This commit is contained in:
Jason Chiu
2021-05-11 02:55:37 +00:00
committed by Automerger Merge Worker
parent a28add07a2 0c2fa9cd69
commit 3ea3c99e16
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values-night/colors.xml
View File

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

6
res/values-night/themes.xml
View File

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

7
res/values/colors.xml
View File

@@ -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>
@@ -200,4 +201,4 @@
<color name="accessibility_color_inversion_background">#546E7A</color>
<color name="battery_info_error_color_red">#fce8e6</color> <!-- Material Red 50 -->
</resources>
</resources>