Merge "fix 3185231: Dragging app to info button doesn't work"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e7a77de..c7fcf6a 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 1d46ed0..de897eb 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -408,10 +408,11 @@
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 5ad2182..4051aeb 100644
--- a/src/com/android/settings/applications/InstalledAppDetailsTop.java
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java
@@ -8,6 +8,7 @@
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;
}
}