wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1055536 - Consolidate divider colors (r=margaret)

Browse Source
This commit is contained in:
Lucas Rocha 2014-09-02 16:07:44 +01:00
parent ce58b9d224
commit 1fcf632550
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/resources/drawable/divider_horizontal.xml
View File

@ -6,7 +6,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#D7D9DB"/>
<solid android:color="@color/divider_light"/>
<size android:height="1dp" />
</shape>

2
mobile/android/base/resources/drawable/divider_vertical.xml
View File

@ -6,7 +6,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#D7D9DB"/>
<solid android:color="@color/divider_light"/>
<size android:width="1dp" />
</shape>

2
mobile/android/base/resources/drawable/home_panel_title_background.xml
View File

@ -6,7 +6,7 @@
<shape android:shape="rectangle" >
<stroke android:width="1px"
android:color="@color/doorhanger_divider_light" />
android:color="@color/divider_light" />
<solid android:color="#00000000" />
</shape>

2
mobile/android/base/resources/values-v11/styles.xml
View File

@ -59,7 +59,7 @@
<!-- DropDown List View -->
<style name="DropDownListView" parent="@android:style/Widget.Holo.ListView.DropDown">
<item name="android:listSelector">@drawable/action_bar_button</item>
<item name="android:divider">#FFD7D9DB</item>
<item name="android:divider">@color/divider_light</item>
<item name="android:dividerHeight">1dp</item>
</style>

7
mobile/android/base/resources/values/colors.xml
View File

@ -69,6 +69,10 @@
<!-- Link colors -->
<color name="text_color_link">#22629E</color>
<!-- Divider colors -->
<color name="divider_light">#FFD7D9DB</color>
<color name="divider_dark">#FFB3C2CE</color>
<color name="splash_background">#000000</color>
<color name="splash_msgfont">#ffffff</color>
<color name="splash_urlfont">#000000</color>
@ -76,8 +80,6 @@
<color name="doorhanger_text">#FF222222</color>
<color name="doorhanger_link">#FF2AA1FE</color>
<color name="doorhanger_divider_light">#FFD7D9DB</color>
<color name="doorhanger_divider_dark">#FFB3C2CE</color>
<color name="doorhanger_background_dark">#FFDDE4EA</color>
<color name="validation_message_text">#ffffff</color>
@ -120,6 +122,5 @@
<color name="toast_background">#DD363B40</color>
<color name="toast_button_background">#00000000</color>
<color name="toast_button_pressed">#DD2C3136</color>
<color name="toast_button_divider">#FFD7D9DB</color>
<color name="toast_button_text">#FFFFFFFF</color>
</resources>

4
mobile/android/base/resources/values/styles.xml
View File

@ -45,7 +45,7 @@
</style>
<style name="Widget.ListView" parent="Widget.BaseListView">
<item name="android:divider">#D7D9DB</item>
<item name="android:divider">@color/divider_light</item>
<item name="android:dividerHeight">1dp</item>
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:listSelector">@drawable/action_bar_button</item>
@ -686,7 +686,7 @@
</style>
<style name="ToastDividerBase">
<item name="android:background">@color/toast_button_divider</item>
<item name="android:background">@color/divider_light</item>
<item name="android:layout_width">1dp</item>
<item name="android:layout_height">match_parent</item>
</style>

4
mobile/android/base/widget/DoorHanger.java
View File

@ -121,10 +121,10 @@ public class DoorHanger extends LinearLayout {
if (theme == Theme.LIGHT) {
// The default styles declared in doorhanger.xml are light-themed, so we just
// need to set the divider color that we'll use in addButton.
mDividerColor = mResources.getColor(R.color.doorhanger_divider_light);
mDividerColor = mResources.getColor(R.color.divider_light);
} else if (theme == Theme.DARK) {
mDividerColor = mResources.getColor(R.color.doorhanger_divider_dark);
mDividerColor = mResources.getColor(R.color.divider_dark);
// Set a dark background, and use a smaller text size for dark-themed DoorHangers.
setBackgroundColor(mResources.getColor(R.color.doorhanger_background_dark));