diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-24 00:02:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-24 00:02:05 +0000 |
| commit | beb608899098733ff78c4d4a533a396892b89b4c (patch) | |
| tree | a42095cca86a8fe54ec5e370177335e3797d99ff /res | |
| parent | 29b915d5598fa983cbadd27fddc45afd228870a3 (diff) | |
| parent | 0171fdba7bd9b5acdcf0d32ffa12e07c69045a5d (diff) | |
| download | packages_apps_Settings-beb608899098733ff78c4d4a533a396892b89b4c.zip packages_apps_Settings-beb608899098733ff78c4d4a533a396892b89b4c.tar.gz packages_apps_Settings-beb608899098733ff78c4d4a533a396892b89b4c.tar.bz2 | |
am 0171fdba: Merge "Fix issue #15185822: Stability: ArithmeticException: divide by zero" into lmp-preview-dev
* commit '0171fdba7bd9b5acdcf0d32ffa12e07c69045a5d':
Fix issue #15185822: Stability: ArithmeticException: divide by zero
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/preference_batteryhistory.xml | 2 | ||||
| -rw-r--r-- | res/values-h480dp/dimens.xml | 19 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 2 |
3 files changed, 22 insertions, 1 deletions
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> |