Add media on lock screen setting
Add a new setting that controls whether media on lock screen is enabled, disregarding the notifications status. The new setting is available under media and privacy settings. Bug: 229915240 Test: atest MediaControlsLockScreenPreferenceControllerTest Change-Id: I054f36efd635dc0535551d3058f9faf92196349d
This commit is contained in:
@@ -13608,6 +13608,10 @@
|
|||||||
<string name="media_controls_resume_title">Pin media player</string>
|
<string name="media_controls_resume_title">Pin media player</string>
|
||||||
<!-- Description of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=NONE]-->
|
<!-- Description of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=NONE]-->
|
||||||
<string name="media_controls_resume_description">To quickly resume playback, media player stays open in Quick Settings</string>
|
<string name="media_controls_resume_description">To quickly resume playback, media player stays open in Quick Settings</string>
|
||||||
|
<!-- Title of toggle to enable or disable the media resumption on lockscreen [CHAR LIMIT=NONE]-->
|
||||||
|
<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] -->
|
<!-- Title of toggle to enable or disable media recommendations in quick settings [CHAR LIMIT=NONE] -->
|
||||||
<string name="media_controls_recommendations_title">Show media recommendations</string>
|
<string name="media_controls_recommendations_title">Show media recommendations</string>
|
||||||
<!-- Description of toggle to enable or disable media recommendations based on user's activity [CHAR LIMIT=NONE] -->
|
<!-- Description of toggle to enable or disable media recommendations based on user's activity [CHAR LIMIT=NONE] -->
|
||||||
|
@@ -27,6 +27,12 @@
|
|||||||
app:keywords="@string/keywords_media_controls"
|
app:keywords="@string/keywords_media_controls"
|
||||||
app:controller="com.android.settings.sound.MediaControlsPreferenceController" />
|
app:controller="com.android.settings.sound.MediaControlsPreferenceController" />
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="media_controls_lockscreen"
|
||||||
|
android:title="@string/media_controls_lockscreen_title"
|
||||||
|
android:summary="@string/media_controls_lockscreen_description"
|
||||||
|
app:controller="com.android.settings.sound.MediaControlsLockScreenPreferenceController" />
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="media_controls_recommendations"
|
android:key="media_controls_recommendations"
|
||||||
android:title="@string/media_controls_recommendations_title"
|
android:title="@string/media_controls_recommendations_title"
|
||||||
|
@@ -51,6 +51,14 @@
|
|||||||
android:summary="@string/summary_placeholder"
|
android:summary="@string/summary_placeholder"
|
||||||
settings:searchable="false"/>
|
settings:searchable="false"/>
|
||||||
|
|
||||||
|
<!-- Show media on lock screen -->
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="privacy_media_controls_lockscreen"
|
||||||
|
android:title="@string/media_controls_lockscreen_title"
|
||||||
|
android:summary="@string/media_controls_lockscreen_description"
|
||||||
|
settings:controller=
|
||||||
|
"com.android.settings.sound.MediaControlsLockScreenPreferenceController" />
|
||||||
|
|
||||||
<!-- Privacy Service -->
|
<!-- Privacy Service -->
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="privacy_services"
|
android:key="privacy_services"
|
||||||
|
@@ -89,6 +89,14 @@
|
|||||||
android:summary="@string/summary_placeholder"
|
android:summary="@string/summary_placeholder"
|
||||||
settings:searchable="false"/>
|
settings:searchable="false"/>
|
||||||
|
|
||||||
|
<!-- Show media on lock screen -->
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="privacy_media_controls_lockscreen"
|
||||||
|
android:title="@string/media_controls_lockscreen_title"
|
||||||
|
android:summary="@string/media_controls_lockscreen_description"
|
||||||
|
settings:controller=
|
||||||
|
"com.android.settings.sound.MediaControlsLockScreenPreferenceController" />
|
||||||
|
|
||||||
<!-- Privacy Service -->
|
<!-- Privacy Service -->
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="privacy_services"
|
android:key="privacy_services"
|
||||||
|
@@ -0,0 +1,58 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 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_LOCK_SCREEN;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.TogglePreferenceController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggle for media control resumption on lock screen.
|
||||||
|
*/
|
||||||
|
public class MediaControlsLockScreenPreferenceController extends TogglePreferenceController {
|
||||||
|
public MediaControlsLockScreenPreferenceController(Context context, String key) {
|
||||||
|
super(context, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isChecked() {
|
||||||
|
int val = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
|
MEDIA_CONTROLS_LOCK_SCREEN, 1);
|
||||||
|
return val == 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean setChecked(boolean isChecked) {
|
||||||
|
int val = isChecked ? 1 : 0;
|
||||||
|
return Settings.Secure.putInt(mContext.getContentResolver(),
|
||||||
|
MEDIA_CONTROLS_LOCK_SCREEN, val);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
return AVAILABLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSliceHighlightMenuRes() {
|
||||||
|
return R.string.menu_key_sound;
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,89 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 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 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 MediaControlsLockScreenPreferenceControllerTest {
|
||||||
|
|
||||||
|
private static final String KEY = "media_controls_lockscreen";
|
||||||
|
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
|
||||||
|
private int mOriginalPreference;
|
||||||
|
private ContentResolver mContentResolver;
|
||||||
|
private MediaControlsLockScreenPreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
mContentResolver = mContext.getContentResolver();
|
||||||
|
mOriginalPreference = Settings.Secure.getInt(mContentResolver,
|
||||||
|
Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN, 1);
|
||||||
|
mController = new MediaControlsLockScreenPreferenceController(mContext, KEY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() {
|
||||||
|
Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN,
|
||||||
|
mOriginalPreference);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailability_returnAvailable() {
|
||||||
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void setChecked_disable_shouldTurnOff() {
|
||||||
|
Settings.Secure.putInt(mContentResolver,
|
||||||
|
Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN, 1);
|
||||||
|
|
||||||
|
assertThat(mController.isChecked()).isTrue();
|
||||||
|
|
||||||
|
mController.setChecked(false);
|
||||||
|
|
||||||
|
assertThat(Settings.Secure.getInt(mContentResolver,
|
||||||
|
Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN, -1)).isEqualTo(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void setChecked_enable_shouldTurnOn() {
|
||||||
|
Settings.Secure.putInt(mContentResolver,
|
||||||
|
Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN, 0);
|
||||||
|
|
||||||
|
assertThat(mController.isChecked()).isFalse();
|
||||||
|
|
||||||
|
mController.setChecked(true);
|
||||||
|
|
||||||
|
assertThat(Settings.Secure.getInt(mContentResolver,
|
||||||
|
Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN, -1)).isEqualTo(1);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user