From 39c6a16abaad2e4daf1ccf6bbcf3a243a3fd2ab5 Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Wed, 19 Jun 2019 16:21:20 +0800 Subject: [PATCH 1/3] Cannot switch between multiple TTS engines That is caused by layout xml changes. The radio button was clickable in old xml resource. But it is not clickable in new xml resource. Therefore we can't receive click callback. Fixed by changing Radio button state when preference is clicked. Fixes: 135285101 Test: manual, make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.tts" Change-Id: Idd7bf37d9ccbc1b56d41978d19dc05c8a81cc49a --- .../settings/tts/TtsEnginePreference.java | 9 ++ .../settings/tts/TtsEnginePreferenceTest.java | 98 +++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceTest.java diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java index 6ea414dd4b7..8f15db266e2 100644 --- a/src/com/android/settings/tts/TtsEnginePreference.java +++ b/src/com/android/settings/tts/TtsEnginePreference.java @@ -30,6 +30,8 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; +import androidx.annotation.VisibleForTesting; + public class TtsEnginePreference extends Preference { @@ -45,6 +47,7 @@ public class TtsEnginePreference extends Preference { * The shared radio button state, which button is checked etc. */ private final RadioButtonGroupState mSharedState; + private RadioButton mRadioButton; /** * When true, the change callbacks on the radio button will not @@ -95,6 +98,12 @@ public class TtsEnginePreference extends Preference { mPreventRadioButtonCallbacks = true; rb.setChecked(isChecked); mPreventRadioButtonCallbacks = false; + mRadioButton = rb; + } + + @Override + public void onClick() { + mRadioButton.setChecked(true); } private boolean shouldDisplayDataAlert() { diff --git a/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceTest.java b/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceTest.java new file mode 100644 index 00000000000..5cd948824a9 --- /dev/null +++ b/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceTest.java @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2019 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.tts; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; +import android.speech.tts.TextToSpeech; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Checkable; + +import androidx.preference.PreferenceViewHolder; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class TtsEnginePreferenceTest { + + private static final String KEY = "test_key"; + + private TtsEnginePreference mPreference; + private Context mContext; + private PreferenceViewHolder mViewHolder; + private View mRootView; + private FakeRadioButtonGroupState mState; + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application; + + final TextToSpeech.EngineInfo info = new TextToSpeech.EngineInfo(); + info.system = true; + mState = new FakeRadioButtonGroupState(); + mPreference = new TtsEnginePreference(mContext, info, mState); + mPreference.setKey(KEY); + + // Create preference view holder + final LayoutInflater inflater = LayoutInflater.from(mContext); + mRootView = View.inflate(mContext, mPreference.getLayoutResource(), null /* parent */); + final ViewGroup widgetFrame = mRootView.findViewById(android.R.id.widget_frame); + inflater.inflate(mPreference.getWidgetLayoutResource(), widgetFrame); + mViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView); + } + + @Test + public void onClick_shouldInvokeOnCheckedChangeListener() { + mPreference.onBindViewHolder(mViewHolder); + + mPreference.onClick(); + + assertThat(mState.getCurrentKey()).isEqualTo(mPreference.getKey()); + } + + public static class FakeRadioButtonGroupState implements + TtsEnginePreference.RadioButtonGroupState { + + private String mKey; + + @Override + public Checkable getCurrentChecked() { + return null; + } + + @Override + public String getCurrentKey() { + return mKey; + } + + @Override + public void setCurrentChecked(Checkable current) { + } + + @Override + public void setCurrentKey(String key) { + mKey = key; + } + } +} From 242ff568d10b4816576fd1c1cf909649754ff06f Mon Sep 17 00:00:00 2001 From: Ivan Podogov Date: Thu, 20 Jun 2019 16:01:29 +0100 Subject: [PATCH 2/3] Fix Settings crash when trying to show work policy info This fixes an exception in startActivity() call: "android.util.AndroidRuntimeException: Calling startActivity() from outside of an Activity context requires the FLAG_ACTIVITY_NEW_TASK flag. Is this really what you want?" Bug: 132904820 Test: manual Change-Id: I0c687ea76068778554b072b6cc8274352de6fa28 --- .../enterprise/EnterprisePrivacyFeatureProviderImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java index d095d880385..675795e7549 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java @@ -279,7 +279,8 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe // Only search for the required action in the Device Owner's package final Intent intent = new Intent(mResources.getString(R.string.config_work_policy_info_intent_action)) - .setPackage(ownerComponent.getPackageName()); + .setPackage(ownerComponent.getPackageName()) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); final List activities = mPm.queryIntentActivities(intent, 0); if (activities.size() != 0) { return intent; @@ -302,7 +303,8 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe // Only search for the required action in the Profile Owner's package final Intent intent = new Intent(mResources.getString(R.string.config_work_policy_info_intent_action)) - .setPackage(ownerComponent.getPackageName()); + .setPackage(ownerComponent.getPackageName()) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); final List activities = mPm.queryIntentActivitiesAsUser(intent, 0, userId); if (activities.size() != 0) { return intent; From ab63fd3c25f8cdc6510bb815a9e6e33ff06ec132 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Thu, 20 Jun 2019 08:51:11 -0400 Subject: [PATCH 3/3] Remove dead code Test: try to search 'gentle' Fixes: 135640138 Change-Id: If03703e59f77206da08fc80e88bb986f821c18fe --- res/xml/gentle_notification_settings.xml | 57 --------- .../GentleDrawablePreferenceController.java | 81 ------------ .../GentleNotificationSettings.java | 74 ----------- .../SilentLockscreenPreferenceController.java | 70 ----------- .../SilentStatusBarPreferenceController.java | 77 ------------ ...entleDrawablePreferenceControllerTest.java | 113 ----------------- ...entLockscreenPreferenceControllerTest.java | 117 ----------------- ...lentStatusBarPreferenceControllerTest.java | 118 ------------------ 8 files changed, 707 deletions(-) delete mode 100644 res/xml/gentle_notification_settings.xml delete mode 100644 src/com/android/settings/notification/GentleDrawablePreferenceController.java delete mode 100644 src/com/android/settings/notification/GentleNotificationSettings.java delete mode 100644 src/com/android/settings/notification/SilentLockscreenPreferenceController.java delete mode 100644 src/com/android/settings/notification/SilentStatusBarPreferenceController.java delete mode 100644 tests/robotests/src/com/android/settings/notification/GentleDrawablePreferenceControllerTest.java delete mode 100644 tests/robotests/src/com/android/settings/notification/SilentLockscreenPreferenceControllerTest.java delete mode 100644 tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java diff --git a/res/xml/gentle_notification_settings.xml b/res/xml/gentle_notification_settings.xml deleted file mode 100644 index 56c3c406494..00000000000 --- a/res/xml/gentle_notification_settings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/com/android/settings/notification/GentleDrawablePreferenceController.java b/src/com/android/settings/notification/GentleDrawablePreferenceController.java deleted file mode 100644 index b4e18db27d3..00000000000 --- a/src/com/android/settings/notification/GentleDrawablePreferenceController.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2019 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.notification; - -import android.content.Context; -import android.provider.Settings; -import android.widget.ImageView; - -import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; -import com.android.settingslib.widget.LayoutPreference; - -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - -public class GentleDrawablePreferenceController extends BasePreferenceController { - - @VisibleForTesting - static final int ON = 1; - - private NotificationBackend mBackend; - - public GentleDrawablePreferenceController(Context context, String preferenceKey) { - super(context, preferenceKey); - mBackend = new NotificationBackend(); - } - - @VisibleForTesting - void setBackend(NotificationBackend backend) { - mBackend = backend; - } - - @Override - public void updateState(Preference preference) { - LayoutPreference pref = (LayoutPreference) preference; - boolean showOnLockscreen = showOnLockscreen(); - boolean showOnStatusBar = showOnStatusBar(); - - ImageView view = pref.findViewById(R.id.drawable); - - if (showOnLockscreen) { - if (showOnStatusBar) { - view.setImageResource(R.drawable.gentle_notifications_shade_status_lock); - } else { - view.setImageResource(R.drawable.gentle_notifications_shade_lock); - } - } else if (showOnStatusBar) { - view.setImageResource(R.drawable.gentle_notifications_shade_status); - } else { - view.setImageResource(R.drawable.gentle_notifications_shade); - } - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; - } - - private boolean showOnLockscreen() { - return Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, ON) == ON; - } - - private boolean showOnStatusBar() { - return !mBackend.shouldHideSilentStatusBarIcons(mContext); - } -} diff --git a/src/com/android/settings/notification/GentleNotificationSettings.java b/src/com/android/settings/notification/GentleNotificationSettings.java deleted file mode 100644 index 5de6ab787a3..00000000000 --- a/src/com/android/settings/notification/GentleNotificationSettings.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2019 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.notification; - -import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; - -import com.android.settings.R; -import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -import java.util.Arrays; -import java.util.List; - -@SearchIndexable -public class GentleNotificationSettings extends DashboardFragment { - private static final String TAG = "GentleNotiSettings"; - - @Override - public int getMetricsCategory() { - return SettingsEnums.GENTLE_NOTIFICATIONS_SCREEN; - } - - @Override - protected String getLogTag() { - return TAG; - } - - @Override - protected int getPreferenceScreenResId() { - return R.xml.gentle_notification_settings; - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - - use(SilentStatusBarPreferenceController.class).setListener( - shown -> updatePreferenceStates()); - - use(SilentLockscreenPreferenceController.class).setListener( - shown -> updatePreferenceStates()); - } - - /** - * For Search. - */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.gentle_notification_settings; - return Arrays.asList(sir); - } - }; -} diff --git a/src/com/android/settings/notification/SilentLockscreenPreferenceController.java b/src/com/android/settings/notification/SilentLockscreenPreferenceController.java deleted file mode 100644 index 317f7da6e33..00000000000 --- a/src/com/android/settings/notification/SilentLockscreenPreferenceController.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2019 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.notification; - -import static android.provider.Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL; - -import android.content.Context; -import android.os.UserHandle; -import android.provider.Settings; - -import com.android.settings.core.TogglePreferenceController; - -import com.google.common.annotations.VisibleForTesting; - -public class SilentLockscreenPreferenceController extends TogglePreferenceController { - - private static final String KEY = "lock_screen"; - private Listener mListener; - - public SilentLockscreenPreferenceController(Context context) { - super(context, KEY); - } - - @Override - public boolean isChecked() { - return Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1) == 1; - } - - @Override - public boolean setChecked(boolean isChecked) { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, isChecked ? 1 : 0); - if (mListener != null) { - mListener.onChange(isChecked); - } - return true; - } - - @Override - public int getAvailabilityStatus() { - return Settings.Secure.getInt( - mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 1) != 0 - ? AVAILABLE : UNSUPPORTED_ON_DEVICE; - } - - public void setListener(Listener listener) { - mListener = listener; - } - - interface Listener { - void onChange(boolean shown); - } -} - - diff --git a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java b/src/com/android/settings/notification/SilentStatusBarPreferenceController.java deleted file mode 100644 index e561508014e..00000000000 --- a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2019 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.notification; - -import static android.provider.Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL; - -import android.content.Context; -import android.os.UserHandle; -import android.provider.Settings; - -import com.android.settings.core.TogglePreferenceController; - -import com.google.common.annotations.VisibleForTesting; - -public class SilentStatusBarPreferenceController extends TogglePreferenceController { - - private static final String KEY = "silent_icons"; - private static final int MY_USER_ID = UserHandle.myUserId(); - private NotificationBackend mBackend; - private Listener mListener; - - public SilentStatusBarPreferenceController(Context context) { - super(context, KEY); - mBackend = new NotificationBackend(); - } - - @VisibleForTesting - void setBackend(NotificationBackend backend) { - mBackend = backend; - } - - @Override - public boolean isChecked() { - return !mBackend.shouldHideSilentStatusBarIcons(mContext); - } - - @Override - public boolean setChecked(boolean isChecked) { - mBackend.setHideSilentStatusIcons(!isChecked); - if (mListener != null) { - mListener.onChange(isChecked); - } - return true; - } - - @Override - public int getAvailabilityStatus() { - return Settings.Secure.getInt( - mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 1) != 0 - ? AVAILABLE : UNSUPPORTED_ON_DEVICE; - } - - public void setListener(Listener listener) { - mListener = listener; - } - - interface Listener { - void onChange(boolean shown); - } - -} - - diff --git a/tests/robotests/src/com/android/settings/notification/GentleDrawablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/GentleDrawablePreferenceControllerTest.java deleted file mode 100644 index c8d1e018bea..00000000000 --- a/tests/robotests/src/com/android/settings/notification/GentleDrawablePreferenceControllerTest.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2019 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.notification; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.provider.Settings; -import android.widget.ImageView; - -import com.android.settings.R; -import com.android.settingslib.widget.LayoutPreference; - -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; - -import androidx.preference.Preference; - -@RunWith(RobolectricTestRunner.class) -public class GentleDrawablePreferenceControllerTest { - - private Context mContext; - - private GentleDrawablePreferenceController mController; - @Mock - private LayoutPreference mPreference; - @Mock - NotificationBackend mBackend; - @Mock - ImageView mView; - - private static final String KEY = "gentle_notifications"; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = RuntimeEnvironment.application; - mController = new GentleDrawablePreferenceController(mContext, KEY); - mController.setBackend(mBackend); - when(mPreference.findViewById(R.id.drawable)).thenReturn(mView); - } - - @Test - public void display_shouldDisplay() { - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void updateState_lock() { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1); - when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(true); - - mController.updateState(mPreference); - - verify(mView).setImageResource(R.drawable.gentle_notifications_shade_lock); - } - - @Test - public void updateState_status() { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0); - when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(false); - - mController.updateState(mPreference); - - verify(mView).setImageResource(R.drawable.gentle_notifications_shade_status); - } - - @Test - public void updateState_both() { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1); - when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(false); - - mController.updateState(mPreference); - - verify(mView).setImageResource(R.drawable.gentle_notifications_shade_status_lock); - } - - @Test - public void updateState_neither() { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0); - when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(true); - - mController.updateState(mPreference); - - verify(mView).setImageResource(R.drawable.gentle_notifications_shade); - } -} diff --git a/tests/robotests/src/com/android/settings/notification/SilentLockscreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SilentLockscreenPreferenceControllerTest.java deleted file mode 100644 index dcfdea59a8a..00000000000 --- a/tests/robotests/src/com/android/settings/notification/SilentLockscreenPreferenceControllerTest.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (C) 2019 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.notification; - -import static android.provider.Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.provider.Settings; - -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; - -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - -@RunWith(RobolectricTestRunner.class) -public class SilentLockscreenPreferenceControllerTest { - - @Mock - private PreferenceScreen mScreen; - - private Context mContext; - private SilentLockscreenPreferenceController mController; - private Preference mPreference; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = RuntimeEnvironment.application; - mController = new SilentLockscreenPreferenceController(mContext); - mPreference = new Preference(mContext); - mPreference.setKey(mController.getPreferenceKey()); - when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); - } - - @Test - public void isAvailable_featureEnabled() { - Settings.Secure.putInt( - mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 1); - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void isAvailable_featureDisabled() { - Settings.Secure.putInt( - mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 0); - assertThat(mController.isAvailable()).isFalse(); - } - - @Test - public void isChecked_settingIsOff_false() { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0); - assertThat(mController.isChecked()).isFalse(); - } - - @Test - public void isChecked_settingIsOn_true() { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1); - assertThat(mController.isChecked()).isTrue(); - } - - @Test - public void onPreferenceChange_on() { - mController.onPreferenceChange(mPreference, true); - assertThat(Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0)).isEqualTo(1); - } - - @Test - public void onPreferenceChange_off() { - mController.onPreferenceChange(mPreference, false); - assertThat(Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1)).isEqualTo(0); - } - - @Test - public void listenerTriggered() { - SilentLockscreenPreferenceController.Listener listener = mock( - SilentLockscreenPreferenceController.Listener.class); - mController.setListener(listener); - - mController.setChecked(false); - verify(listener).onChange(false); - - mController.setChecked(true); - verify(listener).onChange(true); - } -} - diff --git a/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java deleted file mode 100644 index 55a85494e43..00000000000 --- a/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (C) 2019 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.notification; - -import static android.provider.Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.provider.Settings; - -import com.android.settings.testutils.FakeFeatureFactory; - -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; - -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - -@RunWith(RobolectricTestRunner.class) -public class SilentStatusBarPreferenceControllerTest { - - @Mock - private NotificationBackend mBackend; - @Mock - private PreferenceScreen mScreen; - - private Context mContext; - private SilentStatusBarPreferenceController mController; - private Preference mPreference; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = RuntimeEnvironment.application; - mController = new SilentStatusBarPreferenceController(mContext); - mController.setBackend(mBackend); - mPreference = new Preference(mContext); - mPreference.setKey(mController.getPreferenceKey()); - when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); - } - - @Test - public void isAvailable_featureEnabled() { - Settings.Secure.putInt( - mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 1); - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void isAvailable_featureDisabled() { - Settings.Secure.putInt( - mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 0); - assertThat(mController.isAvailable()).isFalse(); - } - - @Test - public void isChecked_settingIsOff_false() { - when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(true); - assertThat(mController.isChecked()).isFalse(); - } - - @Test - public void isChecked_settingIsOn_true() { - when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(false); - assertThat(mController.isChecked()).isTrue(); - } - - @Test - public void onPreferenceChange_on() { - mController.onPreferenceChange(mPreference, true); - verify(mBackend).setHideSilentStatusIcons(false); - } - - @Test - public void onPreferenceChange_off() { - mController.onPreferenceChange(mPreference, false); - verify(mBackend).setHideSilentStatusIcons(true); - } - - @Test - public void listenerTriggered() { - SilentStatusBarPreferenceController.Listener listener = mock( - SilentStatusBarPreferenceController.Listener.class); - mController.setListener(listener); - - mController.setChecked(false); - verify(listener).onChange(false); - - mController.setChecked(true); - verify(listener).onChange(true); - } -} -