From 71c402b152b8948def547aa8401d440cf15b96b9 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
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/layout/radio_info.xml                     | 14 ++++++------
 .../widget/EntityHeaderController.java        |  2 ++
 .../shadow/SettingsShadowResources.java       |  3 ---
 .../shadow/SettingsShadowResourcesImpl.java   |  2 --
 7 files changed, 10 insertions(+), 37 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 e74ae8d7eeb..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/colorPrimary"/>
-</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/layout/radio_info.xml b/res/layout/radio_info.xml
index c1d6ff63f99..60b23c869d7 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -107,7 +107,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
+            android:background="?android:attr/listDivider" />
 
         <!-- Preferred Network Type -->
         <TextView
@@ -126,7 +126,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
+            android:background="?android:attr/listDivider" />
 
         <!-- Radio Power -->
         <Switch android:id="@+id/radio_power"
@@ -172,7 +172,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
+            android:background="?android:attr/listDivider" />
 
         <!-- Ping stats -->
         <Button android:id="@+id/ping_test"
@@ -202,7 +202,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
+            android:background="?android:attr/listDivider" />
 
         <!-- PPP Sent -->
         <LinearLayout style="@style/entry_layout">
@@ -229,7 +229,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
+            android:background="?android:attr/listDivider" />
 
         <!-- Call Status -->
         <LinearLayout style="@style/entry_layout">
@@ -253,7 +253,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
+            android:background="?android:attr/listDivider" />
 
         <!-- CellInfoListRate Selection -->
         <!-- Location -->
@@ -290,7 +290,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
+            android:background="?android:attr/listDivider" />
 
         <!-- Launch OEM-specific Info/Settings Activity (if any) -->
         <!-- Carrier Provisioning -->
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 6f46f1d155f..3e724fa44b2 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -31,9 +31,11 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
+
 import androidx.annotation.IntDef;
 import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.TextUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
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 167abc47112..0350f9a4304 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