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

Commit b7993699 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Add recommendation setting and remove app settings 

- Add a new setting to control whether smartspace recommendations are
enabled
- Remove setting to block individual apps from resumption
- Update strings for existing resume setting

Bug: 187925818
Test: atest SettingsProviderTest
Test: atest MediaControlsRecommendationControllerTest
Test: atest MediaControlsPreferenceControllerTest
Change-Id: I4bd6a420e01e8c44f4db8be477557501648cc8d7
parent c102420a

res/values/strings.xml

+7 −7
Original line number Diff line number Diff line
@@ -13065,18 +13065,18 @@ 








    <!-- Title for media control settings [CHAR LIMIT=50]-->









    <string name="media_controls_title">Media</string>









    <!-- Summary for media control settings [CHAR LIMIT=NONE]-->









    <string name="media_controls_summary">Media player in Quick Settings</string>









    <!-- Title of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=50]-->









    <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">Show media player for an extended period to easily resume playback</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 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] -->









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









    <string name="media_controls_show_player">Show player</string>









    <!-- Subtext for media settings when no players can be shown [CHAR LIMIT=50] -->









    <string name="media_controls_no_players">No players available</string>









    <!-- Subtitle for section of media control settings that shows which apps are allowed [CHAR LIMIT=50] -->









    <string name="media_controls_apps_title">Allowed apps</string>









    <!-- Keywords for the media controls setting [CHAR LIMIT=NONE]-->









    <string name="keywords_media_controls">media</string>

































res/xml/media_controls_settings.xml



+9
−12






























Original line number
Diff line number
Diff line







@@ -20,20 +20,17 @@







    xmlns:app="http://schemas.android.com/apk/res-auto"









    android:title="@string/media_controls_title">



















    <com.android.settings.widget.SettingsMainSwitchPreference









    <SwitchPreference









        android:key="media_controls_resume_switch"









        android:title="@string/media_controls_summary"









        android:title="@string/media_controls_resume_title"









        android:summary="@string/media_controls_resume_description"









        app:keywords="@string/keywords_media_controls"









        app:controller="com.android.settings.sound.MediaControlsPreferenceController"









        app:allowDividerAbove="true" />









        app:controller="com.android.settings.sound.MediaControlsPreferenceController" />



















    <com.android.settingslib.widget.TopIntroPreference









        android:title="@string/media_controls_resume_description"









        app:searchable="false" />



















    <PreferenceCategory









        android:key="media_controls_resumable_apps"









        android:title="@string/media_controls_apps_title"









        app:controller="com.android.settings.sound.ResumableMediaAppsController" />









    <SwitchPreference









        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/MediaControlsPreferenceController.java



+9
−22






























Original line number
Diff line number
Diff line







@@ -20,47 +20,34 @@ import static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME;

















import android.content.Context;









import android.provider.Settings;









import android.widget.Switch;



















import androidx.annotation.VisibleForTesting;









import androidx.preference.PreferenceScreen;



















import com.android.settings.core.BasePreferenceController;









import com.android.settings.widget.SettingsMainSwitchPreference;









import com.android.settingslib.widget.OnMainSwitchChangeListener;









import com.android.settings.core.TogglePreferenceController;



















/**









 * Toggle for media controls settings









 * Toggle for media controls resumption setting









 */









public class MediaControlsPreferenceController extends BasePreferenceController









        implements OnMainSwitchChangeListener {









public class MediaControlsPreferenceController extends TogglePreferenceController {



















    public MediaControlsPreferenceController(Context context, String key) {









        super(context, key);









    }



















    @Override









    public void displayPreference(PreferenceScreen screen) {









        super.displayPreference(screen);









        SettingsMainSwitchPreference mainSwitch = screen.findPreference(mPreferenceKey);









        mainSwitch.addOnSwitchChangeListener(this);









        mainSwitch.setChecked(isChecked());









    }



















    @VisibleForTesting









    protected boolean isChecked() {









    public boolean isChecked() {









        int val = Settings.Secure.getInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, 1);









        return val == 1;









    }



















    @Override









    public int getAvailabilityStatus() {









        return AVAILABLE;









    public boolean setChecked(boolean isChecked) {









        int val = isChecked ? 1 : 0;









        return Settings.Secure.putInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, val);









    }



















    @Override









    public void onSwitchChanged(Switch switchView, boolean isChecked) {









        int val = isChecked ? 1 : 0;









        Settings.Secure.putInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, val);









    public int getAvailabilityStatus() {









        return AVAILABLE;









    }









}
























src/com/android/settings/sound/MediaControlsRecommendationController.java
0 → 100644



+53
−0






























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









    }









}
























src/com/android/settings/sound/ResumableMediaAppsController.java
deleted100644 → 0



+0
−138






























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 android.content.Context;









import android.content.Intent;









import android.content.pm.PackageManager;









import android.content.pm.ResolveInfo;









import android.graphics.drawable.Drawable;









import android.provider.Settings;









import android.service.media.MediaBrowserService;









import android.text.TextUtils;









import android.util.ArraySet;









import android.util.Log;



















import androidx.preference.PreferenceGroup;









import androidx.preference.PreferenceScreen;



















import com.android.settings.core.BasePreferenceController;









import com.android.settingslib.widget.AppSwitchPreference;



















import java.util.Collections;









import java.util.List;









import java.util.Set;



















/**









 * Section of media controls settings that contains a list of potentially resumable apps









 */









public class ResumableMediaAppsController extends BasePreferenceController {









    private static final String TAG = "ResumableMediaAppsCtrl";



















    private PreferenceGroup mPreferenceGroup;









    private PackageManager mPackageManager;









    private List<ResolveInfo> mResumeInfo;



















    public ResumableMediaAppsController(Context context, String key) {









        super(context, key);









        mPackageManager = mContext.getPackageManager();









        Intent serviceIntent = new Intent(MediaBrowserService.SERVICE_INTERFACE);









        mResumeInfo = mPackageManager.queryIntentServices(serviceIntent, 0);









    }



















    @Override









    public int getAvailabilityStatus() {









        // Update list, since this will be called when the app goes to onStart / onPause









        Intent serviceIntent = new Intent(MediaBrowserService.SERVICE_INTERFACE);









        mResumeInfo = mPackageManager.queryIntentServices(serviceIntent, 0);









        return (mResumeInfo.size() > 0) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;









    }



















    @Override









    public void displayPreference(PreferenceScreen screen) {









        super.displayPreference(screen);









        mPreferenceGroup = screen.findPreference(getPreferenceKey());









        Set<String> blockedApps = getBlockedMediaApps();









        for (ResolveInfo inf : mResumeInfo) {









            String packageName = inf.getComponentInfo().packageName;









            MediaSwitchPreference pref = new MediaSwitchPreference(mContext, packageName);









            CharSequence appTitle = packageName;









            try {









                appTitle = mPackageManager.getApplicationLabel(









                        mPackageManager.getApplicationInfo(packageName, 0));









                Drawable appIcon = mPackageManager.getApplicationIcon(packageName);









                pref.setIcon(appIcon);









            } catch (PackageManager.NameNotFoundException e) {









                Log.e(TAG, "Couldn't get app title", e);









            }









            pref.setTitle(appTitle);



















            pref.setOnPreferenceChangeListener((preference, status) -> {









                MediaSwitchPreference mediaPreference = (MediaSwitchPreference) preference;









                boolean isEnabled = (boolean) status;









                Log.d(TAG, "preference " + mediaPreference + " changed " + isEnabled);



















                if (isEnabled) {









                    blockedApps.remove(mediaPreference.getPackageName());









                } else {









                    blockedApps.add(mediaPreference.getPackageName());









                }









                setBlockedMediaApps(blockedApps);









                return true;









            });



















            pref.setChecked(!blockedApps.contains(packageName));









            mPreferenceGroup.addPreference(pref);









        }









    }



















    class MediaSwitchPreference extends AppSwitchPreference {









        private String mPackageName;



















        MediaSwitchPreference(Context context, String packageName) {









            super(context);









            mPackageName = packageName;









        }



















        public String getPackageName() {









            return mPackageName;









        }









    }



















    private Set<String> getBlockedMediaApps() {









        String list = Settings.Secure.getString(mContext.getContentResolver(),









                Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED);









        if (TextUtils.isEmpty(list)) {









            return new ArraySet<>();









        }









        String[] names = list.split(":");









        Set<String> set = new ArraySet<>(names.length);









        Collections.addAll(set, names);









        return set;









    }



















    private void setBlockedMediaApps(Set<String> apps) {









        if (apps == null || apps.size() == 0) {









            Settings.Secure.putString(mContext.getContentResolver(),









                    Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED, "");









            return;









        }









        String list = String.join(":", apps);









        Settings.Secure.putString(mContext.getContentResolver(),









                Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED, list);









    }









}