summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2021-05-24 17:10:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-05-24 17:10:30 +0000
commitf07e96cedfe9bd468e3038fa294a149cd4743310 (patch)
treeaa08ff6c8a326a97fa9c60da0fa541dbe9a2e7e5
parent6282288cb608fcc9b1d663235059c04b93c17d43 (diff)
parent172ceff846f78a72515ebcac94a6ba0e4fd3e992 (diff)
Merge "[permissions-ui] new footer style in app permissions page" into sc-dev
-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);