From 856b01e7e41c6800c81d04f001e5dd4f7ae05a57 Mon Sep 17 00:00:00 2001
From: Jatin Lodhia <jlodhia@google.com>
Date: Fri, 28 Sep 2012 10:53:37 -0700
Subject: [PATCH] Make the theme for choose account and choose account type
 dialogs same.

Contacts app uses a custom account picker which calls the system account picker
when an account needs to be added. The system accout picker invokes choose
accout type dialog which overlays over the system acccount picker. Because these
two dialog boxes use different themes, he one behind is wider than the one in
foreground and ends up looking like a thin black strip protruding from the two
sides.
Bug: 6980517

Change-Id: Ia8b23767d995dcbe1a58087cb4bfbee140c2c744
---
 core/res/AndroidManifest.xml                |  2 +-
 core/res/res/layout/choose_account_type.xml | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index a8bee4dc1500c..ab87b1bde69e9 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2097,7 +2097,7 @@
 
         <activity android:name="android.accounts.ChooseAccountTypeActivity"
                 android:excludeFromRecents="true"
-                android:theme="@android:style/Theme.Holo.DialogWhenLarge.NoActionBar"
+                android:theme="@android:style/Theme.Holo.Dialog"
                 android:label="@string/choose_account_label"
                 android:process=":ui">
         </activity>
diff --git a/core/res/res/layout/choose_account_type.xml b/core/res/res/layout/choose_account_type.xml
index 769d80b18d5d9..87d1ddee5e92a 100644
--- a/core/res/res/layout/choose_account_type.xml
+++ b/core/res/res/layout/choose_account_type.xml
@@ -20,20 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="16dip"
-    android:paddingEnd="16dip">
-
-    <TextView android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_gravity="start"
-        android:text="@string/add_account_label"
-        android:paddingTop="16dip"
-        android:paddingBottom="16dip"
-        android:textColor="@android:color/holo_blue_light"
-    />
+    android:orientation="vertical">
 
     <View android:layout_height="3dip"
           android:layout_width="match_parent"