From b585c62811064e29440bf6b50376a9a799da5173 Mon Sep 17 00:00:00 2001
From: Brian Muramatsu <btmura@google.com>
Date: Tue, 18 Sep 2012 18:39:29 -0700
Subject: [PATCH] Fix regulatory information dialog appearance

Bug 7081675

Replace RegulatoryInfoFragment with a custom preference so that the info
shows up properly in a dialog. DialogFragments do not appear
as dialogs when instantiated from preference XML files.

Change-Id: Icbdf73bd5b1d14f28a01d7b9cb0f37d90340eb46
---
 res/layout/regulatory_info.xml                     |  6 ++++--
 res/xml/device_info_settings.xml                   |  5 ++---
 ...Fragment.java => RegulatoryInfoPreference.java} | 25 +++++++++-------------
 3 files changed, 16 insertions(+), 20 deletions(-)
 rename src/com/android/settings/{RegulatoryInfoFragment.java => RegulatoryInfoPreference.java} (50%)

diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml
index e4999a4492..dc1efe8c7f 100755
--- a/res/layout/regulatory_info.xml
+++ b/res/layout/regulatory_info.xml
@@ -14,6 +14,8 @@
      limitations under the License.
 -->
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:adjustViewBounds="true"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:scaleType="centerCrop"
     android:src="@drawable/regulatory_info"/>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 4fabc9d109..03f1e7857b 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -89,9 +89,8 @@
         </PreferenceScreen>
         -->
 
-        <Preference android:key="regulatory_info"
-                android:title="@string/regulatory_information"
-                android:fragment="com.android.settings.RegulatoryInfoFragment"/>
+        <com.android.settings.RegulatoryInfoPreference android:key="regulatory_info"
+                android:title="@string/regulatory_information" />
 
         <!-- Device hardware model -->
         <Preference android:key="device_model" 
diff --git a/src/com/android/settings/RegulatoryInfoFragment.java b/src/com/android/settings/RegulatoryInfoPreference.java
similarity index 50%
rename from src/com/android/settings/RegulatoryInfoFragment.java
rename to src/com/android/settings/RegulatoryInfoPreference.java
index 7ee13bf036..f1a6b77e1b 100644
--- a/src/com/android/settings/RegulatoryInfoFragment.java
+++ b/src/com/android/settings/RegulatoryInfoPreference.java
@@ -16,24 +16,19 @@
 
 package com.android.settings;
 
-import android.app.DialogFragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.settings.R;
+import android.content.Context;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
 
 /**
- * {@link DialogFragment} that displays regulatory information.
- * "About phone" will show a preference that displays this fragment when
- * clicked if R.bool.config_show_regulatory_info is true.
+ * {@link DialogPreference} that displays regulatory information. "About phone"
+ * will show a "Regulatory information" preference if
+ * R.bool.config_show_regulatory_info is true.
  */
-public class RegulatoryInfoFragment extends DialogFragment {
+public class RegulatoryInfoPreference extends DialogPreference {
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.regulatory_info, container, false);
+    public RegulatoryInfoPreference(Context context, AttributeSet attrs) {
+        super(context, attrs, com.android.internal.R.attr.preferenceStyle);
+        setDialogLayoutResource(R.layout.regulatory_info);
     }
 }
-- 
2.11.0