Migrate LocaleNotification to main trunk
Bug: 248514263 Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=AppLocalePickerActivityTest LocaleListEditorTest LocaleNotificationDataManagerTest NotificationCancelReceiverTest NotificationControllerTest Change-Id: Iac7ffd493485be8ebb10ae63e5ca4ea7a57c8c78
This commit is contained in:
@@ -80,6 +80,7 @@ android_library {
|
|||||||
"androidx.lifecycle_lifecycle-runtime",
|
"androidx.lifecycle_lifecycle-runtime",
|
||||||
"androidx.lifecycle_lifecycle-runtime-ktx",
|
"androidx.lifecycle_lifecycle-runtime-ktx",
|
||||||
"androidx.lifecycle_lifecycle-viewmodel",
|
"androidx.lifecycle_lifecycle-viewmodel",
|
||||||
|
"gson",
|
||||||
"guava",
|
"guava",
|
||||||
"jsr305",
|
"jsr305",
|
||||||
"net-utils-framework-common",
|
"net-utils-framework-common",
|
||||||
|
@@ -2796,6 +2796,8 @@
|
|||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
|
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
|
||||||
|
|
||||||
|
<receiver android:name=".localepicker.NotificationCancelReceiver" />
|
||||||
|
|
||||||
<activity android:name="Settings$ApnEditorActivity"
|
<activity android:name="Settings$ApnEditorActivity"
|
||||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
android:configChanges="orientation|keyboardHidden|screenSize"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
|
@@ -18,13 +18,17 @@ package com.android.settings.localepicker;
|
|||||||
|
|
||||||
import android.app.FragmentTransaction;
|
import android.app.FragmentTransaction;
|
||||||
import android.app.LocaleManager;
|
import android.app.LocaleManager;
|
||||||
|
import android.app.NotificationChannel;
|
||||||
|
import android.app.NotificationManager;
|
||||||
|
import android.app.PendingIntent;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.ApplicationInfo;
|
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.LocaleList;
|
import android.os.LocaleList;
|
||||||
|
import android.os.SystemClock;
|
||||||
import android.os.SystemProperties;
|
import android.os.SystemProperties;
|
||||||
|
import android.provider.Settings;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
@@ -32,8 +36,7 @@ import android.view.View;
|
|||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
|
|
||||||
import androidx.activity.result.ActivityResultLauncher;
|
import androidx.core.app.NotificationCompat;
|
||||||
import androidx.activity.result.contract.ActivityResultContracts;
|
|
||||||
import androidx.core.view.ViewCompat;
|
import androidx.core.view.ViewCompat;
|
||||||
|
|
||||||
import com.android.internal.app.LocalePickerWithRegion;
|
import com.android.internal.app.LocalePickerWithRegion;
|
||||||
@@ -43,19 +46,23 @@ import com.android.settings.applications.AppLocaleUtil;
|
|||||||
import com.android.settings.applications.appinfo.AppLocaleDetails;
|
import com.android.settings.applications.appinfo.AppLocaleDetails;
|
||||||
import com.android.settings.core.SettingsBaseActivity;
|
import com.android.settings.core.SettingsBaseActivity;
|
||||||
|
|
||||||
import java.util.Locale;
|
|
||||||
|
|
||||||
public class AppLocalePickerActivity extends SettingsBaseActivity
|
public class AppLocalePickerActivity extends SettingsBaseActivity
|
||||||
implements LocalePickerWithRegion.LocaleSelectedListener, MenuItem.OnActionExpandListener {
|
implements LocalePickerWithRegion.LocaleSelectedListener, MenuItem.OnActionExpandListener {
|
||||||
private static final String TAG = AppLocalePickerActivity.class.getSimpleName();
|
private static final String TAG = AppLocalePickerActivity.class.getSimpleName();
|
||||||
|
private static final String CHANNEL_ID_SUGGESTION = "suggestion";
|
||||||
|
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_APP_LOCALE = "app_locale";
|
||||||
private static final String PROP_SYSTEM_LOCALE_SUGGESTION = "android.system.locale.suggestion";
|
static final String EXTRA_NOTIFICATION_ID = "notification_id";
|
||||||
private static final boolean ENABLED = false;
|
static final String PROP_SYSTEM_LOCALE_SUGGESTION = "android.system.locale.suggestion";
|
||||||
|
|
||||||
private String mPackageName;
|
private String mPackageName;
|
||||||
private LocalePickerWithRegion mLocalePickerWithRegion;
|
private LocalePickerWithRegion mLocalePickerWithRegion;
|
||||||
private AppLocaleDetails mAppLocaleDetails;
|
private AppLocaleDetails mAppLocaleDetails;
|
||||||
private View mAppLocaleDetailContainer;
|
private View mAppLocaleDetailContainer;
|
||||||
|
private NotificationController mNotificationController;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
@@ -81,6 +88,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
|
|||||||
|
|
||||||
setTitle(R.string.app_locale_picker_title);
|
setTitle(R.string.app_locale_picker_title);
|
||||||
getActionBar().setDisplayHomeAsUpEnabled(true);
|
getActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
mNotificationController = NotificationController.getInstance(this);
|
||||||
|
|
||||||
mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker(
|
mLocalePickerWithRegion = LocalePickerWithRegion.createLanguagePicker(
|
||||||
this,
|
this,
|
||||||
@@ -146,52 +154,78 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
|
|||||||
if (!SystemProperties.getBoolean(PROP_SYSTEM_LOCALE_SUGGESTION, ENABLED)) {
|
if (!SystemProperties.getBoolean(PROP_SYSTEM_LOCALE_SUGGESTION, ENABLED)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String languageTag = localeInfo.getLocale().toLanguageTag();
|
String localeTag = localeInfo.getLocale().toLanguageTag();
|
||||||
if (isInSystemLocale(languageTag) || localeInfo.isAppCurrentLocale()) {
|
if (LocaleUtils.isInSystemLocale(localeTag) || localeInfo.isAppCurrentLocale()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String intentAction = getString(R.string.config_app_locale_intent_action);
|
try {
|
||||||
if (!TextUtils.isEmpty(intentAction)) {
|
int uid = getPackageManager().getApplicationInfo(mPackageName,
|
||||||
try {
|
PackageManager.GET_META_DATA).uid;
|
||||||
PackageManager packageManager = getPackageManager();
|
boolean launchNotification = mNotificationController.shouldTriggerNotification(
|
||||||
ApplicationInfo info = packageManager.getApplicationInfo(mPackageName,
|
uid, localeTag);
|
||||||
PackageManager.GET_META_DATA);
|
if (launchNotification) {
|
||||||
Intent intent = new Intent(intentAction)
|
triggerNotification(
|
||||||
.putExtra(Intent.EXTRA_UID, info.uid)
|
mNotificationController.getNotificationId(localeTag),
|
||||||
.putExtra(EXTRA_APP_LOCALE, languageTag);
|
getString(R.string.title_system_locale_addition,
|
||||||
if (intent.resolveActivity(packageManager) != null) {
|
localeInfo.getFullNameNative()),
|
||||||
mStartForResult.launch(intent);
|
getString(R.string.desc_system_locale_addition),
|
||||||
}
|
localeTag);
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
|
||||||
Log.e(TAG, "Unable to find info for package: " + mPackageName);
|
|
||||||
}
|
}
|
||||||
|
} catch (PackageManager.NameNotFoundException e) {
|
||||||
|
Log.e(TAG, "Unable to find info for package: " + mPackageName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Invoke startActivityFroResult so that the calling package can be shared via the intent.
|
private void triggerNotification(
|
||||||
private ActivityResultLauncher<Intent> mStartForResult = registerForActivityResult(
|
int notificationId,
|
||||||
new ActivityResultContracts.StartActivityForResult(),
|
String title,
|
||||||
result -> {
|
String description,
|
||||||
}
|
String localeTag) {
|
||||||
);
|
NotificationManager notificationManager = getSystemService(NotificationManager.class);
|
||||||
|
final boolean channelExist =
|
||||||
|
notificationManager.getNotificationChannel(CHANNEL_ID_SUGGESTION) != null;
|
||||||
|
|
||||||
/**
|
// Create an alert channel if it does not exist
|
||||||
* Checks if the localeTag is in the system locale. Since in the current design, the system
|
if (!channelExist) {
|
||||||
* language list would not show two locales with the same language and region but different
|
NotificationChannel channel =
|
||||||
* numbering system. So, during the comparison, the extension has to be stripped.
|
new NotificationChannel(
|
||||||
*
|
CHANNEL_ID_SUGGESTION,
|
||||||
* @param languageTag A language tag
|
CHANNEL_ID_SUGGESTION_TO_USER,
|
||||||
* @return true if the locale is in the system locale. Otherwise, false.
|
NotificationManager.IMPORTANCE_DEFAULT);
|
||||||
*/
|
channel.setSound(/* sound */ null, /* audioAttributes */ null); // silent notification
|
||||||
private static boolean isInSystemLocale(String languageTag) {
|
notificationManager.createNotificationChannel(channel);
|
||||||
LocaleList systemLocales = LocaleList.getDefault();
|
|
||||||
Locale locale = Locale.forLanguageTag(languageTag).stripExtensions();
|
|
||||||
for (int i = 0; i < systemLocales.size(); i++) {
|
|
||||||
if (locale.equals(systemLocales.get(i).stripExtensions())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
|
final NotificationCompat.Builder builder =
|
||||||
|
new NotificationCompat.Builder(this, CHANNEL_ID_SUGGESTION)
|
||||||
|
.setSmallIcon(R.drawable.ic_settings_language)
|
||||||
|
.setAutoCancel(true)
|
||||||
|
.setContentTitle(title)
|
||||||
|
.setContentText(description)
|
||||||
|
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
|
||||||
|
.setContentIntent(
|
||||||
|
createPendingIntent(localeTag, notificationId, false))
|
||||||
|
.setDeleteIntent(
|
||||||
|
createPendingIntent(localeTag, notificationId, true));
|
||||||
|
notificationManager.notify(notificationId, builder.build());
|
||||||
|
}
|
||||||
|
|
||||||
|
private PendingIntent createPendingIntent(String locale, int notificationId,
|
||||||
|
boolean isDeleteIntent) {
|
||||||
|
Intent intent = isDeleteIntent
|
||||||
|
? new Intent(this, NotificationCancelReceiver.class)
|
||||||
|
: new Intent(Settings.ACTION_LOCALE_SETTINGS)
|
||||||
|
.putExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE, LOCALE_SUGGESTION)
|
||||||
|
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
||||||
|
|
||||||
|
intent.putExtra(EXTRA_APP_LOCALE, locale)
|
||||||
|
.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
|
||||||
|
int flag = PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT;
|
||||||
|
int elapsedTime = (int) SystemClock.elapsedRealtimeNanos();
|
||||||
|
|
||||||
|
return isDeleteIntent
|
||||||
|
? PendingIntent.getBroadcast(this, elapsedTime, intent, flag)
|
||||||
|
: PendingIntent.getActivity(this, elapsedTime, intent, flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
private View launchAppLocaleDetailsPage() {
|
private View launchAppLocaleDetailsPage() {
|
||||||
|
@@ -51,6 +51,7 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment {
|
|||||||
|
|
||||||
static final int DIALOG_CONFIRM_SYSTEM_DEFAULT = 1;
|
static final int DIALOG_CONFIRM_SYSTEM_DEFAULT = 1;
|
||||||
static final int DIALOG_NOT_AVAILABLE_LOCALE = 2;
|
static final int DIALOG_NOT_AVAILABLE_LOCALE = 2;
|
||||||
|
static final int DIALOG_ADD_SYSTEM_LOCALE = 3;
|
||||||
|
|
||||||
static final String ARG_DIALOG_TYPE = "arg_dialog_type";
|
static final String ARG_DIALOG_TYPE = "arg_dialog_type";
|
||||||
static final String ARG_TARGET_LOCALE = "arg_target_locale";
|
static final String ARG_TARGET_LOCALE = "arg_target_locale";
|
||||||
@@ -95,7 +96,8 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment {
|
|||||||
mShouldKeepDialog = savedInstanceState.getBoolean(ARG_SHOW_DIALOG, false);
|
mShouldKeepDialog = savedInstanceState.getBoolean(ARG_SHOW_DIALOG, false);
|
||||||
// Keep the dialog if user rotates the device, otherwise close the confirm system
|
// Keep the dialog if user rotates the device, otherwise close the confirm system
|
||||||
// default dialog only when user changes the locale.
|
// default dialog only when user changes the locale.
|
||||||
if (type == DIALOG_CONFIRM_SYSTEM_DEFAULT && !mShouldKeepDialog) {
|
if ((type == DIALOG_CONFIRM_SYSTEM_DEFAULT || type == DIALOG_ADD_SYSTEM_LOCALE)
|
||||||
|
&& !mShouldKeepDialog) {
|
||||||
dismiss();
|
dismiss();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -192,7 +194,8 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
if (mDialogType == DIALOG_CONFIRM_SYSTEM_DEFAULT) {
|
if (mDialogType == DIALOG_CONFIRM_SYSTEM_DEFAULT
|
||||||
|
|| mDialogType == DIALOG_ADD_SYSTEM_LOCALE) {
|
||||||
int result = Activity.RESULT_CANCELED;
|
int result = Activity.RESULT_CANCELED;
|
||||||
boolean changed = false;
|
boolean changed = false;
|
||||||
if (which == DialogInterface.BUTTON_POSITIVE) {
|
if (which == DialogInterface.BUTTON_POSITIVE) {
|
||||||
@@ -201,9 +204,12 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment {
|
|||||||
}
|
}
|
||||||
Intent intent = new Intent();
|
Intent intent = new Intent();
|
||||||
Bundle bundle = new Bundle();
|
Bundle bundle = new Bundle();
|
||||||
bundle.putInt(ARG_DIALOG_TYPE, DIALOG_CONFIRM_SYSTEM_DEFAULT);
|
bundle.putInt(ARG_DIALOG_TYPE, mDialogType);
|
||||||
|
bundle.putSerializable(LocaleDialogFragment.ARG_TARGET_LOCALE, mLocaleInfo);
|
||||||
intent.putExtras(bundle);
|
intent.putExtras(bundle);
|
||||||
mParent.onActivityResult(DIALOG_CONFIRM_SYSTEM_DEFAULT, result, intent);
|
mParent.onActivityResult(mDialogType, result, intent);
|
||||||
|
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CHANGE_LANGUAGE,
|
||||||
|
changed);
|
||||||
}
|
}
|
||||||
mShouldKeepDialog = false;
|
mShouldKeepDialog = false;
|
||||||
}
|
}
|
||||||
@@ -227,6 +233,15 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment {
|
|||||||
dialogContent.mMessage = mContext.getString(R.string.desc_unavailable_locale);
|
dialogContent.mMessage = mContext.getString(R.string.desc_unavailable_locale);
|
||||||
dialogContent.mPositiveButton = mContext.getString(R.string.okay);
|
dialogContent.mPositiveButton = mContext.getString(R.string.okay);
|
||||||
break;
|
break;
|
||||||
|
case DIALOG_ADD_SYSTEM_LOCALE:
|
||||||
|
dialogContent.mTitle = String.format(mContext.getString(
|
||||||
|
R.string.title_system_locale_addition),
|
||||||
|
mLocaleInfo.getFullNameNative());
|
||||||
|
dialogContent.mMessage = mContext.getString(
|
||||||
|
R.string.desc_system_locale_addition);
|
||||||
|
dialogContent.mPositiveButton = mContext.getString(R.string.add);
|
||||||
|
dialogContent.mNegativeButton = mContext.getString(R.string.cancel);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@@ -19,6 +19,8 @@ package com.android.settings.localepicker;
|
|||||||
import static android.os.UserManager.DISALLOW_CONFIG_LOCALE;
|
import static android.os.UserManager.DISALLOW_CONFIG_LOCALE;
|
||||||
|
|
||||||
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_APP_LOCALE;
|
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;
|
||||||
import static com.android.settings.localepicker.LocaleDialogFragment.DIALOG_CONFIRM_SYSTEM_DEFAULT;
|
import static com.android.settings.localepicker.LocaleDialogFragment.DIALOG_CONFIRM_SYSTEM_DEFAULT;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
@@ -29,6 +31,7 @@ import android.content.Intent;
|
|||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.LocaleList;
|
import android.os.LocaleList;
|
||||||
|
import android.os.SystemProperties;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
@@ -59,7 +62,6 @@ import com.android.settingslib.utils.StringUtil;
|
|||||||
import com.android.settingslib.widget.LayoutPreference;
|
import com.android.settingslib.widget.LayoutPreference;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
@@ -68,20 +70,22 @@ import java.util.Locale;
|
|||||||
*/
|
*/
|
||||||
@SearchIndexable
|
@SearchIndexable
|
||||||
public class LocaleListEditor extends RestrictedSettingsFragment implements View.OnTouchListener {
|
public class LocaleListEditor extends RestrictedSettingsFragment implements View.OnTouchListener {
|
||||||
private static final String TAG = LocaleListEditor.class.getSimpleName();
|
|
||||||
protected static final String INTENT_LOCALE_KEY = "localeInfo";
|
protected static final String INTENT_LOCALE_KEY = "localeInfo";
|
||||||
|
|
||||||
|
private static final String TAG = LocaleListEditor.class.getSimpleName();
|
||||||
private static final String CFGKEY_REMOVE_MODE = "localeRemoveMode";
|
private static final String CFGKEY_REMOVE_MODE = "localeRemoveMode";
|
||||||
private static final String CFGKEY_REMOVE_DIALOG = "showingLocaleRemoveDialog";
|
private static final String CFGKEY_REMOVE_DIALOG = "showingLocaleRemoveDialog";
|
||||||
private static final String CFGKEY_ADD_LOCALE = "localeAdded";
|
private static final String CFGKEY_ADD_LOCALE = "localeAdded";
|
||||||
private static final int MENU_ID_REMOVE = Menu.FIRST + 1;
|
|
||||||
private static final int REQUEST_LOCALE_PICKER = 0;
|
|
||||||
|
|
||||||
private static final String INDEX_KEY_ADD_LANGUAGE = "add_language";
|
private static final String INDEX_KEY_ADD_LANGUAGE = "add_language";
|
||||||
private static final String KEY_LANGUAGES_PICKER = "languages_picker";
|
private static final String KEY_LANGUAGES_PICKER = "languages_picker";
|
||||||
private static final String TAG_DIALOG_CONFIRM_SYSTEM_DEFAULT = "dialog_confirm_system_default";
|
private static final String TAG_DIALOG_CONFIRM_SYSTEM_DEFAULT = "dialog_confirm_system_default";
|
||||||
private static final String TAG_DIALOG_NOT_AVAILABLE = "dialog_not_available_locale";
|
private static final String TAG_DIALOG_NOT_AVAILABLE = "dialog_not_available_locale";
|
||||||
static final String EXTRA_SYSTEM_LOCALE_DIALOG_TYPE = "system_locale_dialog_type";
|
private static final String TAG_DIALOG_ADD_SYSTEM_LOCALE = "dialog_add_system_locale";
|
||||||
|
private static final String EXTRA_SYSTEM_LOCALE_DIALOG_TYPE = "system_locale_dialog_type";
|
||||||
private static final String LOCALE_SUGGESTION = "locale_suggestion";
|
private static final String LOCALE_SUGGESTION = "locale_suggestion";
|
||||||
|
private static final int MENU_ID_REMOVE = Menu.FIRST + 1;
|
||||||
|
private static final int REQUEST_LOCALE_PICKER = 0;
|
||||||
|
private static final int INVALID_NOTIFICATION_ID = -1;
|
||||||
|
|
||||||
private LocaleDragAndDropAdapter mAdapter;
|
private LocaleDragAndDropAdapter mAdapter;
|
||||||
private Menu mMenu;
|
private Menu mMenu;
|
||||||
@@ -170,9 +174,10 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
|
|||||||
if (mShowingRemoveDialog) {
|
if (mShowingRemoveDialog) {
|
||||||
showRemoveLocaleWarningDialog();
|
showRemoveLocaleWarningDialog();
|
||||||
}
|
}
|
||||||
if (shouldShowConfirmationDialog() && !mLocaleAdditionMode) {
|
Log.d(TAG, "LocaleAdditionMode:" + mLocaleAdditionMode);
|
||||||
getActivity().setResult(Activity.RESULT_OK);
|
if (!mLocaleAdditionMode && shouldShowConfirmationDialog()) {
|
||||||
showDialogForAddedLocale();
|
showDialogForAddedLocale();
|
||||||
|
mLocaleAdditionMode = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,18 +241,19 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
|
|||||||
mAdapter.notifyListChanged(localeInfo);
|
mAdapter.notifyListChanged(localeInfo);
|
||||||
}
|
}
|
||||||
mAdapter.setCacheItemList();
|
mAdapter.setCacheItemList();
|
||||||
|
} else if (requestCode == DIALOG_ADD_SYSTEM_LOCALE) {
|
||||||
|
if (resultCode == Activity.RESULT_OK) {
|
||||||
|
localeInfo = (LocaleStore.LocaleInfo) data.getExtras().getSerializable(
|
||||||
|
LocaleDialogFragment.ARG_TARGET_LOCALE);
|
||||||
|
String preferencesTags = Settings.System.getString(
|
||||||
|
getContext().getContentResolver(),
|
||||||
|
Settings.System.LOCALE_PREFERENCES);
|
||||||
|
mAdapter.addLocale(mayAppendUnicodeTags(localeInfo, preferencesTags));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
if (mSuggestionDialog != null) {
|
|
||||||
mSuggestionDialog.dismiss();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
static LocaleStore.LocaleInfo mayAppendUnicodeTags(
|
static LocaleStore.LocaleInfo mayAppendUnicodeTags(
|
||||||
LocaleStore.LocaleInfo localeInfo, String recordTags) {
|
LocaleStore.LocaleInfo localeInfo, String recordTags) {
|
||||||
@@ -276,31 +282,42 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
|
|||||||
Intent intent = this.getIntent();
|
Intent intent = this.getIntent();
|
||||||
String dialogType = intent.getStringExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE);
|
String dialogType = intent.getStringExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE);
|
||||||
String localeTag = intent.getStringExtra(EXTRA_APP_LOCALE);
|
String localeTag = intent.getStringExtra(EXTRA_APP_LOCALE);
|
||||||
if (!isAllowedPackage()
|
int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, INVALID_NOTIFICATION_ID);
|
||||||
|| isNullOrEmpty(dialogType)
|
if (!isDialogFeatureEnabled()
|
||||||
|| isNullOrEmpty(localeTag)
|
|| !isValidNotificationId(localeTag, notificationId)
|
||||||
|| !LOCALE_SUGGESTION.equals(dialogType)
|
|| !isValidDialogType(dialogType)
|
||||||
|| !isValidLocale(localeTag)
|
|| !isValidLocale(localeTag)
|
||||||
|| isInSystemLocale(localeTag)) {
|
|| LocaleUtils.isInSystemLocale(localeTag)) {
|
||||||
getActivity().setResult(Activity.RESULT_CANCELED);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
getActivity().setResult(Activity.RESULT_OK);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isAllowedPackage() {
|
private boolean isDialogFeatureEnabled() {
|
||||||
List<String> allowList = Arrays.asList(getContext().getResources().getStringArray(
|
return SystemProperties.getBoolean(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION,
|
||||||
R.array.allowed_packages_for_locale_confirmation_diallog));
|
AppLocalePickerActivity.ENABLED);
|
||||||
String callingPackage = getActivity().getCallingPackage();
|
|
||||||
return !isNullOrEmpty(callingPackage) && allowList.contains(callingPackage);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isNullOrEmpty(String str) {
|
private boolean isValidNotificationId(String localeTag, long id) {
|
||||||
return str == null || str.isEmpty();
|
if (id == -1) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return id == getNotificationController().getNotificationId(localeTag);
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
NotificationController getNotificationController() {
|
||||||
|
return NotificationController.getInstance(getContext());
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isValidDialogType(String type) {
|
||||||
|
return LOCALE_SUGGESTION.equals(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isValidLocale(String tag) {
|
private boolean isValidLocale(String tag) {
|
||||||
|
if (TextUtils.isEmpty(tag)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
String[] systemLocales = getSupportedLocales();
|
String[] systemLocales = getSupportedLocales();
|
||||||
for (String systemTag : systemLocales) {
|
for (String systemTag : systemLocales) {
|
||||||
if (systemTag.equals(tag)) {
|
if (systemTag.equals(tag)) {
|
||||||
@@ -310,63 +327,26 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected String[] getSupportedLocales() {
|
@VisibleForTesting
|
||||||
|
String[] getSupportedLocales() {
|
||||||
return LocalePicker.getSupportedLocales(getContext());
|
return LocalePicker.getSupportedLocales(getContext());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the localeTag is in the system locale. Since in the current design, the system
|
|
||||||
* language list would not show two locales with the same language and region but different
|
|
||||||
* numbering system. So, during the comparison, the u extension has to be stripped out.
|
|
||||||
*
|
|
||||||
* @param languageTag A language tag
|
|
||||||
* @return true if the locale is in the system locale. Otherwise, false.
|
|
||||||
*/
|
|
||||||
private boolean isInSystemLocale(String languageTag) {
|
|
||||||
LocaleList systemLocales = LocaleList.getDefault();
|
|
||||||
Locale locale = Locale.forLanguageTag(languageTag).stripExtensions();
|
|
||||||
for (int i = 0; i < systemLocales.size(); i++) {
|
|
||||||
if (systemLocales.get(i).stripExtensions().equals(locale)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showDialogForAddedLocale() {
|
private void showDialogForAddedLocale() {
|
||||||
|
Log.d(TAG, "Show confirmation dialog");
|
||||||
Intent intent = this.getIntent();
|
Intent intent = this.getIntent();
|
||||||
String dialogType = intent.getStringExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE);
|
String dialogType = intent.getStringExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE);
|
||||||
String appLocaleTag = intent.getStringExtra(EXTRA_APP_LOCALE);
|
String appLocaleTag = intent.getStringExtra(EXTRA_APP_LOCALE);
|
||||||
Log.d(TAG, "Dialog suggested locale: " + appLocaleTag);
|
|
||||||
LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(
|
LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(
|
||||||
Locale.forLanguageTag(appLocaleTag));
|
Locale.forLanguageTag(appLocaleTag));
|
||||||
if (LOCALE_SUGGESTION.equals(dialogType)) {
|
final LocaleDialogFragment localeDialogFragment =
|
||||||
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity());
|
LocaleDialogFragment.newInstance();
|
||||||
customizeLayout(dialogBuilder, localeInfo.getFullNameNative());
|
Bundle args = new Bundle();
|
||||||
dialogBuilder
|
args.putInt(LocaleDialogFragment.ARG_DIALOG_TYPE, DIALOG_ADD_SYSTEM_LOCALE);
|
||||||
.setPositiveButton(R.string.add, new DialogInterface.OnClickListener() {
|
args.putSerializable(LocaleDialogFragment.ARG_TARGET_LOCALE, localeInfo);
|
||||||
@Override
|
localeDialogFragment.setArguments(args);
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
localeDialogFragment.show(mFragmentManager, TAG_DIALOG_ADD_SYSTEM_LOCALE);
|
||||||
mLocaleAdditionMode = true;
|
|
||||||
String preferencesTags = Settings.System.getString(
|
|
||||||
getContext().getContentResolver(),
|
|
||||||
Settings.System.LOCALE_PREFERENCES);
|
|
||||||
mAdapter.addLocale(mayAppendUnicodeTags(localeInfo, preferencesTags));
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.setNegativeButton(android.R.string.cancel,
|
|
||||||
new DialogInterface.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
|
||||||
mLocaleAdditionMode = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
mSuggestionDialog = dialogBuilder.create();
|
|
||||||
mSuggestionDialog.setCanceledOnTouchOutside(false);
|
|
||||||
mSuggestionDialog.show();
|
|
||||||
} else {
|
|
||||||
Log.d(TAG, "Invalid parameter, dialogType:" + dialogType);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void customizeLayout(AlertDialog.Builder dialogBuilder, String language) {
|
private void customizeLayout(AlertDialog.Builder dialogBuilder, String language) {
|
||||||
|
@@ -0,0 +1,100 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A data manager that manages the {@link SharedPreferences} for the locale notification
|
||||||
|
* information.
|
||||||
|
*/
|
||||||
|
public class LocaleNotificationDataManager {
|
||||||
|
private static final String LOCALE_NOTIFICATION = "locale_notification";
|
||||||
|
private Context mContext;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context The context
|
||||||
|
*/
|
||||||
|
public LocaleNotificationDataManager(Context context) {
|
||||||
|
this.mContext = context;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SharedPreferences getSharedPreferences(Context context) {
|
||||||
|
return context.getSharedPreferences(LOCALE_NOTIFICATION, Context.MODE_PRIVATE);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds one entry with the corresponding locale and {@link NotificationInfo} to the
|
||||||
|
* {@link SharedPreferences}.
|
||||||
|
*
|
||||||
|
* @param locale A locale which the application sets to
|
||||||
|
* @param info The notification metadata
|
||||||
|
*/
|
||||||
|
public void putNotificationInfo(String locale, NotificationInfo info) {
|
||||||
|
Gson gson = new Gson();
|
||||||
|
String json = gson.toJson(info);
|
||||||
|
SharedPreferences.Editor editor = getSharedPreferences(mContext).edit();
|
||||||
|
editor.putString(locale, json);
|
||||||
|
editor.apply();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the {@link NotificationInfo} with the associated locale from the
|
||||||
|
* {@link SharedPreferences}.
|
||||||
|
*
|
||||||
|
* @param locale A locale which the application sets to
|
||||||
|
* @return {@link NotificationInfo}
|
||||||
|
*/
|
||||||
|
public NotificationInfo getNotificationInfo(String locale) {
|
||||||
|
Gson gson = new Gson();
|
||||||
|
String json = getSharedPreferences(mContext).getString(locale, "");
|
||||||
|
return json.isEmpty() ? null : gson.fromJson(json, NotificationInfo.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the locale notification map.
|
||||||
|
*
|
||||||
|
* @return A map which maps the locale to the corresponding {@link NotificationInfo}
|
||||||
|
*/
|
||||||
|
public Map<String, NotificationInfo> getLocaleNotificationInfoMap() {
|
||||||
|
Gson gson = new Gson();
|
||||||
|
Map<String, String> map = (Map<String, String>) getSharedPreferences(mContext).getAll();
|
||||||
|
Map<String, NotificationInfo> result = new HashMap<>(map.size());
|
||||||
|
map.forEach((key, value) -> {
|
||||||
|
result.put(key, gson.fromJson(value, NotificationInfo.class));
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears the locale notification map.
|
||||||
|
*/
|
||||||
|
@VisibleForTesting
|
||||||
|
void clearLocaleNotificationMap() {
|
||||||
|
getSharedPreferences(mContext).edit().clear().apply();
|
||||||
|
}
|
||||||
|
}
|
53
src/com/android/settings/localepicker/LocaleUtils.java
Normal file
53
src/com/android/settings/localepicker/LocaleUtils.java
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
|
import android.os.LocaleList;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A locale utility class.
|
||||||
|
*/
|
||||||
|
public class LocaleUtils {
|
||||||
|
/**
|
||||||
|
* Checks if the languageTag is in the system locale. Since in the current design, the system
|
||||||
|
* language list would not show two locales with the same language and region but different
|
||||||
|
* numbering system. So, the u extension has to be stripped out in the process of comparison.
|
||||||
|
*
|
||||||
|
* @param languageTag A language tag
|
||||||
|
* @return true if the locale is in the system locale. Otherwise, false.
|
||||||
|
*/
|
||||||
|
public static boolean isInSystemLocale(@NonNull String languageTag) {
|
||||||
|
LocaleList systemLocales = LocaleList.getDefault();
|
||||||
|
Locale localeWithoutUextension =
|
||||||
|
new Locale.Builder()
|
||||||
|
.setLocale(Locale.forLanguageTag(languageTag))
|
||||||
|
.clearExtensions()
|
||||||
|
.build();
|
||||||
|
for (int i = 0; i < systemLocales.size(); i++) {
|
||||||
|
Locale sysLocaleWithoutUextension =
|
||||||
|
new Locale.Builder().setLocale(systemLocales.get(i)).clearExtensions().build();
|
||||||
|
if (localeWithoutUextension.equals(sysLocaleWithoutUextension)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
|
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_APP_LOCALE;
|
||||||
|
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_NOTIFICATION_ID;
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A Broadcast receiver that handles the locale notification which is swiped away.
|
||||||
|
*/
|
||||||
|
public class NotificationCancelReceiver extends BroadcastReceiver {
|
||||||
|
private static final String TAG = NotificationCancelReceiver.class.getSimpleName();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
String appLocale = intent.getExtras().getString(EXTRA_APP_LOCALE);
|
||||||
|
int notificationId = intent.getExtras().getInt(EXTRA_NOTIFICATION_ID, -1);
|
||||||
|
int savedNotificationID = getNotificationController(context).getNotificationId(
|
||||||
|
appLocale);
|
||||||
|
Log.i(TAG, "Locale notification is swiped away.");
|
||||||
|
if (savedNotificationID == notificationId) {
|
||||||
|
getNotificationController(context).incrementDismissCount(appLocale);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
NotificationController getNotificationController(Context context) {
|
||||||
|
return NotificationController.getInstance(context);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,173 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.SystemClock;
|
||||||
|
import android.os.SystemProperties;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A controller that evaluates whether the notification can be triggered and update the
|
||||||
|
* SharedPreference.
|
||||||
|
*/
|
||||||
|
public class NotificationController {
|
||||||
|
private static final String TAG = NotificationController.class.getSimpleName();
|
||||||
|
private static final int DISMISS_COUNT_THRESHOLD = 2;
|
||||||
|
private static final int NOTIFICATION_COUNT_THRESHOLD = 2;
|
||||||
|
private static final int MULTIPLE_BASE = 2;
|
||||||
|
// seven days: 7 * 24 * 60
|
||||||
|
private static final int MIN_DURATION_BETWEEN_NOTIFICATIONS_MIN = 10080;
|
||||||
|
private static final String PROPERTY_MIN_DURATION =
|
||||||
|
"android.localenotification.duration.threshold";
|
||||||
|
|
||||||
|
private static NotificationController sInstance = null;
|
||||||
|
|
||||||
|
private final LocaleNotificationDataManager mDataManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get {@link NotificationController} instance.
|
||||||
|
*
|
||||||
|
* @param context The context
|
||||||
|
* @return {@link NotificationController} instance
|
||||||
|
*/
|
||||||
|
public static synchronized NotificationController getInstance(@NonNull Context context) {
|
||||||
|
if (sInstance == null) {
|
||||||
|
sInstance = new NotificationController(context);
|
||||||
|
}
|
||||||
|
return sInstance;
|
||||||
|
}
|
||||||
|
|
||||||
|
private NotificationController(Context context) {
|
||||||
|
mDataManager = new LocaleNotificationDataManager(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
LocaleNotificationDataManager getDataManager() {
|
||||||
|
return mDataManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Increment the dismissCount of the notification.
|
||||||
|
*
|
||||||
|
* @param locale A locale used to query the {@link NotificationInfo}
|
||||||
|
*/
|
||||||
|
public void incrementDismissCount(@NonNull String locale) {
|
||||||
|
NotificationInfo currentInfo = mDataManager.getNotificationInfo(locale);
|
||||||
|
NotificationInfo newInfo = new NotificationInfo(currentInfo.getUidCollection(),
|
||||||
|
currentInfo.getNotificationCount(),
|
||||||
|
currentInfo.getDismissCount() + 1,
|
||||||
|
currentInfo.getLastNotificationTimeMs(),
|
||||||
|
currentInfo.getNotificationId());
|
||||||
|
mDataManager.putNotificationInfo(locale, newInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the notification can be triggered or not.
|
||||||
|
*
|
||||||
|
* @param uid The application's uid.
|
||||||
|
* @param locale The application's locale which the user updated to.
|
||||||
|
* @return true if the notification needs to be triggered. Otherwise, false.
|
||||||
|
*/
|
||||||
|
public boolean shouldTriggerNotification(int uid, @NonNull String locale) {
|
||||||
|
if (LocaleUtils.isInSystemLocale(locale)) {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
// Add the uid into the locale's uid list and update the notification count if the
|
||||||
|
// notification can be triggered.
|
||||||
|
return updateLocaleNotificationInfo(uid, locale);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the notification id
|
||||||
|
*
|
||||||
|
* @param locale The locale which the application sets to
|
||||||
|
* @return the notification id
|
||||||
|
*/
|
||||||
|
public int getNotificationId(@NonNull String locale) {
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo(locale);
|
||||||
|
return (info != null) ? info.getNotificationId() : -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean updateLocaleNotificationInfo(int uid, String locale) {
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo(locale);
|
||||||
|
if (info == null) {
|
||||||
|
// Create an empty record with the uid and update the SharedPreference.
|
||||||
|
NotificationInfo emptyInfo = new NotificationInfo(Set.of(uid), 0, 0, 0, 0);
|
||||||
|
mDataManager.putNotificationInfo(locale, emptyInfo);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Set uidCollection = info.getUidCollection();
|
||||||
|
if (uidCollection.contains(uid)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
NotificationInfo newInfo =
|
||||||
|
createNotificationInfoWithNewUidAndCount(uidCollection, uid, info);
|
||||||
|
mDataManager.putNotificationInfo(locale, newInfo);
|
||||||
|
return newInfo.getNotificationCount() > info.getNotificationCount();
|
||||||
|
}
|
||||||
|
|
||||||
|
private NotificationInfo createNotificationInfoWithNewUidAndCount(
|
||||||
|
Set<Integer> uidSet, int uid, NotificationInfo info) {
|
||||||
|
int dismissCount = info.getDismissCount();
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new NotificationInfo(uidSet, notificationCount, dismissCount, lastNotificationTime,
|
||||||
|
notificationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Evaluates if the notification is triggered frequently.
|
||||||
|
*
|
||||||
|
* @param lastNotificationTime The timestamp that the last notification was triggered.
|
||||||
|
* @return true if the duration of the two continuous notifications is smaller than the
|
||||||
|
* threshold.
|
||||||
|
* Otherwise, false.
|
||||||
|
*/
|
||||||
|
private boolean isNotificationFrequent(long lastNotificationTime) {
|
||||||
|
Calendar time = Calendar.getInstance();
|
||||||
|
int threshold = SystemProperties.getInt(PROPERTY_MIN_DURATION,
|
||||||
|
MIN_DURATION_BETWEEN_NOTIFICATIONS_MIN);
|
||||||
|
time.add(Calendar.MINUTE, threshold * -1);
|
||||||
|
return time.getTimeInMillis() < lastNotificationTime;
|
||||||
|
}
|
||||||
|
}
|
99
src/com/android/settings/localepicker/NotificationInfo.java
Normal file
99
src/com/android/settings/localepicker/NotificationInfo.java
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
class NotificationInfo {
|
||||||
|
private Set<Integer> mUidCollection;
|
||||||
|
private int mNotificationCount;
|
||||||
|
private int mDismissCount;
|
||||||
|
private long mLastNotificationTimeMs;
|
||||||
|
private int mNotificationId;
|
||||||
|
|
||||||
|
private NotificationInfo() {
|
||||||
|
}
|
||||||
|
|
||||||
|
NotificationInfo(Set<Integer> uidCollection, int notificationCount, int dismissCount,
|
||||||
|
long lastNotificationTimeMs, int notificationId) {
|
||||||
|
this.mUidCollection = uidCollection;
|
||||||
|
this.mNotificationCount = notificationCount;
|
||||||
|
this.mDismissCount = dismissCount;
|
||||||
|
this.mLastNotificationTimeMs = lastNotificationTimeMs;
|
||||||
|
this.mNotificationId = notificationId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Set<Integer> getUidCollection() {
|
||||||
|
return mUidCollection;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getNotificationCount() {
|
||||||
|
return mNotificationCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getDismissCount() {
|
||||||
|
return mDismissCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getLastNotificationTimeMs() {
|
||||||
|
return mLastNotificationTimeMs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getNotificationId() {
|
||||||
|
return mNotificationId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUidCollection(Set<Integer> uidCollection) {
|
||||||
|
this.mUidCollection = uidCollection;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNotificationCount(int notificationCount) {
|
||||||
|
this.mNotificationCount = notificationCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDismissCount(int dismissCount) {
|
||||||
|
this.mDismissCount = dismissCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLastNotificationTimeMs(long lastNotificationTimeMs) {
|
||||||
|
this.mLastNotificationTimeMs = lastNotificationTimeMs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNotificationId(int notificationId) {
|
||||||
|
this.mNotificationId = notificationId;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (o == null) return false;
|
||||||
|
if (this == o) return true;
|
||||||
|
if (!(o instanceof NotificationInfo)) return false;
|
||||||
|
NotificationInfo that = (NotificationInfo) o;
|
||||||
|
return (mUidCollection.equals(that.mUidCollection))
|
||||||
|
&& (mDismissCount == that.mDismissCount)
|
||||||
|
&& (mNotificationCount == that.mNotificationCount)
|
||||||
|
&& (mLastNotificationTimeMs == that.mLastNotificationTimeMs)
|
||||||
|
&& (mNotificationId == that.mNotificationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(mUidCollection, mDismissCount, mNotificationCount,
|
||||||
|
mLastNotificationTimeMs, mNotificationId);
|
||||||
|
}
|
||||||
|
}
|
@@ -32,11 +32,14 @@ import android.content.Intent;
|
|||||||
import android.content.pm.ApplicationInfo;
|
import android.content.pm.ApplicationInfo;
|
||||||
import android.content.pm.InstallSourceInfo;
|
import android.content.pm.InstallSourceInfo;
|
||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
|
import android.content.pm.PackageManager.NameNotFoundException;
|
||||||
import android.content.pm.ResolveInfo;
|
import android.content.pm.ResolveInfo;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.LocaleList;
|
import android.os.LocaleList;
|
||||||
import android.os.Process;
|
import android.os.Process;
|
||||||
|
import android.os.SystemClock;
|
||||||
|
import android.os.SystemProperties;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.telephony.TelephonyManager;
|
import android.telephony.TelephonyManager;
|
||||||
|
|
||||||
@@ -67,8 +70,10 @@ import org.robolectric.shadows.ShadowTelephonyManager;
|
|||||||
import org.robolectric.util.ReflectionHelpers;
|
import org.robolectric.util.ReflectionHelpers;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Calendar;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(
|
@Config(
|
||||||
@@ -79,6 +84,12 @@ import java.util.Locale;
|
|||||||
public class AppLocalePickerActivityTest {
|
public class AppLocalePickerActivityTest {
|
||||||
private static final String TEST_PACKAGE_NAME = "com.android.settings";
|
private static final String TEST_PACKAGE_NAME = "com.android.settings";
|
||||||
private static final Uri TEST_PACKAGE_URI = Uri.parse("package:" + TEST_PACKAGE_NAME);
|
private static final Uri TEST_PACKAGE_URI = Uri.parse("package:" + TEST_PACKAGE_NAME);
|
||||||
|
private static final String EN_CA = "en-CA";
|
||||||
|
private static final String EN_US = "en-US";
|
||||||
|
private static int sUid;
|
||||||
|
|
||||||
|
private LocaleNotificationDataManager mDataManager;
|
||||||
|
private AppLocalePickerActivity mActivity;
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
LocaleStore.LocaleInfo mLocaleInfo;
|
LocaleStore.LocaleInfo mLocaleInfo;
|
||||||
@@ -99,10 +110,11 @@ public class AppLocalePickerActivityTest {
|
|||||||
when(mLocaleConfig.getStatus()).thenReturn(LocaleConfig.STATUS_SUCCESS);
|
when(mLocaleConfig.getStatus()).thenReturn(LocaleConfig.STATUS_SUCCESS);
|
||||||
when(mLocaleConfig.getSupportedLocales()).thenReturn(LocaleList.forLanguageTags("en-US"));
|
when(mLocaleConfig.getSupportedLocales()).thenReturn(LocaleList.forLanguageTags("en-US"));
|
||||||
ReflectionHelpers.setStaticField(AppLocaleUtil.class, "sLocaleConfig", mLocaleConfig);
|
ReflectionHelpers.setStaticField(AppLocaleUtil.class, "sLocaleConfig", mLocaleConfig);
|
||||||
|
sUid = Process.myUid();
|
||||||
}
|
}
|
||||||
|
|
||||||
@After
|
@After
|
||||||
public void tearDown() {
|
public void tearDown() throws Exception {
|
||||||
mPackageManager.removePackage(TEST_PACKAGE_NAME);
|
mPackageManager.removePackage(TEST_PACKAGE_NAME);
|
||||||
ReflectionHelpers.setStaticField(AppLocaleUtil.class, "sLocaleConfig", null);
|
ReflectionHelpers.setStaticField(AppLocaleUtil.class, "sLocaleConfig", null);
|
||||||
ShadowResources.setDisAllowPackage(false);
|
ShadowResources.setDisAllowPackage(false);
|
||||||
@@ -210,13 +222,266 @@ public class AppLocalePickerActivityTest {
|
|||||||
assertThat(controller.get().isFinishing()).isTrue();
|
assertThat(controller.get().isFinishing()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onLocaleSelected_evaluateNotification_simpleLocaleUpdate_localeCreatedWithUid()
|
||||||
|
throws Exception {
|
||||||
|
sUid = 100;
|
||||||
|
initLocaleNotificationEnvironment();
|
||||||
|
ActivityController<TestAppLocalePickerActivity> controller = initActivityController(true);
|
||||||
|
controller.create();
|
||||||
|
AppLocalePickerActivity mActivity = controller.get();
|
||||||
|
LocaleNotificationDataManager dataManager =
|
||||||
|
NotificationController.getInstance(mActivity).getDataManager();
|
||||||
|
|
||||||
|
mActivity.onLocaleSelected(mLocaleInfo);
|
||||||
|
|
||||||
|
// Notification is not triggered.
|
||||||
|
// In the sharedpreference, en-US's uid list contains uid1 and the notificationCount
|
||||||
|
// equals 0.
|
||||||
|
NotificationInfo info = dataManager.getNotificationInfo(EN_US);
|
||||||
|
assertThat(info.getUidCollection().contains(sUid)).isTrue();
|
||||||
|
assertThat(info.getNotificationCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getDismissCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getLastNotificationTimeMs()).isEqualTo(0);
|
||||||
|
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "false");
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onLocaleSelected_evaluateNotification_twoLocaleUpdate_triggerNotification()
|
||||||
|
throws Exception {
|
||||||
|
// App with uid 101 changed its locale from System to en-US.
|
||||||
|
sUid = 101;
|
||||||
|
initLocaleNotificationEnvironment();
|
||||||
|
// Initialize the proto to contain en-US locale. Its uid list includes 100.
|
||||||
|
Set<Integer> uidSet = Set.of(100);
|
||||||
|
initSharedPreference(EN_US, uidSet, 0, 0, 0, 0);
|
||||||
|
|
||||||
|
mActivity.onLocaleSelected(mLocaleInfo);
|
||||||
|
|
||||||
|
// Notification is triggered.
|
||||||
|
// In the proto file, en-US's uid list contains 101, the notificationCount equals 1, and
|
||||||
|
// LastNotificationTime > 0.
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo(EN_US);
|
||||||
|
assertThat(info.getUidCollection()).contains(sUid);
|
||||||
|
assertThat(info.getNotificationCount()).isEqualTo(1);
|
||||||
|
assertThat(info.getDismissCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getLastNotificationTimeMs()).isNotEqualTo(0);
|
||||||
|
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "false");
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onLocaleSelected_evaluateNotification_oddLocaleUpdate_uidAddedWithoutNotification()
|
||||||
|
throws Exception {
|
||||||
|
// App with uid 102 changed its locale from System to en-US.
|
||||||
|
sUid = 102;
|
||||||
|
initLocaleNotificationEnvironment();
|
||||||
|
// Initialize the proto to include en-US locale. Its uid list includes 100,101 and
|
||||||
|
// the notification count equals 1.
|
||||||
|
int notificationId = (int) SystemClock.uptimeMillis();
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101);
|
||||||
|
initSharedPreference(EN_US, uidSet, 0, 1,
|
||||||
|
Calendar.getInstance().getTimeInMillis(), notificationId);
|
||||||
|
|
||||||
|
mActivity.onLocaleSelected(mLocaleInfo);
|
||||||
|
|
||||||
|
// Notification is not triggered because count % 2 != 0.
|
||||||
|
// In the proto file, en-US's uid list contains 102, the notificationCount equals 1, and
|
||||||
|
// LastNotificationTime > 0.
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo(EN_US);
|
||||||
|
assertThat(info.getUidCollection()).contains(sUid);
|
||||||
|
assertThat(info.getNotificationCount()).isEqualTo(1);
|
||||||
|
assertThat(info.getDismissCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getLastNotificationTimeMs()).isNotEqualTo(0);
|
||||||
|
assertThat(info.getNotificationId()).isEqualTo(notificationId);
|
||||||
|
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "false");
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onLocaleSelected_evaluateNotification_frequentLocaleUpdate_uidAddedNoNotification()
|
||||||
|
throws Exception {
|
||||||
|
// App with uid 103 changed its locale from System to en-US.
|
||||||
|
sUid = 103;
|
||||||
|
initLocaleNotificationEnvironment();
|
||||||
|
// Initialize the proto to include en-US locale. Its uid list includes 100,101,102 and
|
||||||
|
// the notification count equals 1.
|
||||||
|
int notificationId = (int) SystemClock.uptimeMillis();
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101, 102);
|
||||||
|
initSharedPreference(EN_US, uidSet, 0, 1,
|
||||||
|
Calendar.getInstance().getTimeInMillis(), notificationId);
|
||||||
|
|
||||||
|
mActivity.onLocaleSelected(mLocaleInfo);
|
||||||
|
|
||||||
|
// Notification is not triggered because the duration is less than the threshold.
|
||||||
|
// In the proto file, en-US's uid list contains 103, the notificationCount equals 1, and
|
||||||
|
// LastNotificationTime > 0.
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo(EN_US);
|
||||||
|
assertThat(info.getUidCollection().contains(sUid)).isTrue();
|
||||||
|
assertThat(info.getNotificationCount()).isEqualTo(1);
|
||||||
|
assertThat(info.getDismissCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getLastNotificationTimeMs()).isNotEqualTo(0);
|
||||||
|
assertThat(info.getNotificationId()).isEqualTo(notificationId);
|
||||||
|
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "false");
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onLocaleSelected_evaluateNotification_2ndOddLocaleUpdate_uidAddedNoNotification()
|
||||||
|
throws Exception {
|
||||||
|
// App with uid 104 changed its locale from System to en-US.
|
||||||
|
sUid = 104;
|
||||||
|
initLocaleNotificationEnvironment();
|
||||||
|
|
||||||
|
// Initialize the proto to include en-US locale. Its uid list includes 100,101,102,103 and
|
||||||
|
// the notification count equals 1.
|
||||||
|
int notificationId = (int) SystemClock.uptimeMillis();
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101, 102, 103);
|
||||||
|
initSharedPreference(EN_US, uidSet, 0, 1, Calendar.getInstance().getTimeInMillis(),
|
||||||
|
notificationId);
|
||||||
|
|
||||||
|
mActivity.onLocaleSelected(mLocaleInfo);
|
||||||
|
|
||||||
|
// Notification is not triggered because uid count % 2 != 0
|
||||||
|
// In the proto file, en-US's uid list contains uid4, the notificationCount equals 1, and
|
||||||
|
// LastNotificationTime > 0.
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo(EN_US);
|
||||||
|
assertThat(info.getUidCollection()).contains(sUid);
|
||||||
|
assertThat(info.getNotificationCount()).isEqualTo(1);
|
||||||
|
assertThat(info.getDismissCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getLastNotificationTimeMs()).isNotEqualTo(0);
|
||||||
|
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "false");
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEvaluateLocaleNotification_evenLocaleUpdate_trigger2ndNotification()
|
||||||
|
throws Exception {
|
||||||
|
sUid = 105;
|
||||||
|
initLocaleNotificationEnvironment();
|
||||||
|
|
||||||
|
// Initialize the proto to include en-US locale. Its uid list includes 100,101,102,103,104
|
||||||
|
// and the notification count equals 1.
|
||||||
|
// Eight days later, App with uid 105 changed its locale from System to en-US
|
||||||
|
int notificationId = (int) SystemClock.uptimeMillis();
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101, 102, 103, 104);
|
||||||
|
Calendar now = Calendar.getInstance();
|
||||||
|
now.add(Calendar.DAY_OF_MONTH, -8); // Set the lastNotificationTime to eight days ago.
|
||||||
|
long lastNotificationTime = now.getTimeInMillis();
|
||||||
|
initSharedPreference(EN_US, uidSet, 0, 1, lastNotificationTime, notificationId);
|
||||||
|
|
||||||
|
mActivity.onLocaleSelected(mLocaleInfo);
|
||||||
|
|
||||||
|
// Notification is triggered.
|
||||||
|
// In the proto file, en-US's uid list contains 105, the notificationCount equals 2, and
|
||||||
|
// LastNotificationTime is updated.
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo(EN_US);
|
||||||
|
assertThat(info.getUidCollection()).contains(sUid);
|
||||||
|
assertThat(info.getNotificationCount()).isEqualTo(2);
|
||||||
|
assertThat(info.getDismissCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getLastNotificationTimeMs()).isGreaterThan(lastNotificationTime);
|
||||||
|
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "false");
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEvaluateLocaleNotification_localeUpdateReachThreshold_uidAddedNoNotification()
|
||||||
|
throws Exception {
|
||||||
|
// App with uid 106 changed its locale from System to en-US.
|
||||||
|
sUid = 106;
|
||||||
|
initLocaleNotificationEnvironment();
|
||||||
|
// Initialize the proto to include en-US locale. Its uid list includes
|
||||||
|
// 100,101,102,103,104,105 and the notification count equals 2.
|
||||||
|
int notificationId = (int) SystemClock.uptimeMillis();
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101, 102, 103, 104, 105);
|
||||||
|
Calendar now = Calendar.getInstance();
|
||||||
|
now.add(Calendar.DAY_OF_MONTH, -8);
|
||||||
|
long lastNotificationTime = now.getTimeInMillis();
|
||||||
|
initSharedPreference(EN_US, uidSet, 0, 2, lastNotificationTime, notificationId);
|
||||||
|
|
||||||
|
mActivity.onLocaleSelected(mLocaleInfo);
|
||||||
|
|
||||||
|
// Notification is not triggered because the notification count threshold, 2, is reached.
|
||||||
|
// In the proto file, en-US's uid list contains 106, the notificationCount equals 2, and
|
||||||
|
// LastNotificationTime > 0.
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo(EN_US);
|
||||||
|
assertThat(info.getUidCollection()).contains(sUid);
|
||||||
|
assertThat(info.getNotificationCount()).isEqualTo(2);
|
||||||
|
assertThat(info.getDismissCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getLastNotificationTimeMs()).isEqualTo(lastNotificationTime);
|
||||||
|
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "false");
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEvaluateLocaleNotification_appChangedLocales_newLocaleCreated()
|
||||||
|
throws Exception {
|
||||||
|
sUid = 100;
|
||||||
|
initLocaleNotificationEnvironment();
|
||||||
|
// App with uid 100 changed its locale from en-US to ja-JP.
|
||||||
|
Locale locale = Locale.forLanguageTag("ja-JP");
|
||||||
|
when(mLocaleInfo.getLocale()).thenReturn(locale);
|
||||||
|
// Initialize the proto to include en-US locale. Its uid list includes
|
||||||
|
// 100,101,102,103,104,105,106 and the notification count equals 2.
|
||||||
|
int notificationId = (int) SystemClock.uptimeMillis();
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101, 102, 103, 104, 105, 106);
|
||||||
|
Calendar now = Calendar.getInstance();
|
||||||
|
now.add(Calendar.DAY_OF_MONTH, -8);
|
||||||
|
initSharedPreference(EN_US, uidSet, 0, 2, now.getTimeInMillis(),
|
||||||
|
notificationId);
|
||||||
|
|
||||||
|
mActivity.onLocaleSelected(mLocaleInfo);
|
||||||
|
|
||||||
|
// Notification is not triggered
|
||||||
|
// In the proto file, a map for ja-JP is created. Its uid list contains uid1.
|
||||||
|
NotificationInfo info = mDataManager.getNotificationInfo("ja-JP");
|
||||||
|
assertThat(info.getUidCollection()).contains(sUid);
|
||||||
|
assertThat(info.getNotificationCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getDismissCount()).isEqualTo(0);
|
||||||
|
assertThat(info.getLastNotificationTimeMs()).isEqualTo(0);
|
||||||
|
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "false");
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initLocaleNotificationEnvironment() throws Exception {
|
||||||
|
LocaleList.setDefault(LocaleList.forLanguageTags(EN_CA));
|
||||||
|
SystemProperties.set(AppLocalePickerActivity.PROP_SYSTEM_LOCALE_SUGGESTION, "true");
|
||||||
|
|
||||||
|
Locale locale = Locale.forLanguageTag("en-US");
|
||||||
|
when(mLocaleInfo.getLocale()).thenReturn(locale);
|
||||||
|
when(mLocaleInfo.isSystemLocale()).thenReturn(false);
|
||||||
|
when(mLocaleInfo.isAppCurrentLocale()).thenReturn(false);
|
||||||
|
|
||||||
|
ActivityController<TestAppLocalePickerActivity> controller = initActivityController(true);
|
||||||
|
controller.create();
|
||||||
|
mActivity = controller.get();
|
||||||
|
mDataManager = NotificationController.getInstance(mActivity).getDataManager();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initSharedPreference(String locale, Set<Integer> uidSet, int dismissCount,
|
||||||
|
int notificationCount, long lastNotificationTime, int notificationId)
|
||||||
|
throws Exception {
|
||||||
|
NotificationInfo info = new NotificationInfo(uidSet, notificationCount, dismissCount,
|
||||||
|
lastNotificationTime, notificationId);
|
||||||
|
mDataManager.putNotificationInfo(locale, info);
|
||||||
|
}
|
||||||
|
|
||||||
private ActivityController<TestAppLocalePickerActivity> initActivityController(
|
private ActivityController<TestAppLocalePickerActivity> initActivityController(
|
||||||
boolean hasPackageName) {
|
boolean hasPackageName) {
|
||||||
Intent data = new Intent();
|
Intent data = new Intent();
|
||||||
if (hasPackageName) {
|
if (hasPackageName) {
|
||||||
data.setData(TEST_PACKAGE_URI);
|
data.setData(TEST_PACKAGE_URI);
|
||||||
}
|
}
|
||||||
data.putExtra(AppInfoBase.ARG_PACKAGE_UID, Process.myUid());
|
data.putExtra(AppInfoBase.ARG_PACKAGE_UID, sUid);
|
||||||
ActivityController<TestAppLocalePickerActivity> activityController =
|
ActivityController<TestAppLocalePickerActivity> activityController =
|
||||||
Robolectric.buildActivity(TestAppLocalePickerActivity.class, data);
|
Robolectric.buildActivity(TestAppLocalePickerActivity.class, data);
|
||||||
Activity activity = activityController.get();
|
Activity activity = activityController.get();
|
||||||
@@ -259,6 +524,19 @@ public class AppLocalePickerActivityTest {
|
|||||||
private static void setNoLaunchEntry(boolean noLaunchEntry) {
|
private static void setNoLaunchEntry(boolean noLaunchEntry) {
|
||||||
sNoLaunchEntry = noLaunchEntry;
|
sNoLaunchEntry = noLaunchEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Implementation
|
||||||
|
protected ApplicationInfo getApplicationInfo(String packageName, int flags)
|
||||||
|
throws NameNotFoundException {
|
||||||
|
if (packageName.equals(TEST_PACKAGE_NAME)) {
|
||||||
|
ApplicationInfo applicationInfo = new ApplicationInfo();
|
||||||
|
applicationInfo.packageName = TEST_PACKAGE_NAME;
|
||||||
|
applicationInfo.uid = sUid;
|
||||||
|
return applicationInfo;
|
||||||
|
} else {
|
||||||
|
return super.getApplicationInfo(packageName, flags);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Implements(Resources.class)
|
@Implements(Resources.class)
|
||||||
|
@@ -17,7 +17,8 @@
|
|||||||
package com.android.settings.localepicker;
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_APP_LOCALE;
|
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_APP_LOCALE;
|
||||||
import static com.android.settings.localepicker.LocaleListEditor.EXTRA_SYSTEM_LOCALE_DIALOG_TYPE;
|
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_NOTIFICATION_ID;
|
||||||
|
import static com.android.settings.localepicker.LocaleDialogFragment.DIALOG_ADD_SYSTEM_LOCALE;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
@@ -29,7 +30,6 @@ import static org.mockito.Mockito.never;
|
|||||||
import static org.mockito.Mockito.spy;
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
import static org.robolectric.Shadows.shadowOf;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.IActivityManager;
|
import android.app.IActivityManager;
|
||||||
@@ -44,7 +44,6 @@ import android.view.LayoutInflater;
|
|||||||
import android.view.MotionEvent;
|
import android.view.MotionEvent;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.CheckBox;
|
import android.widget.CheckBox;
|
||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
@@ -91,6 +90,8 @@ public class LocaleListEditorTest {
|
|||||||
private static final String ARG_DIALOG_TYPE = "arg_dialog_type";
|
private static final String ARG_DIALOG_TYPE = "arg_dialog_type";
|
||||||
private static final String TAG_DIALOG_CONFIRM_SYSTEM_DEFAULT = "dialog_confirm_system_default";
|
private static final String TAG_DIALOG_CONFIRM_SYSTEM_DEFAULT = "dialog_confirm_system_default";
|
||||||
private static final String TAG_DIALOG_NOT_AVAILABLE = "dialog_not_available_locale";
|
private static final String TAG_DIALOG_NOT_AVAILABLE = "dialog_not_available_locale";
|
||||||
|
private static final String TAG_DIALOG_ADD_SYSTEM_LOCALE = "dialog_add_system_locale";
|
||||||
|
private static final String EXTRA_SYSTEM_LOCALE_DIALOG_TYPE = "system_locale_dialog_type";
|
||||||
private static final int DIALOG_CONFIRM_SYSTEM_DEFAULT = 1;
|
private static final int DIALOG_CONFIRM_SYSTEM_DEFAULT = 1;
|
||||||
private static final int REQUEST_CONFIRM_SYSTEM_DEFAULT = 1;
|
private static final int REQUEST_CONFIRM_SYSTEM_DEFAULT = 1;
|
||||||
|
|
||||||
@@ -132,6 +133,8 @@ public class LocaleListEditorTest {
|
|||||||
private TextView mCurrentDefault;
|
private TextView mCurrentDefault;
|
||||||
@Mock
|
@Mock
|
||||||
private ImageView mDragHandle;
|
private ImageView mDragHandle;
|
||||||
|
@Mock
|
||||||
|
private NotificationController mNotificationController;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
@@ -141,6 +144,8 @@ public class LocaleListEditorTest {
|
|||||||
when(mLocaleListEditor.getContext()).thenReturn(mContext);
|
when(mLocaleListEditor.getContext()).thenReturn(mContext);
|
||||||
mActivity = Robolectric.buildActivity(FragmentActivity.class).get();
|
mActivity = Robolectric.buildActivity(FragmentActivity.class).get();
|
||||||
when(mLocaleListEditor.getActivity()).thenReturn(mActivity);
|
when(mLocaleListEditor.getActivity()).thenReturn(mActivity);
|
||||||
|
when(mLocaleListEditor.getNotificationController()).thenReturn(
|
||||||
|
mNotificationController);
|
||||||
ReflectionHelpers.setField(mLocaleListEditor, "mEmptyTextView",
|
ReflectionHelpers.setField(mLocaleListEditor, "mEmptyTextView",
|
||||||
new TextView(RuntimeEnvironment.application));
|
new TextView(RuntimeEnvironment.application));
|
||||||
ReflectionHelpers.setField(mLocaleListEditor, "mRestrictionsManager",
|
ReflectionHelpers.setField(mLocaleListEditor, "mRestrictionsManager",
|
||||||
@@ -345,24 +350,21 @@ public class LocaleListEditorTest {
|
|||||||
initIntentAndResourceForLocaleDialog();
|
initIntentAndResourceForLocaleDialog();
|
||||||
mLocaleListEditor.onViewStateRestored(null);
|
mLocaleListEditor.onViewStateRestored(null);
|
||||||
|
|
||||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
verify(mFragmentTransaction).add(any(LocaleDialogFragment.class),
|
||||||
assertThat(dialog).isNotNull();
|
eq(TAG_DIALOG_ADD_SYSTEM_LOCALE));
|
||||||
final ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
|
|
||||||
assertThat(shadowDialog.getView()).isNotNull();
|
|
||||||
TextView message = shadowDialog.getView().findViewById(R.id.dialog_msg);
|
|
||||||
assertThat(message.getText().toString()).isEqualTo(
|
|
||||||
"This lets apps and websites know you also prefer this language.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void showDiallogForAddedLocale_clickAdd() {
|
public void showDiallogForAddedLocale_clickAdd() {
|
||||||
initIntentAndResourceForLocaleDialog();
|
initIntentAndResourceForLocaleDialog();
|
||||||
mLocaleListEditor.onViewStateRestored(null);
|
mLocaleListEditor.onViewStateRestored(null);
|
||||||
|
LocaleStore.LocaleInfo info = LocaleStore.fromLocale(Locale.forLanguageTag("en-US"));
|
||||||
|
Bundle bundle = new Bundle();
|
||||||
|
bundle.putInt(ARG_DIALOG_TYPE, DIALOG_ADD_SYSTEM_LOCALE);
|
||||||
|
bundle.putSerializable(LocaleDialogFragment.ARG_TARGET_LOCALE, info);
|
||||||
|
Intent intent = new Intent().putExtras(bundle);
|
||||||
|
mLocaleListEditor.onActivityResult(DIALOG_ADD_SYSTEM_LOCALE, Activity.RESULT_OK, intent);
|
||||||
|
|
||||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
|
||||||
assertThat(dialog).isNotNull();
|
|
||||||
Button positive = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
|
|
||||||
positive.performClick();
|
|
||||||
verify(mAdapter).addLocale(any(LocaleStore.LocaleInfo.class));
|
verify(mAdapter).addLocale(any(LocaleStore.LocaleInfo.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -370,11 +372,14 @@ public class LocaleListEditorTest {
|
|||||||
public void showDiallogForAddedLocale_clickCancel() {
|
public void showDiallogForAddedLocale_clickCancel() {
|
||||||
initIntentAndResourceForLocaleDialog();
|
initIntentAndResourceForLocaleDialog();
|
||||||
mLocaleListEditor.onViewStateRestored(null);
|
mLocaleListEditor.onViewStateRestored(null);
|
||||||
|
LocaleStore.LocaleInfo info = LocaleStore.fromLocale(Locale.forLanguageTag("en-US"));
|
||||||
|
Bundle bundle = new Bundle();
|
||||||
|
bundle.putInt(ARG_DIALOG_TYPE, DIALOG_ADD_SYSTEM_LOCALE);
|
||||||
|
bundle.putSerializable(LocaleDialogFragment.ARG_TARGET_LOCALE, info);
|
||||||
|
Intent intent = new Intent().putExtras(bundle);
|
||||||
|
mLocaleListEditor.onActivityResult(DIALOG_ADD_SYSTEM_LOCALE, Activity.RESULT_CANCELED,
|
||||||
|
intent);
|
||||||
|
|
||||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
|
||||||
assertThat(dialog).isNotNull();
|
|
||||||
Button negative = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
|
|
||||||
negative.performClick();
|
|
||||||
verify(mAdapter, never()).addLocale(any(LocaleStore.LocaleInfo.class));
|
verify(mAdapter, never()).addLocale(any(LocaleStore.LocaleInfo.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -419,25 +424,17 @@ public class LocaleListEditorTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void initIntentAndResourceForLocaleDialog() {
|
private void initIntentAndResourceForLocaleDialog() {
|
||||||
|
int notificationId = 1000;
|
||||||
Intent intent = new Intent("ACTION")
|
Intent intent = new Intent("ACTION")
|
||||||
.putExtra(EXTRA_APP_LOCALE, "ja-JP")
|
.putExtra(EXTRA_APP_LOCALE, "ja-JP")
|
||||||
.putExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE, "locale_suggestion");
|
.putExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE, "locale_suggestion")
|
||||||
|
.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
|
||||||
|
|
||||||
mActivity.setIntent(intent);
|
mActivity.setIntent(intent);
|
||||||
shadowOf(mActivity).setCallingPackage("com.a.b");
|
|
||||||
String[] allowedPackage = new String[]{"com.a.b", "com.b.c"};
|
|
||||||
String[] supportedLocales = new String[]{"en-US", "ja-JP"};
|
String[] supportedLocales = new String[]{"en-US", "ja-JP"};
|
||||||
View contentView = LayoutInflater.from(mActivity).inflate(R.layout.locale_dialog, null);
|
View contentView = LayoutInflater.from(mActivity).inflate(R.layout.locale_dialog, null);
|
||||||
doReturn(contentView).when(mLocaleListEditor).getLocaleDialogView();
|
doReturn(contentView).when(mLocaleListEditor).getLocaleDialogView();
|
||||||
when(mContext.getResources()).thenReturn(mResources);
|
when(mNotificationController.getNotificationId("ja-JP")).thenReturn(notificationId);
|
||||||
when(mResources.getStringArray(
|
|
||||||
R.array.allowed_packages_for_locale_confirmation_diallog)).thenReturn(
|
|
||||||
allowedPackage);
|
|
||||||
when(mResources.getString(
|
|
||||||
R.string.title_system_locale_addition)).thenReturn(
|
|
||||||
"Add %s to preferred languages?");
|
|
||||||
when(mResources.getString(
|
|
||||||
R.string.desc_system_locale_addition)).thenReturn(
|
|
||||||
"This lets apps and websites know you also prefer this language.");
|
|
||||||
when(mLocaleListEditor.getSupportedLocales()).thenReturn(supportedLocales);
|
when(mLocaleListEditor.getSupportedLocales()).thenReturn(supportedLocales);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class LocaleNotificationDataManagerTest {
|
||||||
|
private Context mContext;
|
||||||
|
private LocaleNotificationDataManager mDataManager;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() throws Exception {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
|
mDataManager = new LocaleNotificationDataManager(mContext);
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() {
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testPutGetNotificationInfo() {
|
||||||
|
String locale = "en-US";
|
||||||
|
Set<Integer> uidSet = Set.of(101);
|
||||||
|
NotificationInfo info = new NotificationInfo(uidSet, 1, 1, 100L, 1000);
|
||||||
|
|
||||||
|
mDataManager.putNotificationInfo(locale, info);
|
||||||
|
NotificationInfo expected = mDataManager.getNotificationInfo(locale);
|
||||||
|
|
||||||
|
assertThat(info.equals(expected)).isTrue();
|
||||||
|
assertThat(expected.getNotificationId()).isEqualTo(info.getNotificationId());
|
||||||
|
assertThat(expected.getDismissCount()).isEqualTo(info.getDismissCount());
|
||||||
|
assertThat(expected.getNotificationCount()).isEqualTo(info.getNotificationCount());
|
||||||
|
assertThat(expected.getUidCollection()).isEqualTo(info.getUidCollection());
|
||||||
|
assertThat(expected.getLastNotificationTimeMs()).isEqualTo(
|
||||||
|
info.getLastNotificationTimeMs());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetNotificationMap() {
|
||||||
|
String enUS = "en-US";
|
||||||
|
Set<Integer> uidSet1 = Set.of(101, 102);
|
||||||
|
NotificationInfo info1 = new NotificationInfo(uidSet1, 1, 1, 1000L, 1234);
|
||||||
|
String jaJP = "ja-JP";
|
||||||
|
Set<Integer> uidSet2 = Set.of(103, 104);
|
||||||
|
NotificationInfo info2 = new NotificationInfo(uidSet2, 1, 0, 2000L, 5678);
|
||||||
|
mDataManager.putNotificationInfo(enUS, info1);
|
||||||
|
mDataManager.putNotificationInfo(jaJP, info2);
|
||||||
|
|
||||||
|
Map<String, NotificationInfo> map = mDataManager.getLocaleNotificationInfoMap();
|
||||||
|
|
||||||
|
assertThat(map.size()).isEqualTo(2);
|
||||||
|
assertThat(mDataManager.getNotificationInfo(enUS).equals(map.get(enUS))).isTrue();
|
||||||
|
assertThat(mDataManager.getNotificationInfo(jaJP).equals(map.get(jaJP))).isTrue();
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
|
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_APP_LOCALE;
|
||||||
|
import static com.android.settings.localepicker.AppLocalePickerActivity.EXTRA_NOTIFICATION_ID;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class NotificationCancelReceiverTest {
|
||||||
|
private Context mContext;
|
||||||
|
private NotificationCancelReceiver mReceiver;
|
||||||
|
@Mock
|
||||||
|
private NotificationController mNotificationController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
mReceiver = spy(new NotificationCancelReceiver());
|
||||||
|
doReturn(mNotificationController).when(mReceiver).getNotificationController(any());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testOnReceive_incrementDismissCount() {
|
||||||
|
String locale = "en-US";
|
||||||
|
int notificationId = 100;
|
||||||
|
Intent intent = new Intent()
|
||||||
|
.putExtra(EXTRA_APP_LOCALE, locale)
|
||||||
|
.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
|
||||||
|
when(mNotificationController.getNotificationId(locale)).thenReturn(notificationId);
|
||||||
|
|
||||||
|
mReceiver.onReceive(mContext, intent);
|
||||||
|
|
||||||
|
verify(mNotificationController).incrementDismissCount(eq(locale));
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,178 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.localepicker;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.LocaleList;
|
||||||
|
import android.os.SystemClock;
|
||||||
|
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class NotificationControllerTest {
|
||||||
|
private Context mContext;
|
||||||
|
private LocaleNotificationDataManager mDataManager;
|
||||||
|
private NotificationController mNotificationController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() throws Exception {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
mNotificationController = NotificationController.getInstance(mContext);
|
||||||
|
mDataManager = mNotificationController.getDataManager();
|
||||||
|
LocaleList.setDefault(LocaleList.forLanguageTags("en-CA"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() {
|
||||||
|
mDataManager.clearLocaleNotificationMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void incrementDismissCount_addOne() throws Exception {
|
||||||
|
String enUS = "en-US";
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101);
|
||||||
|
long lastNotificationTime = Calendar.getInstance().getTimeInMillis();
|
||||||
|
int id = (int) SystemClock.uptimeMillis();
|
||||||
|
initSharedPreference(enUS, uidSet, 0, 1, lastNotificationTime, id);
|
||||||
|
|
||||||
|
mNotificationController.incrementDismissCount(enUS);
|
||||||
|
NotificationInfo result = mDataManager.getNotificationInfo(enUS);
|
||||||
|
|
||||||
|
assertThat(result.getDismissCount()).isEqualTo(1); // dismissCount increments
|
||||||
|
assertThat(result.getUidCollection()).isEqualTo(uidSet);
|
||||||
|
assertThat(result.getNotificationCount()).isEqualTo(1);
|
||||||
|
assertThat(result.getLastNotificationTimeMs()).isEqualTo(lastNotificationTime);
|
||||||
|
assertThat(result.getNotificationId()).isEqualTo(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testShouldTriggerNotification_inSystemLocale_returnFalse() throws Exception {
|
||||||
|
int uid = 102;
|
||||||
|
// As checking whether app's locales exist in system locales, both app locales and system
|
||||||
|
// locales have to remove the u extension first when doing the comparison. The following
|
||||||
|
// three locales are all in the system locale after removing the u extension so it's
|
||||||
|
// unnecessary to trigger a notification for the suggestion.
|
||||||
|
String locale1 = "en-CA";
|
||||||
|
String locale2 = "ar-JO-u-nu-latn";
|
||||||
|
String locale3 = "ar-JO";
|
||||||
|
|
||||||
|
LocaleList.setDefault(
|
||||||
|
LocaleList.forLanguageTags("en-CA-u-mu-fahrenhe,ar-JO-u-mu-fahrenhe-nu-latn"));
|
||||||
|
|
||||||
|
assertThat(mNotificationController.shouldTriggerNotification(uid, locale1)).isFalse();
|
||||||
|
assertThat(mNotificationController.shouldTriggerNotification(uid, locale2)).isFalse();
|
||||||
|
assertThat(mNotificationController.shouldTriggerNotification(uid, locale3)).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testShouldTriggerNotification_noNotification_returnFalse() throws Exception {
|
||||||
|
int uid = 100;
|
||||||
|
String locale = "en-US";
|
||||||
|
|
||||||
|
boolean triggered = mNotificationController.shouldTriggerNotification(uid, locale);
|
||||||
|
|
||||||
|
assertThat(triggered).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testShouldTriggerNotification_return1stTrue() throws Exception {
|
||||||
|
// Initialze proto with en-US locale. Its uid contains 100.
|
||||||
|
Set<Integer> uidSet = Set.of(100);
|
||||||
|
String locale = "en-US";
|
||||||
|
long lastNotificationTime = 0L;
|
||||||
|
int notificationId = 0;
|
||||||
|
initSharedPreference(locale, uidSet, 0, 1, lastNotificationTime, notificationId);
|
||||||
|
|
||||||
|
// When the second app is configured to "en-US", the notification is triggered.
|
||||||
|
int uid = 101;
|
||||||
|
boolean triggered = mNotificationController.shouldTriggerNotification(uid, locale);
|
||||||
|
|
||||||
|
assertThat(triggered).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testShouldTriggerNotification_returnFalse_dueToOddCount() throws Exception {
|
||||||
|
// Initialze proto with en-US locale. Its uid contains 100,101.
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101);
|
||||||
|
String locale = "en-US";
|
||||||
|
long lastNotificationTime = Calendar.getInstance().getTimeInMillis();
|
||||||
|
int id = (int) SystemClock.uptimeMillis();
|
||||||
|
initSharedPreference(locale, uidSet, 0, 1, lastNotificationTime, id);
|
||||||
|
|
||||||
|
// When the other app is configured to "en-US", the notification is not triggered because
|
||||||
|
// the app count is odd.
|
||||||
|
int uid = 102;
|
||||||
|
boolean triggered = mNotificationController.shouldTriggerNotification(uid, locale);
|
||||||
|
|
||||||
|
assertThat(triggered).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testShouldTriggerNotification_returnFalse_dueToFrequency() throws Exception {
|
||||||
|
// Initialze proto with en-US locale. Its uid contains 100,101,102.
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101, 102);
|
||||||
|
String locale = "en-US";
|
||||||
|
long lastNotificationTime = Calendar.getInstance().getTimeInMillis();
|
||||||
|
int id = (int) SystemClock.uptimeMillis();
|
||||||
|
initSharedPreference(locale, uidSet, 0, 1, lastNotificationTime, id);
|
||||||
|
|
||||||
|
// When the other app is configured to "en-US", the notification is not triggered because it
|
||||||
|
// is too frequent.
|
||||||
|
int uid = 103;
|
||||||
|
boolean triggered = mNotificationController.shouldTriggerNotification(uid, locale);
|
||||||
|
|
||||||
|
assertThat(triggered).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testShouldTriggerNotification_return2ndTrue() throws Exception {
|
||||||
|
// Initialze proto with en-US locale. Its uid contains 100,101,102,103,104.
|
||||||
|
Set<Integer> uidSet = Set.of(100, 101, 102, 103, 104);
|
||||||
|
String locale = "en-US";
|
||||||
|
int id = (int) SystemClock.uptimeMillis();
|
||||||
|
Calendar time = Calendar.getInstance();
|
||||||
|
time.add(Calendar.MINUTE, 86400 * 8 * (-1));
|
||||||
|
long lastNotificationTime = time.getTimeInMillis();
|
||||||
|
initSharedPreference(locale, uidSet, 0, 1, lastNotificationTime, id);
|
||||||
|
|
||||||
|
// When the other app is configured to "en-US", the notification is triggered.
|
||||||
|
int uid = 105;
|
||||||
|
boolean triggered = mNotificationController.shouldTriggerNotification(uid, locale);
|
||||||
|
|
||||||
|
assertThat(triggered).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initSharedPreference(String locale, Set<Integer> uidCollection, int dismissCount,
|
||||||
|
int notificationCount, long lastNotificationTime, int notificationId)
|
||||||
|
throws Exception {
|
||||||
|
NotificationInfo info = new NotificationInfo(uidCollection, notificationCount, dismissCount,
|
||||||
|
lastNotificationTime, notificationId);
|
||||||
|
mDataManager.putNotificationInfo(locale, info);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user