| commit | 7ec1bc47d88ee1581be6430ec5cbedeed642e15d | [log] [tgz] |
|---|---|---|
| author | Songchun Fan <schfan@google.com> | Thu Jun 10 18:07:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 18:07:09 2021 +0000 |
| tree | a5f6bdcba0efe8b4dd2c4cd41e1154ade26f3564 | |
| parent | 1d47ae22646804ba5d310df8aaff30f3317cdaae [diff] | |
| parent | e6c72e38f7f4ea4ade155cb25a4a12bc0fa56fff [diff] |
Merge "[permissions-ui] revert footer changes for app permissions for R" into sc-dev am: 369b751290 am: e6c72e38f7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14924001 Change-Id: I64928ae72cfed3b8d1efb0704e336f8fb765bfbb
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()) {