summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2010-09-27 21:03:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 21:03:10 -0700
commit6021a81381703e26acccf94a074624ca9bb65ab8 (patch)
treeb90837e0ea3f64bda701971591eb72aeb3b1873b /src/com/android/settings
parentd6f455cf6df72f6c79bf4c7ecdaad41bb635804a (diff)
parentca76166c705dc78e5a186a9a41f324ba70f0a938 (diff)
downloadpackages_apps_Settings-6021a81381703e26acccf94a074624ca9bb65ab8.tar.gz
packages_apps_Settings-6021a81381703e26acccf94a074624ca9bb65ab8.tar.bz2
packages_apps_Settings-6021a81381703e26acccf94a074624ca9bb65ab8.zip
am ca76166c: am 0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread
Merge commit 'ca76166c705dc78e5a186a9a41f324ba70f0a938' * commit 'ca76166c705dc78e5a186a9a41f324ba70f0a938': Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
Diffstat (limited to 'src/com/android/settings')
-rw-r--r--src/com/android/settings/applications/ManageApplications.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index f8463c3d5..9c6ae7a0c 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) {