Change ripple in battery pages

1. Add ripple for battery header
2. Remove ripple for battery usage graph

Bug: 35959227
Bug: 35957849
Test: Manual
Change-Id: I7b9965304d0c79b59bdac92719e303931206b672

diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index a2484c2..ef39d8b 100644 (file)
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -24,6 +24,7 @@
     android:orientation="horizontal"
     android:paddingTop="24dp"
     android:paddingBottom="24dp"
+    android:background="@drawable/selectable_card_grey"
     style="@style/EntityHeader">
 
     <com.android.settings.fuelgauge.BatteryMeterView

diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index a1fe849..bed2dc5 100644 (file)
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -57,7 +57,6 @@ public class BatteryHistoryPreference extends Preference {
         if (mBatteryInfo == null) {
             return;
         }
-        view.itemView.setClickable(true);
         view.setDividerAllowedAbove(true);
         ((TextView) view.findViewById(R.id.charge)).setText(mBatteryInfo.batteryPercentString);
         ((TextView) view.findViewById(R.id.estimation)).setText(