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

am 5466090c: am 9e710510: Merge change 26022 into eclair

Browse Source 
Merge commit '5466090cb8bb8f93423a19902157e6cea8c4fc62'

* commit '5466090cb8bb8f93423a19902157e6cea8c4fc62':
  Change default filter to third party when launched via settings and all apps when launched via
This commit is contained in:
Suchi Amalapurapu
2009-09-21 09:36:04 -07:00
committed by Android Git Automerger
parent 833dab7d13 5466090cb8
commit fd400d37ff
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/installed_app_details.xml
View File

@@ -304,7 +304,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_width="150dip" android:layout_width="150dip"
android:text="@string/clear_activities" android:text="@string/clear_activities"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</RelativeLayout> </RelativeLayout>
<!-- Other controls section --> <!-- Other controls section -->
@@ -320,6 +320,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:paddingTop="6dip"
android:layout_width="150dip" android:layout_width="150dip"
android:text="@string/force_stop" android:text="@string/force_stop"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />

4
res/values/strings.xml
View File

@@ -1371,7 +1371,7 @@
<string name="filter_apps_all">All</string> <string name="filter_apps_all">All</string>
<!-- Text for filter option in ManageApps screen to display third party <!-- Text for filter option in ManageApps screen to display third party
applications only --> applications only -->
<string name="filter_apps_third_party">Third-party</string> <string name="filter_apps_third_party">Downloaded</string>
<!-- Text for filter option in ManageApps screen to display list of running <!-- Text for filter option in ManageApps screen to display list of running
packages only. --> packages only. -->
<string name="filter_apps_running">Running</string> <string name="filter_apps_running">Running</string>
@@ -1381,7 +1381,7 @@
<!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". --> <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
<string name="clear_data_dlg_title">Delete</string> <string name="clear_data_dlg_title">Delete</string>
<!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. --> <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
<string name="clear_data_dlg_text">All information you\'ve saved in this application will be deleted permanently.</string> <string name="clear_data_dlg_text">All of this application\'s data will be deleted permanently. This includes all files, settings, accounts, databases and so on.</string>
<!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. --> <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
<string name="dlg_ok">OK</string> <string name="dlg_ok">OK</string>
<!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". --> <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->

5
src/com/android/settings/ManageApplications.java
View File

@@ -142,11 +142,11 @@ public class ManageApplications extends ListActivity implements
public static final int FILTER_APPS_RUNNING = MENU_OPTIONS_BASE + 4; public static final int FILTER_APPS_RUNNING = MENU_OPTIONS_BASE + 4;
public static final int FILTER_OPTIONS = MENU_OPTIONS_BASE + 5; public static final int FILTER_OPTIONS = MENU_OPTIONS_BASE + 5;
// Alert Dialog presented to user to find out the filter option // Alert Dialog presented to user to find out the filter option
AlertDialog mAlertDlg; private AlertDialog mAlertDlg;
// sort order // sort order
private int mSortOrder = SORT_ORDER_ALPHA; private int mSortOrder = SORT_ORDER_ALPHA;
// Filter value // Filter value
int mFilterApps = FILTER_APPS_ALL; private int mFilterApps = FILTER_APPS_THIRD_PARTY;
// Custom Adapter used for managing items in the list // Custom Adapter used for managing items in the list
private AppInfoAdapter mAppInfoAdapter; private AppInfoAdapter mAppInfoAdapter;
@@ -1577,6 +1577,7 @@ public class ManageApplications extends ListActivity implements
String action = intent.getAction(); String action = intent.getAction();
if (action.equals(Intent.ACTION_MANAGE_PACKAGE_STORAGE)) { if (action.equals(Intent.ACTION_MANAGE_PACKAGE_STORAGE)) {
mSortOrder = SORT_ORDER_SIZE; mSortOrder = SORT_ORDER_SIZE;
mFilterApps = FILTER_APPS_ALL;
mSizesFirst = true; mSizesFirst = true;
} }
mPm = getPackageManager(); mPm = getPackageManager();