Merge "Change master switch background and icon color"
This commit is contained in:
committed by
Android (Google) Code Review
commit
6f402eda13
@@ -16,7 +16,6 @@
|
||||
|
||||
<resources>
|
||||
<color name="switchbar_text_color">@android:color/black</color>
|
||||
<color name="switch_bar_background">#dadce0</color>
|
||||
<color name="switchbar_switch_track_tint">#82000000</color>
|
||||
<color name="switchbar_switch_thumb_tint">@android:color/black</color>
|
||||
<color name="homepage_accessibility_background">#783BE5</color>
|
||||
|
||||
@@ -29,9 +29,7 @@
|
||||
<item name="android:colorControlNormal">?android:attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.SubSettings" parent="Theme.SubSettings.Base">
|
||||
<item name="android:colorControlNormal">?android:attr/colorAccent</item>
|
||||
</style>
|
||||
<style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
|
||||
|
||||
<style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
|
||||
<item name="colorAccent">@*android:color/accent_device_default_dark</item>
|
||||
|
||||
@@ -56,7 +56,6 @@
|
||||
<color name="material_blue_700">#3367D6</color>
|
||||
<color name="material_grey_100">#f5f5f5</color>
|
||||
<color name="material_grey_200">#ffffff</color>
|
||||
<color name="switch_bar_background">#757575</color>
|
||||
|
||||
<color name="message_text_incoming">#ffffffff</color>
|
||||
<color name="message_text_outgoing">#ff323232</color>
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
<style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">
|
||||
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
|
||||
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
|
||||
<item name="switchBarBackgroundColor">@color/switch_bar_background</item>
|
||||
<item name="switchBarBackgroundColor">?android:attr/textColorSecondary</item>
|
||||
<item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
|
||||
<item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
|
||||
</style>
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<item name="android:textColorPrimary">@android:color/white</item>
|
||||
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
|
||||
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
|
||||
<item name="switchBarBackgroundColor">@color/switch_bar_background</item>
|
||||
<item name="switchBarBackgroundColor">?android:attr/textColorSecondary</item>
|
||||
<item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
|
||||
<item name="switchBarRestrictionIcon">@drawable/ic_help</item>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user