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