From 0c5b9ca58bda5bc3c56f1e6c78859f7de147e476 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 5 Jan 2011 15:28:21 -0800
Subject: [PATCH] fix 3185231: Dragging app to info button doesn't work

When dragging an app from all apps to the info button, it
is currently showing an empty dialog.
---
 AndroidManifest.xml                                        | 1 -
 .../android/settings/applications/InstalledAppDetails.java | 7 ++++---
 .../settings/applications/InstalledAppDetailsTop.java      | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e7a77de0788..c7fcf6ad180 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -550,7 +550,6 @@
              InstalledAppDetails. -->
         <activity android:name=".applications.InstalledAppDetailsTop"
                   android:label="@string/application_info_label"
-                  android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                   android:exported="true">
         </activity>
         <activity-alias android:name=".applications.InstalledAppDetails"
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 1d46ed04858..de897eb49e8 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -408,10 +408,11 @@ public class InstalledAppDetails extends Fragment
         if (mMoveInProgress) {
             return true;
         }
-        
-        String packageName = getArguments().getString(ARG_PACKAGE_NAME);
+        final Bundle args = getArguments();
+        String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
         if (packageName == null) {
-            Intent intent = (Intent)getArguments().getParcelable("intent");
+            Intent intent = (args == null) ?
+                    getActivity().getIntent() : (Intent) args.getParcelable("intent");
             if (intent != null) {
                 packageName = intent.getData().getSchemeSpecificPart();
             }
diff --git a/src/com/android/settings/applications/InstalledAppDetailsTop.java b/src/com/android/settings/applications/InstalledAppDetailsTop.java
index 5ad21820d1d..4051aeba767 100644
--- a/src/com/android/settings/applications/InstalledAppDetailsTop.java
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java
@@ -8,6 +8,7 @@ public class InstalledAppDetailsTop extends PreferenceActivity {
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
 }