From: Daniel Nishi Date: Tue, 24 May 2016 01:11:49 +0000 (-0700) Subject: Update the summary strings in the Deletion Helper to match the latest mocks. X-Git-Tag: android-x86-7.1-r1~693^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=84d944b0bc1dd16ff2312a87b3aba4528b6c2bb6;p=android-x86%2Fpackages-apps-Settings.git Update the summary strings in the Deletion Helper to match the latest mocks. Bug: 28917902 Change-Id: I35af7483f2a97dffc230093a90f0b7d87a4532c1 --- diff --git a/res/values/strings.xml b/res/values/strings.xml index 333a1066e2..ff0c2feed6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7486,14 +7486,12 @@ Remove from Device - - Apps - %1$s, last used %2$d days ago + %1$s • Last used %2$d days ago - %1$s, never used before + %1$s • Never used before - %1$s, not sure when last used + %1$s • Not sure when last used Free up %1$s @@ -7598,13 +7596,13 @@ Photos & Videos (%1$d) - %1$s, older than %2$d days + %1$s • Older than %2$d days Downloads (%1$d) - %1$s • last modified %2$s + %1$s • Last modified %2$s %1$s @@ -7637,7 +7635,7 @@ Apps (%1$d) - %1$s + %1$s • Last used %2$d days ago Automatic diff --git a/src/com/android/settings/deletionhelper/AppStateUsageStatsBridge.java b/src/com/android/settings/deletionhelper/AppStateUsageStatsBridge.java index 36c4196aa9..6f77a2999d 100644 --- a/src/com/android/settings/deletionhelper/AppStateUsageStatsBridge.java +++ b/src/com/android/settings/deletionhelper/AppStateUsageStatsBridge.java @@ -41,6 +41,7 @@ public class AppStateUsageStatsBridge extends AppStateBaseBridge { private PackageManager mPm; public static final long NEVER_USED = -1; public static final long UNKNOWN_LAST_USE = -2; + public static final long UNUSED_DAYS_DELETION_THRESHOLD = 60; public AppStateUsageStatsBridge(Context context, ApplicationsState appState, Callback callback) { @@ -105,7 +106,6 @@ public class AppStateUsageStatsBridge extends AppStateBaseBridge { * usage is unknown, it is skipped. */ public static final AppFilter FILTER_USAGE_STATS = new AppFilter() { - private long UNUSED_DAYS_DELETION_THRESHOLD = 60; @Override public void init() { diff --git a/src/com/android/settings/deletionhelper/DeletionHelperFragment.java b/src/com/android/settings/deletionhelper/DeletionHelperFragment.java index 85c1035c4d..9e1d0ea873 100644 --- a/src/com/android/settings/deletionhelper/DeletionHelperFragment.java +++ b/src/com/android/settings/deletionhelper/DeletionHelperFragment.java @@ -394,7 +394,8 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement mAppEntries.size())); mApps.setSummary(app.getString(R.string.deletion_helper_apps_group_summary, Formatter.formatFileSize(app, - getTotalAppsFreeableSpace(true)))); + getTotalAppsFreeableSpace(true)), + AppStateUsageStatsBridge.UNUSED_DAYS_DELETION_THRESHOLD)); } }