diff options
| author | Lucas Dupin <dupin@google.com> | 2020-07-09 10:55:57 -0700 |
|---|---|---|
| committer | Lucas Dupin <dupin@google.com> | 2020-07-09 11:57:27 -0700 |
| commit | 42219fb395dc0309a6e5e5be9321847e2586ede7 (patch) | |
| tree | 1b1c0862eaf9eaba9eb862e79948e90eda9fda2a /src/com/android/settings/sound | |
| parent | f002dd72ac526f24a69c1fdfb9a15562ff0204ad (diff) | |
| download | packages_apps_Settings-42219fb395dc0309a6e5e5be9321847e2586ede7.tar.gz packages_apps_Settings-42219fb395dc0309a6e5e5be9321847e2586ede7.tar.bz2 packages_apps_Settings-42219fb395dc0309a6e5e5be9321847e2586ede7.zip | |
Delete media feature flag
The feature will always be available, even for users who disabled it
on Beta 1.
Bug: 160826507
Test: manual
Test: MediaControlsParentPreferenceControllerTest
Test: MediaControlsPreferenceControllerTest
Change-Id: Ia2835e7c8156d753a8f8fbf248f2509003309fd2
Diffstat (limited to 'src/com/android/settings/sound')
| -rw-r--r-- | src/com/android/settings/sound/MediaControlsParentPreferenceController.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/sound/MediaControlsPreferenceController.java | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/settings/sound/MediaControlsParentPreferenceController.java b/src/com/android/settings/sound/MediaControlsParentPreferenceController.java index 9aebd752b9..acdfb56f74 100644 --- a/src/com/android/settings/sound/MediaControlsParentPreferenceController.java +++ b/src/com/android/settings/sound/MediaControlsParentPreferenceController.java @@ -18,8 +18,6 @@ package com.android.settings.sound; import static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME; -import static com.android.settings.sound.MediaControlsPreferenceController.useQsMediaPlayer; - import android.content.Context; import android.provider.Settings; @@ -37,7 +35,7 @@ public class MediaControlsParentPreferenceController extends BasePreferenceContr @Override public int getAvailabilityStatus() { - return useQsMediaPlayer(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/sound/MediaControlsPreferenceController.java b/src/com/android/settings/sound/MediaControlsPreferenceController.java index 2e8b163057..050cf9391a 100644 --- a/src/com/android/settings/sound/MediaControlsPreferenceController.java +++ b/src/com/android/settings/sound/MediaControlsPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.sound; -import static android.provider.Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS; import static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME; import android.content.Context; @@ -47,11 +46,6 @@ public class MediaControlsPreferenceController extends TogglePreferenceControlle @Override public int getAvailabilityStatus() { - return useQsMediaPlayer(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; - } - - protected static boolean useQsMediaPlayer(Context context) { - return Settings.Global.getInt(context.getContentResolver(), - SHOW_MEDIA_ON_QUICK_SETTINGS, 1) > 0; + return AVAILABLE; } } |