summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2021-05-24 17:32:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-05-24 17:32:01 +0000
commitd3cebc275681d5c849929e3872d89a26b85bbcab (patch)
tree521d397df4e43579ded6e7b95bd9fd7b6fb878a8
parent7a98f1b0fa10f65651fd6b008e1841b4d27e4c0d (diff)
parentf07e96cedfe9bd468e3038fa294a149cd4743310 (diff)
Merge "[permissions-ui] new footer style in app permissions page" into sc-dev am: f07e96cedf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14687104 Change-Id: I09e3f8bedd3a3c477851010c160770be013a68cf
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java6
1 files changed, 4 insertions, 2 deletions
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 77b4b6f8c..89986a728 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java
@@ -74,6 +74,7 @@ import com.android.permissioncontroller.permission.ui.model.AppPermissionGroupsV
import com.android.permissioncontroller.permission.utils.KotlinUtils;
import com.android.permissioncontroller.permission.utils.Utils;
import com.android.settingslib.HelpUtils;
+import com.android.settingslib.widget.FooterPreference;
import java.text.Collator;
import java.time.Instant;
@@ -523,7 +524,7 @@ public final class AppPermissionGroupsFragment extends SettingsWithLargeHeader i
autoRevokeSwitch.setKey(AUTO_REVOKE_SWITCH_KEY);
autoRevokeCategory.addPreference(autoRevokeSwitch);
- Preference autoRevokeSummary = new Preference(context);
+ FooterPreference autoRevokeSummary = new FooterPreference(context);
autoRevokeSummary.setIcon(Utils.applyTint(getActivity(), R.drawable.ic_info_outline,
android.R.attr.colorControlNormal));
autoRevokeSummary.setKey(AUTO_REVOKE_SUMMARY_KEY);
@@ -540,7 +541,8 @@ public final class AppPermissionGroupsFragment extends SettingsWithLargeHeader i
.findPreference(AUTO_REVOKE_CATEGORY_KEY);
SwitchPreference autoRevokeSwitch = autoRevokeCategory.findPreference(
AUTO_REVOKE_SWITCH_KEY);
- Preference autoRevokeSummary = autoRevokeCategory.findPreference(AUTO_REVOKE_SUMMARY_KEY);
+ FooterPreference autoRevokeSummary = autoRevokeCategory.findPreference(
+ AUTO_REVOKE_SUMMARY_KEY);
if (!state.isEnabledGlobal()) {
autoRevokeCategory.setVisible(false);