From 6433bd8f6a8c8a389f849409e322183ba68726d6 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 4 Jun 2015 02:45:40 +0000 Subject: [PATCH] Revert "Fix some dark theme issues" This breaks the pattern entry screens of SecuritySettings. Reverting until we can take a closer look. This reverts commit cb8ccbb3b5907eb6deb9fbc74fb3b3de141028fb. Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227 --- res/drawable-hdpi/ic_menu_delete.png | Bin 0 -> 244 bytes res/drawable-mdpi/ic_menu_delete.png | Bin 0 -> 162 bytes res/drawable-xhdpi/ic_menu_delete.png | Bin 0 -> 208 bytes res/drawable-xxhdpi/ic_menu_delete.png | Bin 0 -> 294 bytes res/drawable-xxxhdpi/ic_menu_delete.png | Bin 0 -> 319 bytes res/drawable/ic_menu_add.xml | 20 --------------- res/drawable/ic_menu_delete.xml | 24 ------------------ res/layout/data_usage_chart.xml | 8 +++--- res/values/colors.xml | 9 ++++--- res/values/themes.xml | 2 +- .../android/settings/AccountPreference.java | 6 +++-- .../settings/accounts/AccountSettings.java | 2 +- .../settings/widget/ChartSweepView.java | 9 +++---- 13 files changed, 18 insertions(+), 62 deletions(-) create mode 100644 res/drawable-hdpi/ic_menu_delete.png create mode 100644 res/drawable-mdpi/ic_menu_delete.png create mode 100644 res/drawable-xhdpi/ic_menu_delete.png create mode 100644 res/drawable-xxhdpi/ic_menu_delete.png create mode 100644 res/drawable-xxxhdpi/ic_menu_delete.png delete mode 100644 res/drawable/ic_menu_add.xml delete mode 100644 res/drawable/ic_menu_delete.xml diff --git a/res/drawable-hdpi/ic_menu_delete.png b/res/drawable-hdpi/ic_menu_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..e25b44f90690d9f4f4efb09434c9097127191677 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZYyx~jTp6aelZ|?3e@p|KBU}>X z7tFv>*TK%YyW!`L!w1dYnTREoC)O4+7XYP0JY5_^EKVmUNW5v7*eS^~Bcfn+VybW( zlUZ2Kr#FWp7_85V2y)IaWDs+mv8`82D%2&}Rpv#O#YT-sPT@y-T?P5|S4qX$>2yi_ jU}c%uAYgxZ0UN`H7m6yGuRHsI<}-M@`njxgN@xNAN1aiQ literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_menu_delete.png b/res/drawable-mdpi/ic_menu_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..b0517ad376398cd9bd44382a590f01d2777ad5cf GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wxd5LKSB9zWcu@Vt)^$LYoFzei z!3;9DrJp?Ve(LqX!@dJ3sO9P67$R{wIYB{=LVl$;~uFHo&D hWisER3ITaBhT9?5%2T$AmH>4zc)I$ztaD0e0swo+FF*hQ literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_menu_delete.png b/res/drawable-xhdpi/ic_menu_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..33010c65478e18a24769d31768fcf55f47682b3a GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)IbOU@sTp6ae6OX=X7kC3T@|6Vn z1v8X4eEhI(jru!Pxle1AMFe;^17%!1T^vI!PA4Zw+;Mm(D`0a(B)y8AjcdiC_W=yK zDkm5$e5IyJOkLn`h)?k!i>nf!;zu6WMNEnpJCzPj4mj9!${=Lpf?b@J$2KWUdUhkzdY*I2?}KkO^X8Ff7M|bbCGGli-sWHkgaL^|E*xmJS3;^Xy5Vgx6d(jylzkaeE5aV@BPct k;{L7GuMCuY-r1p-&B`JoUr-) - - - diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml deleted file mode 100644 index 1f211c5ed42..00000000000 --- a/res/drawable/ic_menu_delete.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml index 648c7f8d7e4..2f9d962325b 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -43,7 +43,7 @@ android:layout_height="match_parent" android:layout_gravity="start|bottom" settings:strokeColor="#00000000" - settings:fillColor="?android:attr/colorAccent" + settings:fillColor="#ff009688" settings:fillColorSecondary="#ff80cbc4" settings:safeRegion="3dp" /> @@ -53,8 +53,8 @@ android:layout_height="match_parent" android:layout_gravity="start|bottom" settings:strokeColor="#00000000" - settings:fillColor="?android:attr/colorAccent" - settings:fillColorSecondary="?android:attr/colorAccent" + settings:fillColor="#ff009688" + settings:fillColorSecondary="#ff009688" settings:safeRegion="3dp" /> @android:color/white #fff4511e - ?android:attr/colorAccent + #ff009688 #ffffffff #de000000 - ?android:attr/colorAccent + #ff009688 #20000000 - ?android:attr/colorAccent + #ff009688 #ff384248 #ff009587 @@ -76,12 +76,13 @@ #ff7fcac3 #ffe0e0e0 + #ff009688 @*android:color/material_deep_teal_500 #ff5621 #263238 #1fffffff - ?android:attr/colorAccent + #ff009688 #33b5e5 #009688 diff --git a/res/values/themes.xml b/res/values/themes.xml index c2285e221de..76fc04f2265 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -93,7 +93,7 @@ @*android:drawable/ic_menu_moreoverflow_holo_dark @drawable/ic_wps_light @drawable/wifi_signal - ?android:attr/colorAccent + @color/wifi_signal_icon_color @dimen/settings_side_margin diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java index 64685c00809..75477213717 100644 --- a/src/com/android/settings/AccountPreference.java +++ b/src/com/android/settings/AccountPreference.java @@ -114,8 +114,7 @@ public class AccountPreference extends Preference { int res; switch (status) { case SYNC_ENABLED: - case SYNC_IN_PROGRESS: - res = R.drawable.ic_settings_sync; + res = R.drawable.ic_sync_green_holo; break; case SYNC_DISABLED: res = R.drawable.ic_sync_grey_holo; @@ -123,6 +122,9 @@ public class AccountPreference extends Preference { case SYNC_ERROR: res = R.drawable.ic_sync_red_holo; break; + case SYNC_IN_PROGRESS: + res = R.drawable.ic_sync_green_holo; + break; default: res = R.drawable.ic_sync_red_holo; Log.e(TAG, "Unknown sync status: " + status); diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java index c010a7bdc14..ffada538e7f 100644 --- a/src/com/android/settings/accounts/AccountSettings.java +++ b/src/com/android/settings/accounts/AccountSettings.java @@ -296,7 +296,7 @@ public class AccountSettings extends SettingsPreferenceFragment private Preference newAddAccountPreference(Context context) { Preference preference = new Preference(context); preference.setTitle(R.string.add_account_label); - preference.setIcon(R.drawable.ic_menu_add); + preference.setIcon(R.drawable.ic_menu_add_dark); preference.setOnPreferenceClickListener(this); preference.setOrder(ORDER_NEXT_TO_LAST); return preference; diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java index e8e24aa0027..04fc86219f5 100644 --- a/src/com/android/settings/widget/ChartSweepView.java +++ b/src/com/android/settings/widget/ChartSweepView.java @@ -123,15 +123,14 @@ public class ChartSweepView extends View { final TypedArray a = context.obtainStyledAttributes( attrs, R.styleable.ChartSweepView, defStyle, 0); - final int color = a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE); - setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable), color); + setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable)); setFollowAxis(a.getInt(R.styleable.ChartSweepView_followAxis, -1)); setNeighborMargin(a.getDimensionPixelSize(R.styleable.ChartSweepView_neighborMargin, 0)); setSafeRegion(a.getDimensionPixelSize(R.styleable.ChartSweepView_safeRegion, 0)); setLabelMinSize(a.getDimensionPixelSize(R.styleable.ChartSweepView_labelSize, 0)); setLabelTemplate(a.getResourceId(R.styleable.ChartSweepView_labelTemplate, 0)); - setLabelColor(color); + setLabelColor(a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE)); // TODO: moved focused state directly into assets setBackgroundResource(R.drawable.data_usage_sweep_background); @@ -214,7 +213,7 @@ public class ChartSweepView extends View { requestLayout(); } - public void setSweepDrawable(Drawable sweep, int color) { + public void setSweepDrawable(Drawable sweep) { if (mSweep != null) { mSweep.setCallback(null); unscheduleDrawable(mSweep); @@ -227,8 +226,6 @@ public class ChartSweepView extends View { } sweep.setVisible(getVisibility() == VISIBLE, false); mSweep = sweep; - // Match the text. - mSweep.setTint(color); sweep.getPadding(mSweepPadding); } else { mSweep = null;