diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-09-04 17:52:04 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 20:11:52 +0200 |
| commit | 012b88698d970d926bedf087d6d26b0c8f552c3b (patch) | |
| tree | 27dd93735a95c9821ebc3b8b1fff1dfa6d83678d /src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java | |
| parent | 43152a48335d86182abe87bb021b4ad209820355 (diff) | |
| download | android_packages_apps_PackageInstaller-012b88698d970d926bedf087d6d26b0c8f552c3b.tar.gz android_packages_apps_PackageInstaller-012b88698d970d926bedf087d6d26b0c8f552c3b.tar.bz2 android_packages_apps_PackageInstaller-012b88698d970d926bedf087d6d26b0c8f552c3b.zip | |
Revert "Remove Permissions Hub."
This reverts commit 5747740517e37ebe05209fde129cc776af4c2127.
Change-Id: Ic38e77e8b11baa2dded3593089720d6592d8ddb6
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java index 2aa3072a..c8166b0f 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java @@ -51,6 +51,7 @@ import androidx.preference.PreferenceScreen; import com.android.packageinstaller.PermissionControllerStatsLog; import com.android.packageinstaller.permission.model.AppPermissionGroup; import com.android.packageinstaller.permission.model.AppPermissions; +import com.android.packageinstaller.permission.model.PermissionUsages; import com.android.packageinstaller.permission.utils.Utils; import com.android.permissioncontroller.R; import com.android.settingslib.HelpUtils; @@ -248,7 +249,34 @@ public final class AppPermissionsFragment extends SettingsWithLargeHeader { preference.setIcon(Utils.applyTint(context, icon, android.R.attr.colorControlNormal)); preference.setTitle(group.getFullLabel()); - preference.setGroupSummary(group); + if (Utils.isModernPermissionGroup(group.getName()) && Utils.shouldShowPermissionUsage( + group.getName())) { + String lastAccessStr = Utils.getAbsoluteLastUsageString(context, + PermissionUsages.loadLastGroupUsage(context, group)); + if (lastAccessStr != null) { + if (group.areRuntimePermissionsGranted()) { + preference.setSummary( + context.getString(R.string.app_permission_most_recent_summary, + lastAccessStr)); + } else { + preference.setSummary(context.getString( + R.string.app_permission_most_recent_denied_summary, lastAccessStr)); + } + } else { + preference.setGroupSummary(group); + if (preference.getSummary().length() == 0 && Utils.isPermissionsHubEnabled()) { + if (group.areRuntimePermissionsGranted()) { + preference.setSummary(context.getString( + R.string.app_permission_never_accessed_summary)); + } else { + preference.setSummary(context.getString( + R.string.app_permission_never_accessed_denied_summary)); + } + } + } + } else { + preference.setGroupSummary(group); + } if (isPlatform) { PreferenceCategory category = |