commit 43fa74b9fdaf8398d0c1498311b307fbfea135a0
author Jason Monk <jmonk@google.com> Mon Apr 11 18:58:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 11 18:58:25 2016 +0000
tree c5784cbb72536666c29e6ee8063a6dba61d8929c
parent 6a0b7229847c6b2afb2a83aa397d23ec36a1df5b
parent 0b026116be5731aea8ff181f14f113efce437203

Merge "Fix battery history details" 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 d1563bf..df6248d 100644
--- a/res/layout/battery_history_detail.xml
+++ b/res/layout/battery_history_detail.xml
@@ -41,7 +41,7 @@
     <com.android.settingslib.graph.UsageView
         android:id="@+id/battery_usage"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="141dp"
         settings:sideLabels="@array/battery_labels"
         android:colorAccent="?android:attr/colorAccent"
         android:gravity="end"

src/com/android/settings/fuelgauge/BatteryHistoryDetail.java

diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index 25d5292..e79f8ff 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -75,6 +75,7 @@
         mCpuParser = new BatteryFlagParser(accentColor, false,
                 HistoryItem.STATE_CPU_RUNNING_FLAG);
         mPhoneParser = new BatteryCellParser();
+        setHasOptionsMenu(true);
     }
     
     @Override