commit | 21ccc41f0df9a9dc0c679cb2bdabc0cf30f22845 | [log] [tgz] |
---|---|---|
author | Songchun Fan <schfan@google.com> | Thu Jun 10 18:07:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 18:07:44 2021 +0000 |
tree | aa070bb5d6897dc1e22c4a496c1a3846846959a5 | |
parent | 3183dfc9b53d7717205dbf5e837d5766e1a582dd [diff] | |
parent | 242850d5ef15750c8b16676bfdab4b4900415ebd [diff] |
Merge "[permissions-ui] revert footer changes for app permissions for R" into sc-dev am: 369b751290 am: 242850d5ef Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14924001 Change-Id: Ie82a72be4fb48b1345ff99211ed1dd14a16e663a
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 6807082..f3a8454 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java
@@ -531,7 +531,8 @@ autoRevokeSwitch.setKey(AUTO_REVOKE_SWITCH_KEY); autoRevokeCategory.addPreference(autoRevokeSwitch); - FooterPreference autoRevokeSummary = new FooterPreference(context); + Preference autoRevokeSummary = SdkLevel.isAtLeastS() ? new FooterPreference(context) + : new Preference(context); autoRevokeSummary.setIcon(Utils.applyTint(getActivity(), R.drawable.ic_info_outline, android.R.attr.colorControlNormal)); autoRevokeSummary.setKey(AUTO_REVOKE_SUMMARY_KEY); @@ -548,7 +549,7 @@ .findPreference(AUTO_REVOKE_CATEGORY_KEY); SwitchPreference autoRevokeSwitch = autoRevokeCategory.findPreference( AUTO_REVOKE_SWITCH_KEY); - FooterPreference autoRevokeSummary = autoRevokeCategory.findPreference( + Preference autoRevokeSummary = autoRevokeCategory.findPreference( AUTO_REVOKE_SUMMARY_KEY); if (!state.isEnabledGlobal()) {