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

Merge "Fix notificaiton not working in work profile" into main

Browse Source
This commit is contained in:
Allen Su
2023-10-03 02:11:34 +00:00
committed by Android (Google) Code Review
parent 226a244a25 7b31a7a612
commit 1c2440aab0
6 changed files with 171 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
View File

@@ -17,8 +17,9 @@
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 com.android.settings.localepicker.LocaleDialogFragment.DIALOG_ADD_SYSTEM_LOCALE;
import static com.android.settings.localepicker.LocaleListEditor.EXTRA_SYSTEM_LOCALE_DIALOG_TYPE;
import static com.android.settings.localepicker.LocaleListEditor.LOCALE_SUGGESTION;
import static com.google.common.truth.Truth.assertThat;
@@ -96,7 +97,6 @@ public class LocaleListEditorTest {
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;
@@ -151,7 +151,7 @@ public class LocaleListEditorTest {
mContext = spy(RuntimeEnvironment.application);
mLocaleListEditor = spy(new LocaleListEditor());
when(mLocaleListEditor.getContext()).thenReturn(mContext);
mActivity = Robolectric.buildActivity(FragmentActivity.class).get();
mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
when(mLocaleListEditor.getActivity()).thenReturn(mActivity);
when(mLocaleListEditor.getNotificationController()).thenReturn(
mNotificationController);
@@ -402,7 +402,7 @@ public class LocaleListEditorTest {
public void showDiallogForAddedLocale_invalidLocale_noDialog() {
Intent intent = new Intent("ACTION")
.putExtra(EXTRA_APP_LOCALE, "ab-CD") // invalid locale
.putExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE, "locale_suggestion");
.putExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE, LOCALE_SUGGESTION);
mActivity.setIntent(intent);
mLocaleListEditor.onViewStateRestored(null);
@@ -431,7 +431,7 @@ public class LocaleListEditorTest {
LocaleList.setDefault(LocaleList.forLanguageTags("en-US,ar-AE-u-nu-arab"));
Intent intent = new Intent("ACTION")
.putExtra(EXTRA_APP_LOCALE, "ar-AE")
.putExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE, "locale_suggestion");
.putExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE, LOCALE_SUGGESTION);
mActivity.setIntent(intent);
mLocaleListEditor.onViewStateRestored(null);
@@ -441,18 +441,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_NOTIFICATION_ID, notificationId);
.putExtra(EXTRA_SYSTEM_LOCALE_DIALOG_TYPE, LOCALE_SUGGESTION);
mActivity.setIntent(intent);
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(mNotificationController.getNotificationId("ja-JP")).thenReturn(notificationId);
when(mLocaleListEditor.getSupportedLocales()).thenReturn(supportedLocales);
when(mContext.getPackageName()).thenReturn("com.android.settings");
when(mActivity.getCallingPackage()).thenReturn("com.android.settings");
}
@Test

75
tests/robotests/src/com/android/settings/localepicker/NotificationActionActivityTest.java Normal file
View File

@@ -0,0 +1,75 @@
/*
* 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 android.content.Intent;
import androidx.activity.result.ActivityResultLauncher;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.android.controller.ActivityController;
@RunWith(RobolectricTestRunner.class)
public class NotificationActionActivityTest {
private NotificationActionActivity mNotificationActivity;
private ActivityController<NotificationActionActivity> mActivityController;
@Mock
private NotificationController mNotificationController;
@Mock
private ActivityResultLauncher<Intent> mLauncher;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
}
@Test
public void testOnCreate_launchSystemLanguageSettings() throws Exception {
String targetLocale = "ja-JP";
int notificationId = 123;
Intent intent = new Intent()
.putExtra(EXTRA_APP_LOCALE, targetLocale)
.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
mActivityController = Robolectric.buildActivity(NotificationActionActivity.class, intent);
mNotificationActivity = spy(mActivityController.get());
doReturn(mNotificationController).when(mNotificationActivity).getNotificationController(
any());
doReturn(notificationId).when(mNotificationController).getNotificationId(eq(targetLocale));
doReturn(mLauncher).when(mNotificationActivity).getLauncher();
mNotificationActivity.onCreate(null);
verify(mLauncher).launch(any(Intent.class));
verify(mNotificationActivity).finish();
}
}