From ca60dc7fcdafeafa874e66e807ca21538dc1cf15 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 27 Mar 2013 09:44:49 -0700
Subject: [PATCH] Fix padding so TextViews are baseline aligned.

Also removed unused layout.

Change-Id: I1dd69c3766a58d389fb2fadcf04b23210af3d00a
---
 res/layout/app_percentage_item.xml   |  1 +
 res/layout/preference_powergauge.xml | 82 ----------------------------
 2 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100644 res/layout/preference_powergauge.xml

diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index f966d20d731..03226ca2b89 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -46,6 +46,7 @@
     <TextView
         android:id="@android:id/text1"
         android:layout_marginStart="8dip"
+        android:layout_marginTop="2dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <ProgressBar
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
deleted file mode 100644
index 5efc028f715..00000000000
--- a/res/layout/preference_powergauge.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingStart="16dip"
-    android:paddingEnd="?android:attr/scrollbarSize">
-
-    <ImageView
-        android:id="@+id/appIcon"
-        android:layout_width="48dip"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="6dip"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dip"
-        android:layout_marginTop="2dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:layout_marginTop="2dip"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:layout_toStartOf="@+id/percent"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <TextView android:id="@+id/percent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignBottom="@android:id/title"
-            android:layout_gravity="bottom"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textStyle="bold"/>
-
-        <ImageView
-            android:id="@+id/appGauge"
-            android:background="#80404040"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dip"
-            android:layout_below="@id/percent"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@null" />
-
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignStart="@id/appGauge"
-            android:layout_below="@id/appGauge"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-    </RelativeLayout>
-
-</LinearLayout>