Remove the last vestiges of #ff009587.

It was very close the proper colorAccent, so just use that everywhere.
This change updates the Memory Settings page and the running processes
page.

BUG: 28987891
Change-Id: I3895ae9b596125d7e4bda0d02f0686c87a75ead6

diff --git a/res/layout/running_processes_header.xml b/res/layout/running_processes_header.xml
index 38ff614..615d30e 100644 (file)
--- a/res/layout/running_processes_header.xml
+++ b/res/layout/running_processes_header.xml
@@ -97,7 +97,7 @@
             android:layout_height="16sp"
             android:layout_gravity="center"
             android:scaleType="centerInside"
-            android:src="@color/running_processes_apps_ram"
+            android:src="?android:attr/colorAccent"
             android:contentDescription="@null" />
         <LinearLayout
             android:layout_width="match_parent"

diff --git a/res/values/colors.xml b/res/values/colors.xml
index a194cc1..a462edc 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -69,7 +69,6 @@
     <color name="fingerprint_indicator_background_resting">#12000000</color>
 
     <color name="running_processes_system_ram">#ff384248</color>
-    <color name="running_processes_apps_ram">#ff009587</color>
     <color name="running_processes_free_ram">#ffced7db</color>
 
     <color name="card_background">#ffffffff</color>

diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index 30701dc..01dbf09 100644 (file)
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -53,10 +53,6 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
 
         addPreferencesFromResource(R.xml.process_stats_summary);
         mSummaryPref = (SummaryPreference) findPreference(KEY_STATUS_HEADER);
-        int memColor = getContext().getColor(R.color.running_processes_apps_ram);
-        mSummaryPref.setColors(memColor, memColor,
-                getContext().getColor(R.color.running_processes_free_ram));
-
         mPerformance = findPreference(KEY_PERFORMANCE);
         mTotalMemory = findPreference(KEY_TOTAL_MEMORY);
         mAverageUsed = findPreference(KEY_AVERAGY_USED);

diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index af60996..6ab3eea 100644 (file)
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -21,6 +21,7 @@ import android.app.Dialog;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.os.UserHandle;
@@ -28,6 +29,7 @@ import android.text.BidiFormatter;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -449,8 +451,13 @@ public class RunningProcessesView extends FrameLayout
         mListView.addHeaderView(mHeader, null, false /* set as not selectable */);
         mColorBar = (LinearColorBar)mHeader.findViewById(R.id.color_bar);
         final Context context = getContext();
+
+        Resources.Theme theme = context.getTheme();
+        TypedValue typedValue = new TypedValue();
+        theme.resolveAttribute(android.R.attr.colorAccent, typedValue, true);
+
         mColorBar.setColors(context.getColor(R.color.running_processes_system_ram),
-                context.getColor(R.color.running_processes_apps_ram),
+                context.getColor(typedValue.resourceId),
                 context.getColor(R.color.running_processes_free_ram));
         mBackgroundProcessPrefix = (TextView)mHeader.findViewById(R.id.freeSizePrefix);
         mAppsProcessPrefix = (TextView)mHeader.findViewById(R.id.appsSizePrefix);