diff options
| author | 2023-04-14 03:29:14 +0000 | |
|---|---|---|
| committer | 2023-04-14 03:29:14 +0000 | |
| commit | be3adbb7aac51d9776e2bb5e5351b5aa0b996bd9 (patch) | |
| tree | 138b52af2d7ac7a6d8c4e41c002cfe5882c279b8 | |
| parent | dc1602cda7da711643a43a81f4f1f456e4d763fe (diff) | |
| parent | 68921f345cdf7dc18f38748884688fccfa52a56b (diff) | |
Merge "[Permission Hub Refactor] Fix stale "Today" "Yesterday" on the permission usage details page" into udc-dev
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java index 6a16c37b8..15ee31a54 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java @@ -76,15 +76,6 @@ public class PermissionUsageDetailsFragment extends SettingsWithLargeHeader { private static final int MENU_SHOW_7_DAYS_DATA = Menu.FIRST + 4; private static final int MENU_SHOW_24_HOURS_DATA = Menu.FIRST + 5; - private static final long MIDNIGHT_TODAY = - ZonedDateTime.now(ZoneId.systemDefault()).truncatedTo(ChronoUnit.DAYS).toEpochSecond() - * 1000L; - private static final long MIDNIGHT_YESTERDAY = - ZonedDateTime.now(ZoneId.systemDefault()) - .minusDays(1) - .truncatedTo(ChronoUnit.DAYS) - .toEpochSecond() - * 1000L; private @Nullable String mPermissionGroup; private int mUsageSubtitle; private boolean mHasSystemApps; @@ -334,6 +325,18 @@ public class PermissionUsageDetailsFragment extends SettingsWithLargeHeader { PreferenceScreen preferenceScreen) { Context context = getContext(); long previousDateMs = 0L; + long midnightToday = + ZonedDateTime.now(ZoneId.systemDefault()) + .truncatedTo(ChronoUnit.DAYS) + .toEpochSecond() + * 1000L; + long midnightYesterday = + ZonedDateTime.now(ZoneId.systemDefault()) + .minusDays(1) + .truncatedTo(ChronoUnit.DAYS) + .toEpochSecond() + * 1000L; + for (int i = 0; i < appPermissionAccessUiInfoList.size(); i++) { AppPermissionAccessUiInfo appPermissionAccessUiInfo = appPermissionAccessUiInfoList.get(i); @@ -350,9 +353,9 @@ public class PermissionUsageDetailsFragment extends SettingsWithLargeHeader { category.set(createDayCategoryPreference()); preferenceScreen.addPreference(category.get()); } - if (accessEndTime > MIDNIGHT_TODAY) { + if (accessEndTime > midnightToday) { category.get().setTitle(R.string.permission_history_category_today); - } else if (accessEndTime > MIDNIGHT_YESTERDAY) { + } else if (accessEndTime > midnightYesterday) { category.get().setTitle(R.string.permission_history_category_yesterday); } else { category.get() |