commit 43b04bcc7dd3ccbfe41f7b5237f164a71eb74195
author Julia Reynolds <juliacr@google.com> Mon Jun 20 18:43:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 20 18:43:04 2016 +0000
tree 9b58f1b330b93268c1abb1a77aa49b5c00df9afe
parent 9c6ab88bd71ad355b45e894f62f0a9a6abb19184
parent 9bcc04c5db8fcec3a0a70ee01fe86dccfece5bfc

Merge "Fix NPE printing notification actions." into nyc-dev

res/layout/battery_history_detail.xml

diff --git a/res/layout/battery_history_detail.xml b/res/layout/battery_history_detail.xml
index df6248d..e254711 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"