From 1e0e0ed6dfa608c168b38cbf73ee8ad38ac563c0 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Tue, 17 Jun 2014 16:43:00 -0700
Subject: [PATCH] Fix UsageBar for Storage Settings

- make padding consistent with the rest of the Settings App

See bug: #15384992 Setting Dashboard - padding updates

Change-Id: Id333493cc4e88355a1211834081cd22e61aabf77
---
 res/layout/preference_memoryusage.xml         |  4 ++--
 .../deviceinfo/UsageBarPreference.java        | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/res/layout/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml
index ddc619dd77d..609ae3a0f2a 100644
--- a/res/layout/preference_memoryusage.xml
+++ b/res/layout/preference_memoryusage.xml
@@ -20,8 +20,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:paddingStart="@*android:dimen/preference_widget_width">
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <com.android.settings.deviceinfo.PercentageBarChart
         android:id="@+id/percentage_bar_chart"
diff --git a/src/com/android/settings/deviceinfo/UsageBarPreference.java b/src/com/android/settings/deviceinfo/UsageBarPreference.java
index 371c7728837..4763b79b315 100644
--- a/src/com/android/settings/deviceinfo/UsageBarPreference.java
+++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java
@@ -35,18 +35,21 @@ public class UsageBarPreference extends Preference {
 
     private final List<PercentageBarChart.Entry> mEntries = Lists.newArrayList();
 
-    public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        setLayoutResource(R.layout.preference_memoryusage);
-    }
-
     public UsageBarPreference(Context context) {
-        super(context);
-        setLayoutResource(R.layout.preference_memoryusage);
+        this(context, null);
     }
 
     public UsageBarPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
+        this(context, attrs, 0);
+    }
+
+    public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
+        this(context, attrs, defStyle, 0);
+    }
+
+    public UsageBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
         setLayoutResource(R.layout.preference_memoryusage);
     }