Merge "Add developer options to force enable Notes role." into udc-dev (b79772ac) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -11904,6 +11904,12 @@
		<!-- Developer settings: Summary for disabling phantom process monitoring. [CHAR LIMIT=NONE]-->
		<string name="disable_phantom_process_monitor_summary">Disable restrictions on the system resource usage of the app child processes</string>

		<!-- Developer settings: Title for force enabling Notes role. [CHAR LIMIT=50]-->
		<string name="enable_notes_role_title">Force enable Notes role</string>
		<!-- Developer settings: Summary for disabling phantom process monitoring. [CHAR LIMIT=NONE]-->
		<string name="enable_notes_role_summary">Enable note-taking system integrations via the Notes role. If the Notes role is already enabled, does nothing.</string>


		<!-- BT LE Audio Device: Media Broadcast -->
		<!-- The title of the Media Broadcast Dialog [CHAR LIMIT=none] -->
		<string name="bluetooth_broadcast_dialog_title">Broadcast</string>

res/xml/development_settings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -713,6 +713,11 @@
		android:title="@string/disable_phantom_process_monitor_title"
		android:summary="@string/disable_phantom_process_monitor_summary" />

		<SwitchPreference
		android:key="force_enable_notes_role"
		android:title="@string/enable_notes_role_title"
		android:summary="@string/enable_notes_role_summary" />

		</PreferenceCategory>

		<PreferenceCategory

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -733,6 +733,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new PhantomProcessPreferenceController(context));
		controllers.add(new ContrastPreferenceController(
		context, context.getSystemService(UiModeManager.class)));
		controllers.add(new ForceEnableNotesRolePreferenceController(context));

		return controllers;
		}

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

0 → 100644

+103 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/
		/*
		* 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.development;

		import static android.os.UserHandle.USER_CURRENT;

		import android.content.Context;
		import android.content.om.IOverlayManager;
		import android.os.RemoteException;
		import android.os.ServiceManager;

		import androidx.preference.Preference;
		import androidx.preference.SwitchPreference;

		import com.android.internal.R;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

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

		private static final String NOTES_ROLE_ENABLED_KEY =
		"force_enable_notes_role";

		private static final String OVERLAY_PACKAGE_NAME =
		"com.android.role.notes.enabled";

		private final IOverlayManager mOverlayManager;

		public ForceEnableNotesRolePreferenceController(Context context) {
		super(context);
		mOverlayManager = IOverlayManager.Stub.asInterface(
		ServiceManager.getService(Context.OVERLAY_SERVICE));
		}

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

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		setEnabled((boolean) newValue);
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		((SwitchPreference) mPreference).setChecked(isEnabled());
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		super.onDeveloperOptionsSwitchDisabled();
		((SwitchPreference) mPreference).setChecked(false);
		setEnabled(false);
		}

		@VisibleForTesting
		protected boolean isEnabled() {
		return mContext.getResources().getBoolean(R.bool.config_enableDefaultNotes);
		}

		@VisibleForTesting
		protected void setEnabled(boolean enabled) {
		try {
		mOverlayManager.setEnabled(OVERLAY_PACKAGE_NAME, enabled, USER_CURRENT);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

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

0 → 100644

+102 −0

Original line number	Diff line number	Diff line
		/*
		* 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.development;

		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

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

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

		private ForceEnableNotesRolePreferenceController mController;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mController = new ForceEnableNotesRolePreferenceController(
		RuntimeEnvironment.application) {
		private boolean mEnabled;

		protected boolean isEnabled() {
		return mEnabled;
		}

		protected void setEnabled(boolean enabled) {
		mEnabled = enabled;
		}
		};
		when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
		mController.displayPreference(mScreen);
		}

		@Test
		public void updateState_enabled_preferenceShouldBeChecked() {
		mController.setEnabled(true);
		mController.updateState(mPreference);

		verify(mPreference).setChecked(true);
		}

		@Test
		public void updateState_disabled_preferenceShouldBeUnchecked() {
		mController.setEnabled(false);
		mController.updateState(mPreference);

		verify(mPreference).setChecked(false);
		}

		@Test
		public void onPreferenceChange_checked_shouldBeEnabled() {
		mController.onPreferenceChange(mPreference, true);

		assertTrue(mController.isEnabled());
		}

		@Test
		public void onPreferenceChange_unchecked_shouldNotBeEnabled() {
		mController.onPreferenceChange(mPreference, false);

		assertFalse(mController.isEnabled());
		}

		@Test
		public void onDeveloperOptionsSwitchDisabled_preferenceShouldNotBeEnabled() {
		mController.onDeveloperOptionsSwitchDisabled();

		assertFalse(mController.isEnabled());
		verify(mPreference).setEnabled(false);
		verify(mPreference).setChecked(false);
		}
		}