Merge "Use SDK check for showing permission hub and add RequiresApi(S)." into sc-dev
diff --git a/Android.bp b/Android.bp
index b9d66e1..deb17bd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,6 +64,20 @@
"framework-permission-s",
],
apex_available: ["com.android.permission"],
+
+ // The bootclasspath_fragments that provide APIs on which this depends.
+ fragments: [
+ {
+ apex: "com.android.art",
+ module: "art-bootclasspath-fragment",
+ },
+ ],
+
+ // Additional stubs libraries that this fragment's contents use which are
+ // not provided by another bootclasspath_fragment.
+ additional_stubs: [
+ "android-non-updatable",
+ ],
}
// Encapsulate the contributions made by the com.android.permission to the systemserverclasspath.
diff --git a/PermissionController/res/values-fr-rCA/strings.xml b/PermissionController/res/values-fr-rCA/strings.xml
index 1101b7d..7ccade9 100644
--- a/PermissionController/res/values-fr-rCA/strings.xml
+++ b/PermissionController/res/values-fr-rCA/strings.xml
@@ -115,8 +115,7 @@
<string name="permission_group_usage_subtitle" msgid="712843174810251274">"Chronologie de quand les applications ont utilisé votre <xliff:g id="PERMGROUP">%1$s</xliff:g> au cours des dernières 24 heures"</string>
<string name="permission_usage_access_dialog_subtitle" msgid="4171772805196955753">"Lorsque cette application a utilisé votre autorisation de <xliff:g id="PERMGROUP">%1$s</xliff:g>"</string>
<string name="permission_usage_access_dialog_learn_more" msgid="7121468469493184613">"En savoir plus"</string>
- <!-- no translation found for permission_usage_duration_and_proxy (573959201368716399) -->
- <skip />
+ <string name="permission_usage_duration_and_proxy" msgid="573959201368716399">"<xliff:g id="APP_NAME">%1$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%2$s</xliff:g>"</string>
<plurals name="duration_used_days" formatted="false" msgid="1993098309578536308">
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> jour</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> jours</item>
diff --git a/PermissionController/res/values-gu/strings.xml b/PermissionController/res/values-gu/strings.xml
index 2887a4e..957eb59 100644
--- a/PermissionController/res/values-gu/strings.xml
+++ b/PermissionController/res/values-gu/strings.xml
@@ -115,8 +115,7 @@
<string name="permission_group_usage_subtitle" msgid="712843174810251274">"છેલ્લા 24 કલાકમાં જ્યારે ઍપ તમારા <xliff:g id="PERMGROUP">%1$s</xliff:g>નો ઉપયોગ કરે છે તેની સમયરેખા"</string>
<string name="permission_usage_access_dialog_subtitle" msgid="4171772805196955753">"જ્યારે આ ઍપ દ્વારા તમારી <xliff:g id="PERMGROUP">%1$s</xliff:g>ની પરવાનગીનો ઉપયોગ કરવામાં આવ્યો"</string>
<string name="permission_usage_access_dialog_learn_more" msgid="7121468469493184613">"વધુ જાણો"</string>
- <!-- no translation found for permission_usage_duration_and_proxy (573959201368716399) -->
- <skip />
+ <string name="permission_usage_duration_and_proxy" msgid="573959201368716399">"<xliff:g id="APP_NAME">%1$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%2$s</xliff:g>"</string>
<plurals name="duration_used_days" formatted="false" msgid="1993098309578536308">
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> દિવસ</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> દિવસ</item>
diff --git a/PermissionController/res/values-kn/strings.xml b/PermissionController/res/values-kn/strings.xml
index 7258342..4b1eb86 100644
--- a/PermissionController/res/values-kn/strings.xml
+++ b/PermissionController/res/values-kn/strings.xml
@@ -214,7 +214,7 @@
<string name="app_permission_location_accuracy_subtitle" msgid="2654077606404987210">"ನಿಖರವಾದ ಸ್ಥಳ ಆಫ್ ಆಗಿರುವಾಗ, ಆ್ಯಪ್ಗಳು ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಬಹುದು"</string>
<string name="app_permission_title" msgid="2090897901051370711">"<xliff:g id="PERM">%1$s</xliff:g> ಕುರಿತು ಅನುಮತಿ"</string>
<string name="app_permission_header" msgid="2951363137032603806">"ಈ <xliff:g id="PERM">%1$s</xliff:g> ಆ್ಯಪ್ಗಾಗಿ ಪ್ರವೇಶದ ಅನುಮತಿ"</string>
- <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"ಎಲ್ಲಾ <xliff:g id="APP">%1$s</xliff:g> ಕುರಿತ ಅನುಮತಿಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
+ <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"ಎಲ್ಲಾ <xliff:g id="APP">%1$s</xliff:g> ಅನುಮತಿಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
<string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ಈ ಅನುಮತಿಯನ್ನು ಹೊಂದಿರುವ ಎಲ್ಲಾ ಆ್ಯಪ್ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
<string name="assistant_mic_label" msgid="1011432357152323896">"ಅಸಿಸ್ಟೆಂಟ್ನ ಮೈಕ್ರೋಫೋನ್ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
<string name="auto_revoke_label" msgid="5068393642936571656">"ಆ್ಯಪ್ ಬಳಸದಿದ್ದರೆ ಅನುಮತಿಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
diff --git a/PermissionController/res/values-or/strings.xml b/PermissionController/res/values-or/strings.xml
index ac9b5cd..83f3cb2 100644
--- a/PermissionController/res/values-or/strings.xml
+++ b/PermissionController/res/values-or/strings.xml
@@ -115,8 +115,7 @@
<string name="permission_group_usage_subtitle" msgid="712843174810251274">"ଗତ 24 ଘଣ୍ଟାରେ ଯେତେବେଳେ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କ <xliff:g id="PERMGROUP">%1$s</xliff:g> ବ୍ୟବହାର କରିଥାଏ ତାହାର ଟାଇମଲାଇନ୍"</string>
<string name="permission_usage_access_dialog_subtitle" msgid="4171772805196955753">"ଏହି ଆପ୍ କେତେବେଳେ ଆପଣଙ୍କ <xliff:g id="PERMGROUP">%1$s</xliff:g> ଅନୁମତି ବ୍ୟବହାର କରିଛି"</string>
<string name="permission_usage_access_dialog_learn_more" msgid="7121468469493184613">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
- <!-- no translation found for permission_usage_duration_and_proxy (573959201368716399) -->
- <skip />
+ <string name="permission_usage_duration_and_proxy" msgid="573959201368716399">"<xliff:g id="APP_NAME">%1$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%2$s</xliff:g>"</string>
<plurals name="duration_used_days" formatted="false" msgid="1993098309578536308">
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ଦିନ</item>
<item quantity="one">1 ଦିନ</item>
diff --git a/PermissionController/res/values/styles.xml b/PermissionController/res/values/styles.xml
index 4100fc1..bec3b41 100644
--- a/PermissionController/res/values/styles.xml
+++ b/PermissionController/res/values/styles.xml
@@ -451,7 +451,7 @@
<style name="AppPermissionFooterLink"
parent="@style/AppPermissionFooterText">
- <item name="android:textColor">?android:attr/colorAccent</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="AppPermissionFooterTextWithIcon">
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java
index 217c811..16febb8 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java
@@ -22,6 +22,7 @@
import static com.android.permissioncontroller.PermissionControllerStatsLog.APP_PERMISSIONS_FRAGMENT_VIEWED__CATEGORY__ALLOWED;
import static com.android.permissioncontroller.PermissionControllerStatsLog.APP_PERMISSIONS_FRAGMENT_VIEWED__CATEGORY__ALLOWED_FOREGROUND;
import static com.android.permissioncontroller.PermissionControllerStatsLog.APP_PERMISSIONS_FRAGMENT_VIEWED__CATEGORY__DENIED;
+import static com.android.permissioncontroller.hibernation.HibernationPolicyKt.isHibernationEnabled;
import static com.android.permissioncontroller.permission.ui.handheld.UtilsKt.pressBack;
import static com.android.permissioncontroller.permission.utils.Utils.LAST_24H_CONTENT_PROVIDER;
import static com.android.permissioncontroller.permission.utils.Utils.LAST_24H_SENSOR_TODAY;
@@ -529,7 +530,8 @@
mViewModel.setAutoRevoke(autoRevokeSwitch.isChecked());
return true;
});
- autoRevokeSwitch.setTitle(R.string.auto_revoke_label);
+ autoRevokeSwitch.setTitle(isHibernationEnabled() ? R.string.unused_apps_label
+ : R.string.auto_revoke_label);
autoRevokeSwitch.setKey(AUTO_REVOKE_SWITCH_KEY);
autoRevokeCategory.addPreference(autoRevokeSwitch);
@@ -538,6 +540,9 @@
autoRevokeSummary.setIcon(Utils.applyTint(getActivity(), R.drawable.ic_info_outline,
android.R.attr.colorControlNormal));
autoRevokeSummary.setKey(AUTO_REVOKE_SUMMARY_KEY);
+ if (isHibernationEnabled()) {
+ autoRevokeCategory.setTitle(R.string.unused_apps);
+ }
autoRevokeCategory.addPreference(autoRevokeSummary);
}
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsCollapsingToolbarBaseFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsCollapsingToolbarBaseFragment.java
index 61c5cd8..2e9a99b 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsCollapsingToolbarBaseFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsCollapsingToolbarBaseFragment.java
@@ -42,7 +42,7 @@
}
PreferenceFragmentCompat preferenceFragment =
- (PermissionsFrameFragment) getChildFragmentManager()
+ (PreferenceFragmentCompat) getChildFragmentManager()
.findFragmentById(R.id.content_frame);
if (preferenceFragment == null) {
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionsFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionsFragment.java
index 2cd2773..137d776 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionsFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionsFragment.java
@@ -17,6 +17,7 @@
package com.android.permissioncontroller.permission.ui.television;
import static com.android.permissioncontroller.Constants.INVALID_SESSION_ID;
+import static com.android.permissioncontroller.hibernation.HibernationPolicyKt.isHibernationEnabled;
import android.app.ActionBar;
import android.app.Activity;
@@ -42,6 +43,7 @@
import androidx.lifecycle.ViewModelProvider;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
@@ -65,6 +67,7 @@
static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
private static final String AUTO_REVOKE_SWITCH_KEY = "_AUTO_REVOKE_SWITCH_KEY";
+ private static final String UNUSED_APPS_KEY = "_UNUSED_APPS_KEY";
private static final int MENU_ALL_PERMS = 0;
@@ -406,10 +409,20 @@
android.util.Log.w(LOG_TAG, "setAutoRevoke " + autoRevokeSwitch.isChecked());
return true;
});
- autoRevokeSwitch.setTitle(R.string.auto_revoke_label);
+ autoRevokeSwitch.setTitle(isHibernationEnabled() ? R.string.unused_apps_label
+ : R.string.auto_revoke_label);
autoRevokeSwitch.setSummary(R.string.auto_revoke_summary);
autoRevokeSwitch.setKey(AUTO_REVOKE_SWITCH_KEY);
- screen.addPreference(autoRevokeSwitch);
+ if (isHibernationEnabled()) {
+ PreferenceCategory unusedAppsCategory = new PreferenceCategory(
+ screen.getPreferenceManager().getContext());
+ unusedAppsCategory.setKey(UNUSED_APPS_KEY);
+ unusedAppsCategory.setTitle(R.string.unused_apps);
+ unusedAppsCategory.addPreference(autoRevokeSwitch);
+ screen.addPreference(unusedAppsCategory);
+ } else {
+ screen.addPreference(autoRevokeSwitch);
+ }
}
private void setAutoRevokeToggleState(HibernationSettingState state) {
@@ -419,9 +432,15 @@
return;
}
if (!state.isEnabledGlobal() || state.getRevocableGroupNames().isEmpty()) {
+ if (isHibernationEnabled()) {
+ getPreferenceScreen().findPreference(UNUSED_APPS_KEY).setVisible(false);
+ }
autoRevokeSwitch.setVisible(false);
return;
}
+ if (isHibernationEnabled()) {
+ getPreferenceScreen().findPreference(UNUSED_APPS_KEY).setVisible(true);
+ }
autoRevokeSwitch.setVisible(true);
autoRevokeSwitch.setChecked(state.isEnabledForApp());
}