From d2a922720f22c1d130afb3248840cccd328fecdc Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 12 Jan 2011 14:09:36 -0800
Subject: [PATCH] Remove popup indicator for dialog style preference items.

Bug: 3341160
Change-Id: I1d3da0dfd7216f6bdea0c38347f57ec524a1641b
---
 core/res/res/layout/preference_dialog.xml | 23 -----------------------
 core/res/res/values/styles.xml            |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 core/res/res/layout/preference_dialog.xml

diff --git a/core/res/res/layout/preference_dialog.xml b/core/res/res/layout/preference_dialog.xml
deleted file mode 100644
index 9e988ad6e651c..0000000000000
--- a/core/res/res/layout/preference_dialog.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 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.
--->
-
-<!-- Layout used by DialogPreference in a PreferenceActivity. -->
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:background="@drawable/btn_circle"
-    android:src="@drawable/ic_btn_round_more" />
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index f52be0d22fad4..cf9c00b2547d9 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -888,7 +888,6 @@
     <style name="Preference.DialogPreference">
         <item name="android:positiveButtonText">@android:string/ok</item>
         <item name="android:negativeButtonText">@android:string/cancel</item>
-        <item name="android:widgetLayout">@android:layout/preference_dialog</item>
     </style>
     
     <style name="Preference.DialogPreference.YesNoPreference">
@@ -904,7 +903,6 @@
         <item name="android:ringtoneType">ringtone</item>
         <item name="android:showSilent">true</item>
         <item name="android:showDefault">true</item>
-        <item name="android:widgetLayout">@android:layout/preference_dialog</item>
     </style>
 
     <!-- No margins or background by default. Could be different for x-large screens -->