Merge "Fix battery history details" into nyc-dev am: 43fa74b

am: 9eeb3f3

* commit '9eeb3f3d2d7892ca540ae6dc9567d1816dcf0613':
  Fix battery history details

Change-Id: I3c3bf2755ca8d7e2cca0cbf3277d1d515c8c072e

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

@@ -75,6 +75,7 @@ public class BatteryHistoryDetail extends SettingsPreferenceFragment {
         mCpuParser = new BatteryFlagParser(accentColor, false,
                 HistoryItem.STATE_CPU_RUNNING_FLAG);
         mPhoneParser = new BatteryCellParser();
+        setHasOptionsMenu(true);
     }
     
     @Override