Merge "Remove MEDIA_CONTROLS_RECOMMENDATION setting toggle" into main (7ce118d6) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -13127,10 +13127,6 @@
		<string name="media_controls_lockscreen_title">Show media on lock screen</string>
		<!-- Description of toggle to enable or disable the media resumption on lockscreen [CHAR LIMIT=NONE]-->
		<string name="media_controls_lockscreen_description">To quickly resume playback, media player stays open on lock screen</string>
		<!-- Title of toggle to enable or disable media recommendations in quick settings [CHAR LIMIT=NONE] -->
		<string name="media_controls_recommendations_title">Show Assistant media recommendations</string>
		<!-- Description of toggle to enable or disable media recommendations based on user's activity [CHAR LIMIT=NONE] -->
		<string name="media_controls_recommendations_description">Based on your activity</string>
		<!-- Subtext for media settings when the player will be hidden [CHAR LIMIT=50] -->
		<string name="media_controls_hide_player">Hide player</string>
		<!-- Subtext for media settings when the player will be shown [CHAR LIMIT=50] -->

res/xml/media_controls_settings.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -33,10 +33,4 @@
		android:summary="@string/media_controls_lockscreen_description"
		app:controller="com.android.settings.sound.MediaControlsLockScreenPreferenceController" />

		<SwitchPreferenceCompat
		android:key="media_controls_recommendations"
		android:title="@string/media_controls_recommendations_title"
		android:summary="@string/media_controls_recommendations_description"
		app:controller="com.android.settings.sound.MediaControlsRecommendationController" />

		</PreferenceScreen>

src/com/android/settings/sound/MediaControlsRecommendationController.java

deleted100644 → 0

+0 −59

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

		import static android.provider.Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION;

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

		import com.android.settings.R;
		import com.android.settings.core.TogglePreferenceController;

		/**
		* Toggle for media controls recommendation setting
		*/
		public class MediaControlsRecommendationController extends TogglePreferenceController {

		public MediaControlsRecommendationController(Context context, String key) {
		super(context, key);
		}

		@Override
		public boolean isChecked() {
		int val = Settings.Secure.getInt(mContext.getContentResolver(),
		MEDIA_CONTROLS_RECOMMENDATION, 1);
		return val == 1;
		}

		@Override
		public boolean setChecked(boolean isChecked) {
		int val = isChecked ? 1 : 0;
		return Settings.Secure.putInt(mContext.getContentResolver(),
		MEDIA_CONTROLS_RECOMMENDATION, val);
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		}

		@Override
		public int getSliceHighlightMenuRes() {
		return R.string.menu_key_sound;
		}
		}

tests/unit/src/com/android/settings/sound/MediaControlsRecommendationControllerTest.java

deleted100644 → 0

+0 −90

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.sound;

		import static com.android.settings.core.BasePreferenceController.AVAILABLE;

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

		import static org.mockito.Mockito.spy;

		import android.content.ContentResolver;
		import android.content.Context;
		import android.provider.Settings;

		import androidx.test.core.app.ApplicationProvider;
		import androidx.test.ext.junit.runners.AndroidJUnit4;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@RunWith(AndroidJUnit4.class)
		public class MediaControlsRecommendationControllerTest {

		private static final String KEY = "media_controls_recommendations";

		private Context mContext;
		private int mOriginalRecommendation;
		private ContentResolver mContentResolver;
		private MediaControlsRecommendationController mController;

		@Before
		public void setUp() {
		mContext = spy(ApplicationProvider.getApplicationContext());
		mContentResolver = mContext.getContentResolver();
		mOriginalRecommendation = Settings.Secure.getInt(mContentResolver,
		Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, 1);
		mController = new MediaControlsRecommendationController(mContext, KEY);
		}

		@After
		public void tearDown() {
		Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION,
		mOriginalRecommendation);
		}

		@Test
		public void getAvailability_returnAvailable() {
		assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
		}

		@Test
		public void setChecked_enable_shouldTurnOn() {
		Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, 1);

		assertThat(mController.isChecked()).isTrue();

		mController.setChecked(false);

		assertThat(Settings.Secure.getInt(mContentResolver,
		Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, -1)).isEqualTo(0);
		}

		@Test
		public void setChecked_disable_shouldTurnOff() {
		Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, 0);

		assertThat(mController.isChecked()).isFalse();

		mController.setChecked(true);

		assertThat(Settings.Secure.getInt(mContentResolver,
		Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, -1)).isEqualTo(1);
		}
		}