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

Add feature flag for LocaleNotification

Browse Source 
Bug: 248514263
Test: atest AppLocalePickerActivityTest LocaleListEditorTest
Change-Id: I0e2160d75bbac83a161c73c90624b0e7af5b0a8e
This commit is contained in:
Allen Su
2023-09-01 03:24:58 +00:00
parent 7b4cfbca95
commit ac54b70c85
4 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/localepicker/AppLocalePickerActivity.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.localepicker;
import static com.android.settings.flags.Flags.localeNotificationEnabled;
import android.app.FragmentTransaction;
import android.app.LocaleManager;
import android.app.NotificationChannel;
@@ -27,7 +29,6 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.LocaleList;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
@@ -53,10 +54,8 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
private static final String CHANNEL_ID_SUGGESTION_TO_USER = "Locale suggestion";
private static final String EXTRA_SYSTEM_LOCALE_DIALOG_TYPE = "system_locale_dialog_type";
private static final String LOCALE_SUGGESTION = "locale_suggestion";
static final boolean ENABLED = false;
static final String EXTRA_APP_LOCALE = "app_locale";
static final String EXTRA_NOTIFICATION_ID = "notification_id";
static final String PROP_SYSTEM_LOCALE_SUGGESTION = "android.system.locale.suggestion";
private String mPackageName;
private LocalePickerWithRegion mLocalePickerWithRegion;
@@ -151,7 +150,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
}
private void broadcastAppLocaleChange(LocaleStore.LocaleInfo localeInfo) {
if (!SystemProperties.getBoolean(PROP_SYSTEM_LOCALE_SUGGESTION, ENABLED)) {
if (!localeNotificationEnabled()) {
return;
}
String localeTag = localeInfo.getLocale().toLanguageTag();

9
src/com/android/settings/localepicker/LocaleListEditor.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.localepicker;
import static android.os.UserManager.DISALLOW_CONFIG_LOCALE;
import static com.android.settings.flags.Flags.localeNotificationEnabled;
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_APP_LOCALE;
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_NOTIFICATION_ID;
import static com.android.settings.localepicker.LocaleDialogFragment.DIALOG_ADD_SYSTEM_LOCALE;
@@ -31,7 +32,6 @@ import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.LocaleList;
import android.os.SystemProperties;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
@@ -283,7 +283,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
String dialogType = intent.getStringExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE);
String localeTag = intent.getStringExtra(EXTRA_APP_LOCALE);
int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, INVALID_NOTIFICATION_ID);
if (!isDialogFeatureEnabled()
if (!localeNotificationEnabled()
|| !isValidNotificationId(localeTag, notificationId)
|| !isValidDialogType(dialogType)
|| !isValidLocale(localeTag)
@@ -293,11 +293,6 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
return true;
}
private boolean isDialogFeatureEnabled() {
return SystemProperties.getBoolean(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION,
AppLocalePickerActivity.ENABLED);
}
private boolean isValidNotificationId(String localeTag, long id) {
if (id == -1) {
return false;