PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I4fc62150f05b1d59bcd77fe7566dd334f1d8931d
This commit is contained in:
Lucas Dupin
2020-07-13 16:55:39 +00:00
committed by Automerger Merge Worker
parent 8539f2ac35 9b01b8510a
commit 03edb83f56
4 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/sound/MediaControlsParentPreferenceController.java
View File

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

8
src/com/android/settings/sound/MediaControlsPreferenceController.java
View File

@@ -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;
}
}