Merge "Update unused apps empty string" into sc-dev am: e0bf97f504
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14984998
Change-Id: Ieacede9687b5164c5e0eec7e0a718e9a7dec3d3f
diff --git a/PermissionController/res/values/strings.xml b/PermissionController/res/values/strings.xml
index 11d494f..05f02ed 100644
--- a/PermissionController/res/values/strings.xml
+++ b/PermissionController/res/values/strings.xml
@@ -133,6 +133,9 @@
<!-- Title for the page of manage unused apps [CHAR LIMIT=30] -->
<string name="unused_apps">Unused apps</string>
+ <!-- Label when there are no unused apps [CHAR LIMIT=30] -->
+ <string name="no_unused_apps">No unused apps</string>
+
<!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
<string name="app_disable_dlg_positive">Disable app</string>
diff --git a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
index e97c049..f2a1ff6 100644
--- a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
+++ b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
@@ -119,9 +119,9 @@
private val PREF_KEY_FIRST_BOOT_TIME = "first_boot_time"
fun isHibernationEnabled(): Boolean {
- return DeviceConfig.getBoolean(
- NAMESPACE_APP_HIBERNATION, Utils.PROPERTY_APP_HIBERNATION_ENABLED,
- false /* defaultValue */)
+ return SdkLevel.isAtLeastS() &&
+ DeviceConfig.getBoolean(NAMESPACE_APP_HIBERNATION, Utils.PROPERTY_APP_HIBERNATION_ENABLED,
+ false /* defaultValue */)
}
/**
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/HandheldUnusedAppsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/HandheldUnusedAppsFragment.kt
index 0ac25fb..55686cf 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/HandheldUnusedAppsFragment.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/HandheldUnusedAppsFragment.kt
@@ -73,6 +73,10 @@
return super.onOptionsItemSelected(item)
}
+ override fun getEmptyViewString(): Int {
+ return if (isHibernationEnabled()) R.string.no_unused_apps else super.getEmptyViewString()
+ }
+
override fun createFooterPreference(context: Context): Preference {
var preference: Preference
if (isHibernationEnabled()) {