PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the xml entry when the system language is removed

Browse Source 
Bug: 301395074
Test: atest SettingsRoboTests:com.android.settings.localepicker
Change-Id: Ic771cd5146ab954c3da65748bf87cd14d30770b4
This commit is contained in:
Allen Su
2023-12-26 08:58:11 +00:00
parent 3b300cbf9f
commit d8695cbf9b
7 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/localepicker/NotificationController.java
View File

@@ -110,6 +110,15 @@ public class NotificationController {
return (info != null) ? info.getNotificationId() : -1;
}
/**
* Remove the {@link NotificationInfo} with the corresponding locale
*
* @param locale The locale which the application sets to
*/
public void removeNotificationInfo(@NonNull String locale) {
mDataManager.removeNotificationInfo(locale);
}
private boolean updateLocaleNotificationInfo(int uid, String locale) {
NotificationInfo info = mDataManager.getNotificationInfo(locale);
if (info == null) {
@@ -135,20 +144,20 @@ public class NotificationController {
int notificationCount = info.getNotificationCount();
long lastNotificationTime = info.getLastNotificationTimeMs();
int notificationId = info.getNotificationId();
// Add the uid into the locale's uid list
uidSet.add(uid);
if (dismissCount < DISMISS_COUNT_THRESHOLD
&& notificationCount < NOTIFICATION_COUNT_THRESHOLD
// Notification should fire on multiples of 2 apps using the locale.
&& uidSet.size() % MULTIPLE_BASE == 0
&& !isNotificationFrequent(lastNotificationTime)) {
// Increment the count because the notification can be triggered.
notificationCount = info.getNotificationCount() + 1;
lastNotificationTime = Calendar.getInstance().getTimeInMillis();
Log.i(TAG, "notificationCount:" + notificationCount);
if (notificationCount == 1) {
notificationId = (int) SystemClock.uptimeMillis();
&& notificationCount < NOTIFICATION_COUNT_THRESHOLD) {
// Add the uid into the locale's uid list
uidSet.add(uid);
// Notification should fire on multiples of 2 apps using the locale.
if (uidSet.size() % MULTIPLE_BASE == 0
&& !isNotificationFrequent(lastNotificationTime)) {
// Increment the count because the notification can be triggered.
notificationCount = info.getNotificationCount() + 1;
lastNotificationTime = Calendar.getInstance().getTimeInMillis();
Log.i(TAG, "notificationCount:" + notificationCount);
if (notificationCount == 1) {
notificationId = (int) SystemClock.uptimeMillis();
}
}
}
return new NotificationInfo(uidSet, notificationCount, dismissCount, lastNotificationTime,