From c883ee5eaae1666f8321cfcc3058fb3843e695dc Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 29 Aug 2011 12:22:35 -0700 Subject: [PATCH] Small improvements for issue #5225666 Sort disabled apps to the bottom of the list to make them easier to find together. Also change the order of the tabs because with the new layout anything after the third tab is buried so put all apps at the end so the running tab is more visible. Change-Id: Id022fdbf366505cf0da3fb9a6270c3f2e2704d51 --- .../android/settings/applications/ApplicationsState.java | 3 +++ .../android/settings/applications/ManageApplications.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java index e0899cb11c8..799b34a2170 100644 --- a/src/com/android/settings/applications/ApplicationsState.java +++ b/src/com/android/settings/applications/ApplicationsState.java @@ -153,6 +153,9 @@ public class ApplicationsState { private final Collator sCollator = Collator.getInstance(); @Override public int compare(AppEntry object1, AppEntry object2) { + if (object1.info.enabled != object2.info.enabled) { + return object1.info.enabled ? -1 : 1; + } return sCollator.compare(object1.label, object2.label); } }; diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 747b406f0bc..c2e68ddcc94 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -628,10 +628,6 @@ public class ManageApplications extends Fragment implements .setIndicator(getActivity().getString(R.string.filter_apps_third_party), getActivity().getResources().getDrawable(R.drawable.ic_tab_download)) .setContent(this)); - tabHost.addTab(tabHost.newTabSpec(TAB_ALL) - .setIndicator(getActivity().getString(R.string.filter_apps_all), - getActivity().getResources().getDrawable(R.drawable.ic_tab_all)) - .setContent(this)); if (!Environment.isExternalStorageEmulated()) { tabHost.addTab(tabHost.newTabSpec(TAB_SDCARD) .setIndicator(getActivity().getString(R.string.filter_apps_onsdcard), @@ -642,6 +638,10 @@ public class ManageApplications extends Fragment implements .setIndicator(getActivity().getString(R.string.filter_apps_running), getActivity().getResources().getDrawable(R.drawable.ic_tab_running)) .setContent(this)); + tabHost.addTab(tabHost.newTabSpec(TAB_ALL) + .setIndicator(getActivity().getString(R.string.filter_apps_all), + getActivity().getResources().getDrawable(R.drawable.ic_tab_all)) + .setContent(this)); tabHost.setCurrentTabByTag(mDefaultTab); tabHost.setOnTabChangedListener(this);