From a32d81797f0e8164f922d9626ed6258c93b72772 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 23 May 2014 16:47:10 -0700
Subject: Fix issue #15185822: Stability: ArithmeticException: divide by zero

Also small visual improvements.

Change-Id: I55dc30539a4ef67e9261f338c8c5a729a6958d9b
---
 res/layout/preference_batteryhistory.xml |  2 +-
 res/values-h480dp/dimens.xml             | 19 +++++++++++++++++++
 res/values/dimens.xml                    |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 res/values-h480dp/dimens.xml

(limited to 'res')

diff --git a/res/layout/preference_batteryhistory.xml b/res/layout/preference_batteryhistory.xml
index 86856d7..a09c6a8 100644
--- a/res/layout/preference_batteryhistory.xml
+++ b/res/layout/preference_batteryhistory.xml
@@ -19,7 +19,7 @@
         xmlns:app="http://schemas.android.com/apk/res/com.android.settings"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="128dp"
+    android:minHeight="@dimen/battery_history_chart_height"
     android:gravity="center_vertical"
     android:id="@+android:id/battery_history_chart"
     android:paddingEnd="?android:attr/scrollbarSize"
diff --git a/res/values-h480dp/dimens.xml b/res/values-h480dp/dimens.xml
new file mode 100644
index 0000000..6610b4f
--- /dev/null
+++ b/res/values-h480dp/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="battery_history_chart_height">160dp</dimen>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 93d9833..460fb44 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -29,6 +29,8 @@
     <dimen name="bind_app_widget_dialog_checkbox_bottom_padding">16dip</dimen>
     <dimen name="installed_app_details_bullet_offset">8dip</dimen>
 
+    <dimen name="battery_history_chart_height">120dp</dimen>
+
     <dimen name="data_usage_chart_height">252dip</dimen>
     <dimen name="data_usage_chart_optimalWidth">440dip</dimen>
 
-- 
cgit v1.1