From 9c6ab88bd71ad355b45e894f62f0a9a6abb19184 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Mon, 20 Jun 2016 11:04:43 -0400
Subject: [PATCH] Fix focusability of battery history chart

Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes: 29453492
---
 res/layout/battery_history_detail.xml | 46 +++++++++++++++------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/res/layout/battery_history_detail.xml b/res/layout/battery_history_detail.xml
index df6248d013d..e254711e8af 100644
--- a/res/layout/battery_history_detail.xml
+++ b/res/layout/battery_history_detail.xml
@@ -22,30 +22,36 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/charge"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="36sp"
-        android:textColor="?android:attr/colorAccent" />
+        android:focusable="true"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/charge"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="36sp"
+            android:textColor="?android:attr/colorAccent" />
 
-    <TextView
-        android:id="@+id/estimation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorSecondary" />
+        <TextView
+            android:id="@+id/estimation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorSecondary" />
 
-    <com.android.settingslib.graph.UsageView
-        android:id="@+id/battery_usage"
-        android:layout_width="match_parent"
-        android:layout_height="141dp"
-        settings:sideLabels="@array/battery_labels"
-        android:colorAccent="?android:attr/colorAccent"
-        android:gravity="end"
-        settings:textColor="?android:attr/textColorSecondary" />
+        <com.android.settingslib.graph.UsageView
+            android:id="@+id/battery_usage"
+            android:layout_width="match_parent"
+            android:layout_height="141dp"
+            settings:sideLabels="@array/battery_labels"
+            android:colorAccent="?android:attr/colorAccent"
+            android:gravity="end"
+            settings:textColor="?android:attr/textColorSecondary" />
+    </LinearLayout>
 
     <View
         android:layout_width="match_parent"