From 3ab53bbd7b6763c3a0f50b7b461c416d99568b1a Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 21 May 2018 12:07:28 -0700
Subject: [PATCH] Misc GAR fixes

- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.

Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 79773433
Test: robotests
Test: visual
---
 res/drawable/selectable_card_grey.xml         | 22 -------------------
 res/layout/battery_header.xml                 |  1 -
 res/layout/data_usage_summary_preference.xml  |  3 +--
 res/values/styles.xml                         |  2 +-
 .../widget/EntityHeaderController.java        |  2 +-
 .../shadow/SettingsShadowResources.java       |  3 ---
 .../shadow/SettingsShadowResourcesImpl.java   |  2 --
 7 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 res/drawable/selectable_card_grey.xml

diff --git a/res/drawable/selectable_card_grey.xml b/res/drawable/selectable_card_grey.xml
deleted file mode 100644
index 225e72fcff1..00000000000
--- a/res/drawable/selectable_card_grey.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="?android:attr/colorSecondary"/>
-</ripple>
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index db90e2e0fc8..df45d15fd6d 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -24,7 +24,6 @@
     android:orientation="horizontal"
     android:paddingTop="24dp"
     android:paddingBottom="24dp"
-    android:background="@drawable/selectable_card_grey"
     style="@style/EntityHeader">
 
     <LinearLayout
diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index 6af159a01ba..6617ac9cacf 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -23,7 +23,6 @@
     android:paddingStart="@dimen/preference_no_icon_padding_start"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical"
-    android:background="@drawable/selectable_card_grey"
     android:selectable="false"
     style="@style/EntityHeader">
 
@@ -31,7 +30,7 @@
         android:id="@+id/usage_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="?android:attr/textColorPrimary"
         android:text="@string/data_usage_title" />
 
     <com.android.settings.datausage.MeasurableLinearLayout
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 805261655a4..f82d0e5e854 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -412,7 +412,7 @@
     </style>
 
     <style name="EntityHeader">
-        <item name="android:background">?android:attr/colorSecondary</item>
+        <item name="android:background">?android:attr/colorPrimary</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingStart">16dp</item>
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 6d67eb49039..bb8f00ceb0a 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -318,7 +318,7 @@ public class EntityHeaderController {
             return this;
         }
         actionBar.setBackgroundDrawable(
-                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));
+                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorPrimary)));
         actionBar.setElevation(0);
         if (mRecyclerView != null && mLifecycle != null) {
             ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index 768e6eac663..f06d64b32e8 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -1,7 +1,6 @@
 package com.android.settings.testutils.shadow;
 
 import static android.util.TypedValue.TYPE_REFERENCE;
-
 import static org.robolectric.RuntimeEnvironment.application;
 import static org.robolectric.Shadows.shadowOf;
 import static org.robolectric.shadow.api.Shadow.directlyOn;
@@ -122,8 +121,6 @@ public class SettingsShadowResources extends ShadowResources {
             id = R.drawable.ic_settings_wireless;
         } else if (id == R.drawable.app_filter_spinner_background) {
             id = R.drawable.ic_expand_more_inverse;
-        } else if (id == R.drawable.selectable_card_grey) {
-            id = R.drawable.ic_expand_more_inverse;
         }
         return super.loadDrawable(value, id, theme);
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
index 3fb8e2decb5..e9c7b5855d2 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
@@ -50,8 +50,6 @@ public class SettingsShadowResourcesImpl extends ShadowResourcesImpl {
             id = R.drawable.ic_settings_wireless;
         } else if (id == R.drawable.app_filter_spinner_background) {
             id = R.drawable.ic_expand_more_inverse;
-        } else if (id == R.drawable.selectable_card_grey) {
-            id = R.drawable.ic_expand_more_inverse;
         } else if (id == R.drawable.color_bar_progress
                 || id == R.drawable.ring_progress) {
             // color_bar_progress and ring_progress use hidden resources, so just use the regular