summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout/installed_app_details.xml3
-rw-r--r--res/values/strings.xml4
-rw-r--r--src/com/android/settings/ManageApplications.java5
3 files changed, 7 insertions, 5 deletions
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 13d3b10..2810604 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -304,7 +304,7 @@
android:layout_centerHorizontal="true"
android:layout_width="150dip"
android:text="@string/clear_activities"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content" />
</RelativeLayout>
<!-- Other controls section -->
@@ -320,6 +320,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
+ android:paddingTop="6dip"
android:layout_width="150dip"
android:text="@string/force_stop"
android:layout_height="wrap_content" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6cdbc33..c9ffa5e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1371,7 +1371,7 @@
<string name="filter_apps_all">All</string>
<!-- Text for filter option in ManageApps screen to display third party
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
packages only. -->
<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". -->
<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. -->
- <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. -->
<string name="dlg_ok">OK</string>
<!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index 34a1e43..3d03666 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -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_OPTIONS = MENU_OPTIONS_BASE + 5;
// Alert Dialog presented to user to find out the filter option
- AlertDialog mAlertDlg;
+ private AlertDialog mAlertDlg;
// sort order
private int mSortOrder = SORT_ORDER_ALPHA;
// Filter value
- int mFilterApps = FILTER_APPS_ALL;
+ private int mFilterApps = FILTER_APPS_THIRD_PARTY;
// Custom Adapter used for managing items in the list
private AppInfoAdapter mAppInfoAdapter;
@@ -1577,6 +1577,7 @@ public class ManageApplications extends ListActivity implements
String action = intent.getAction();
if (action.equals(Intent.ACTION_MANAGE_PACKAGE_STORAGE)) {
mSortOrder = SORT_ORDER_SIZE;
+ mFilterApps = FILTER_APPS_ALL;
mSizesFirst = true;
}
mPm = getPackageManager();