Merge "Misc GAR fixes" into pi-dev

am: c9d258a11e

Change-Id: I3bf714c5077004ed9c80fc7cb7515179a5df8e46

res/drawable/selectable_card_grey.xml

@@ -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>

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

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

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>