diff options
| author | Winson Chung <winsonc@google.com> | 2010-09-27 15:09:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 15:09:08 -0700 |
| commit | ca76166c705dc78e5a186a9a41f324ba70f0a938 (patch) | |
| tree | c7356600b84197c82f42f0bd0755d1680535fb82 | |
| parent | 2d68f1b56b4146c5203cd793fb64d8e3a8c2da8d (diff) | |
| parent | 0adb8460bcb736d67f87bf1b56150bfac9c9c130 (diff) | |
| download | packages_apps_settings-ca76166c705dc78e5a186a9a41f324ba70f0a938.zip packages_apps_settings-ca76166c705dc78e5a186a9a41f324ba70f0a938.tar.gz packages_apps_settings-ca76166c705dc78e5a186a9a41f324ba70f0a938.tar.bz2 | |
am 0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread
Merge commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130' into gingerbread-plus-aosp
* commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130':
Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/settings/applications/ManageApplications.java | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1c1bb6d..92f5c26 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -360,6 +360,7 @@ <action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" /> <action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" /> + <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.MONKEY" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index f8463c3..9c6ae7a 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -431,6 +431,9 @@ public class ManageApplications extends TabActivity implements mSortOrder = SORT_ORDER_SIZE; mFilterApps = FILTER_APPS_ALL; defaultTabTag = TAB_ALL; + } else if (action.equals(Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS)) { + // Select the all-apps tab, with the default sorting + defaultTabTag = TAB_ALL; } if (savedInstanceState != null) { |