diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2009-09-16 18:18:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-16 18:18:36 -0700 |
| commit | 66fee5291b4db937cd8da02e3c3080052912941d (patch) | |
| tree | 230fa2e7bba8e6b6ece999d8f5a6dbf7c500203f | |
| parent | 0d0fcb5cba959436347318d8ed14b5f256ecb185 (diff) | |
| parent | 2a626ffa3c6e9ac624234ea5de65c106f4c3b679 (diff) | |
| download | android_packages_apps_PackageInstaller-66fee5291b4db937cd8da02e3c3080052912941d.tar.gz android_packages_apps_PackageInstaller-66fee5291b4db937cd8da02e3c3080052912941d.tar.bz2 android_packages_apps_PackageInstaller-66fee5291b4db937cd8da02e3c3080052912941d.zip | |
am 2a626ffa: am 2f830ef2: Finish UninstallerActivity after starting subactivity to actually uninstall which indicates progress etc., If not, the UninstallerActivity is again displayed after finishing off uninstallation. Remove entries from manifest that are no longer
Merge commit '2a626ffa3c6e9ac624234ea5de65c106f4c3b679'
* commit '2a626ffa3c6e9ac624234ea5de65c106f4c3b679':
Finish UninstallerActivity after starting subactivity to actually uninstall which indicates progress etc., If not, the UninstallerActivity is again displayed
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rwxr-xr-x | src/com/android/packageinstaller/UninstallerActivity.java | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 303897ad..5d35b0e2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -15,12 +15,8 @@ <data android:mimeType="application/vnd.android.package-archive" /> </intent-filter> </activity> - <activity android:name=".InstallAppConfirmation"> - </activity> <activity android:name=".InstallAppProgress"> </activity> - <activity android:name=".InstallAppDone"> - </activity> <activity android:name=".UninstallerActivity"> <intent-filter> <action android:name="android.intent.action.VIEW" /> @@ -31,7 +27,5 @@ </activity> <activity android:name=".UninstallAppProgress"> </activity> - <activity android:name=".UninstallAppDone"> - </activity> </application> </manifest> diff --git a/src/com/android/packageinstaller/UninstallerActivity.java b/src/com/android/packageinstaller/UninstallerActivity.java index 065da8b5..6310de8d 100755 --- a/src/com/android/packageinstaller/UninstallerActivity.java +++ b/src/com/android/packageinstaller/UninstallerActivity.java @@ -93,6 +93,7 @@ public class UninstallerActivity extends Activity implements OnClickListener, mAppInfo); newIntent.setClass(this, UninstallAppProgress.class); startActivity(newIntent); + finish(); } @Override |