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:
@@ -32,11 +32,14 @@ import android.content.Intent;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.InstallSourceInfo;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.content.res.Resources;
|
||||
import android.net.Uri;
|
||||
import android.os.LocaleList;
|
||||
import android.os.Process;
|
||||
import android.os.SystemClock;
|
||||
import android.os.SystemProperties;
|
||||
import android.os.UserHandle;
|
||||
import android.telephony.TelephonyManager;
|
||||
|
||||
@@ -67,8 +70,10 @@ import org.robolectric.shadows.ShadowTelephonyManager;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(
|
||||
@@ -79,6 +84,12 @@ import java.util.Locale;
|
||||
public class AppLocalePickerActivityTest {
|
||||
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 String EN_CA = "en-CA";
|
||||
private static final String EN_US = "en-US";
|
||||
private static int sUid;
|
||||
|
||||
private LocaleNotificationDataManager mDataManager;
|
||||
private AppLocalePickerActivity mActivity;
|
||||
|
||||
@Mock
|
||||
LocaleStore.LocaleInfo mLocaleInfo;
|
||||
@@ -99,10 +110,11 @@ public class AppLocalePickerActivityTest {
|
||||
when(mLocaleConfig.getStatus()).thenReturn(LocaleConfig.STATUS_SUCCESS);
|
||||
when(mLocaleConfig.getSupportedLocales()).thenReturn(LocaleList.forLanguageTags("en-US"));
|
||||
ReflectionHelpers.setStaticField(AppLocaleUtil.class, "sLocaleConfig", mLocaleConfig);
|
||||
sUid = Process.myUid();
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
public void tearDown() throws Exception {
|
||||
mPackageManager.removePackage(TEST_PACKAGE_NAME);
|
||||
ReflectionHelpers.setStaticField(AppLocaleUtil.class, "sLocaleConfig", null);
|
||||
ShadowResources.setDisAllowPackage(false);
|
||||
@@ -210,13 +222,266 @@ public class AppLocalePickerActivityTest {
|
||||
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(
|
||||
boolean hasPackageName) {
|
||||
Intent data = new Intent();
|
||||
if (hasPackageName) {
|
||||
data.setData(TEST_PACKAGE_URI);
|
||||
}
|
||||
data.putExtra(AppInfoBase.ARG_PACKAGE_UID, Process.myUid());
|
||||
data.putExtra(AppInfoBase.ARG_PACKAGE_UID, sUid);
|
||||
ActivityController<TestAppLocalePickerActivity> activityController =
|
||||
Robolectric.buildActivity(TestAppLocalePickerActivity.class, data);
|
||||
Activity activity = activityController.get();
|
||||
@@ -259,6 +524,19 @@ public class AppLocalePickerActivityTest {
|
||||
private static void setNoLaunchEntry(boolean 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)
|
||||
|
@@ -17,7 +17,8 @@
|
||||
package com.android.settings.localepicker;
|
||||
|
||||
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;
|
||||
|
||||
@@ -29,7 +30,6 @@ import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.robolectric.Shadows.shadowOf;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.IActivityManager;
|
||||
@@ -44,7 +44,6 @@ import android.view.LayoutInflater;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.FrameLayout;
|
||||
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 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_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 REQUEST_CONFIRM_SYSTEM_DEFAULT = 1;
|
||||
|
||||
@@ -132,6 +133,8 @@ public class LocaleListEditorTest {
|
||||
private TextView mCurrentDefault;
|
||||
@Mock
|
||||
private ImageView mDragHandle;
|
||||
@Mock
|
||||
private NotificationController mNotificationController;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
@@ -141,6 +144,8 @@ public class LocaleListEditorTest {
|
||||
when(mLocaleListEditor.getContext()).thenReturn(mContext);
|
||||
mActivity = Robolectric.buildActivity(FragmentActivity.class).get();
|
||||
when(mLocaleListEditor.getActivity()).thenReturn(mActivity);
|
||||
when(mLocaleListEditor.getNotificationController()).thenReturn(
|
||||
mNotificationController);
|
||||
ReflectionHelpers.setField(mLocaleListEditor, "mEmptyTextView",
|
||||
new TextView(RuntimeEnvironment.application));
|
||||
ReflectionHelpers.setField(mLocaleListEditor, "mRestrictionsManager",
|
||||
@@ -345,24 +350,21 @@ public class LocaleListEditorTest {
|
||||
initIntentAndResourceForLocaleDialog();
|
||||
mLocaleListEditor.onViewStateRestored(null);
|
||||
|
||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
assertThat(dialog).isNotNull();
|
||||
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.");
|
||||
verify(mFragmentTransaction).add(any(LocaleDialogFragment.class),
|
||||
eq(TAG_DIALOG_ADD_SYSTEM_LOCALE));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void showDiallogForAddedLocale_clickAdd() {
|
||||
initIntentAndResourceForLocaleDialog();
|
||||
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));
|
||||
}
|
||||
|
||||
@@ -370,11 +372,14 @@ public class LocaleListEditorTest {
|
||||
public void showDiallogForAddedLocale_clickCancel() {
|
||||
initIntentAndResourceForLocaleDialog();
|
||||
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));
|
||||
}
|
||||
|
||||
@@ -419,25 +424,17 @@ public class LocaleListEditorTest {
|
||||
}
|
||||
|
||||
private void initIntentAndResourceForLocaleDialog() {
|
||||
int notificationId = 1000;
|
||||
Intent intent = new Intent("ACTION")
|
||||
.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);
|
||||
shadowOf(mActivity).setCallingPackage("com.a.b");
|
||||
String[] allowedPackage = new String[]{"com.a.b", "com.b.c"};
|
||||
String[] supportedLocales = new String[]{"en-US", "ja-JP"};
|
||||
View contentView = LayoutInflater.from(mActivity).inflate(R.layout.locale_dialog, null);
|
||||
doReturn(contentView).when(mLocaleListEditor).getLocaleDialogView();
|
||||
when(mContext.getResources()).thenReturn(mResources);
|
||||
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(mNotificationController.getNotificationId("ja-JP")).thenReturn(notificationId);
|
||||
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