Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c77ab557 authored by Michael Mikhail's avatar Michael Mikhail Committed by Android (Google) Code Review
Browse files

Merge "Add media on lock screen setting" into tm-qpr-dev

parents 635b3f06 56e5b3da

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -13634,6 +13634,10 @@ 
    <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]-->

    <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] -->

    <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] -->

res/xml/media_controls_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ 
        app:keywords="@string/keywords_media_controls"

        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

        android:key="media_controls_recommendations"

        android:title="@string/media_controls_recommendations_title"

res/xml/privacy_advanced_settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -51,6 +51,14 @@ 
        android:summary="@string/summary_placeholder"

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

    <PreferenceCategory

        android:key="privacy_services"

res/xml/privacy_dashboard_settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -89,6 +89,14 @@ 
        android:summary="@string/summary_placeholder"

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

    <PreferenceCategory

        android:key="privacy_services"

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

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * 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;

    }

}