Merge "Add a developer setting for conversation enforcement" into rvc-dev am:... (d9beeb5b) · Commits · e / os / android_packages_apps_Settings

res/xml/development_settings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -577,6 +577,11 @@
		android:title="@string/show_notification_channel_warnings"
		android:summary="@string/show_notification_channel_warnings_summary" />

		<SwitchPreference
		android:key="enforce_shortcuts_for_conversations"
		android:title="@string/enforce_shortcuts_for_conversations"
		android:summary="@string/enforce_shortcuts_for_conversations_summary" />

		<SwitchPreference
		android:key="asst_capability_prioritizer"
		android:title="@string/asst_capability_prioritizer_title"

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -501,6 +501,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new ShowFirstCrashDialogPreferenceController(context));
		controllers.add(new AppsNotRespondingPreferenceController(context));
		controllers.add(new NotificationChannelWarningsPreferenceController(context));
		controllers.add(new EnforceConversationShortcutsPreferenceController(context));
		controllers.add(new AllowAppsOnExternalPreferenceController(context));
		controllers.add(new ResizableActivityPreferenceController(context));
		controllers.add(new FreeformWindowsPreferenceController(context));

src/com/android/settings/development/EnforceConversationShortcutsPreferenceController.java

0 → 100644

+68 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.development;

		import android.content.Context;
		import android.os.Build;
		import android.provider.Settings;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.SwitchPreference;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		public class EnforceConversationShortcutsPreferenceController extends
		DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
		PreferenceControllerMixin {

		private static final String KEY =
		"enforce_shortcuts_for_conversations";

		@VisibleForTesting
		final static int SETTING_VALUE_ON = 1;
		@VisibleForTesting
		final static int SETTING_VALUE_OFF = 0;

		final static int DEFAULT_VALUE = SETTING_VALUE_OFF;

		public EnforceConversationShortcutsPreferenceController(Context context) {
		super(context);
		}

		@Override
		public String getPreferenceKey() {
		return KEY;
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isEnabled = (Boolean) newValue;
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.REQUIRE_SHORTCUTS_FOR_CONVERSATIONS,
		isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		final int mode = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.REQUIRE_SHORTCUTS_FOR_CONVERSATIONS, DEFAULT_VALUE);
		((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
		}
		}

tests/robotests/src/com/android/settings/development/EnforceConversationShortcutsPreferenceControllerTest.java

0 → 100644

+103 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.development;

		import static com.android.settings.development.EnforceConversationShortcutsPreferenceController.SETTING_VALUE_OFF;
		import static com.android.settings.development.EnforceConversationShortcutsPreferenceController.SETTING_VALUE_ON;

		import static com.google.common.truth.Truth.assertThat;

		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.provider.Settings;

		import androidx.preference.PreferenceScreen;
		import androidx.preference.SwitchPreference;

		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 EnforceConversationShortcutsPreferenceControllerTest {

		@Mock
		private SwitchPreference mPreference;
		@Mock
		private PreferenceScreen mScreen;

		private Context mContext;
		private EnforceConversationShortcutsPreferenceController mController;

		@Before
		public void setup() {
		MockitoAnnotations.initMocks(this);
		mContext = RuntimeEnvironment.application;
		mController = new EnforceConversationShortcutsPreferenceController(mContext);
		when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
		mController.displayPreference(mScreen);
		}

		@Test
		public void onPreferenceChange_settingEnabled() {
		mController.onPreferenceChange(mPreference, true /* new value */);

		final int mode = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.REQUIRE_SHORTCUTS_FOR_CONVERSATIONS, -1 /* default */);

		assertThat(mode).isEqualTo(SETTING_VALUE_ON);
		}

		@Test
		public void onPreferenceChange_settingDisabled() {
		mController.onPreferenceChange(mPreference, false /* new value */);

		final int mode = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.REQUIRE_SHORTCUTS_FOR_CONVERSATIONS, -1 /* default */);

		assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
		}

		@Test
		public void updateState_settingEnabled_preferenceShouldBeChecked() {
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.REQUIRE_SHORTCUTS_FOR_CONVERSATIONS,
		SETTING_VALUE_ON);

		mController.updateState(mPreference);

		verify(mPreference).setChecked(true);
		}

		@Test
		public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.REQUIRE_SHORTCUTS_FOR_CONVERSATIONS, SETTING_VALUE_OFF);

		mController.updateState(mPreference);

		verify(mPreference).setChecked(false);
		}
		}