PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix 3185231: Dragging app to info button doesn't work"

Browse Source
This commit is contained in:
Patrick Dubroy
2011-01-05 15:43:21 -08:00
committed by Android (Google) Code Review
parent ca3fcf1e0a 0c5b9ca58b
commit bc52e4c04f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -550,7 +550,6 @@
InstalledAppDetails. --> InstalledAppDetails. -->
<activity android:name=".applications.InstalledAppDetailsTop" <activity android:name=".applications.InstalledAppDetailsTop"
android:label="@string/application_info_label" android:label="@string/application_info_label"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:exported="true"> android:exported="true">
</activity> </activity>
<activity-alias android:name=".applications.InstalledAppDetails" <activity-alias android:name=".applications.InstalledAppDetails"

7
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -408,10 +408,11 @@ public class InstalledAppDetails extends Fragment
if (mMoveInProgress) { if (mMoveInProgress) {
return true; return true;
} }
final Bundle args = getArguments();
String packageName = getArguments().getString(ARG_PACKAGE_NAME); String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
if (packageName == null) { if (packageName == null) {
Intent intent = (Intent)getArguments().getParcelable("intent"); Intent intent = (args == null) ?
getActivity().getIntent() : (Intent) args.getParcelable("intent");
if (intent != null) { if (intent != null) {
packageName = intent.getData().getSchemeSpecificPart(); packageName = intent.getData().getSchemeSpecificPart();
} }

1
src/com/android/settings/applications/InstalledAppDetailsTop.java
View File

@@ -8,6 +8,7 @@ public class InstalledAppDetailsTop extends PreferenceActivity {
public Intent getIntent() { public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent()); Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName()); modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName());
modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent; return modIntent;
} }
} }