diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4ce8f362198..2f53cc1e7c8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3393,6 +3393,17 @@ android:value="true" /> + + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 1b653594aac..9a562643e6f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11322,6 +11322,10 @@ Default disabled changes Enabled for targetSdkVersion > %d + + No apps available + + App compatibility changes can only be modified for debuggable apps. Install a debuggable app and try again. @@ -12128,4 +12132,19 @@ Allow screen overlays on Settings Allow apps that can display over other apps to overlay Settings screens + + + Media + + Hide player when the media session has ended + + The player allows you to resume a session from the expanded Quick Settings panel. + + Hide player + + Show player + + No players available + + media diff --git a/res/xml/media_controls_settings.xml b/res/xml/media_controls_settings.xml new file mode 100644 index 00000000000..3f0483f028e --- /dev/null +++ b/res/xml/media_controls_settings.xml @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index eca5f1ea09e..fc5c3e222a2 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -110,6 +110,14 @@ settings:allowDividerAbove="true" settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/> + + getNonIndexableKeys(Context context) { final List keys = super.getNonIndexableKeys(context); if (isAvailable(context)) { - final FaceManager faceManager = context.getSystemService(FaceManager.class); - final boolean hasEnrolled = faceManager.hasEnrolledTemplates( - UserHandle.myUserId()); + final boolean hasEnrolled = hasEnrolledBiometrics(context); keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK : PREF_KEY_DELETE_FACE_DATA); } @@ -353,5 +355,13 @@ public class FaceSettings extends DashboardFragment { } return isAttentionSupported; } + + private boolean hasEnrolledBiometrics(Context context) { + final FaceManager faceManager = Utils.getFaceManagerOrNull(context); + if (faceManager != null) { + return faceManager.hasEnrolledTemplates(UserHandle.myUserId()); + } + return false; + } }; } diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index c9884f18129..ad4da08aed3 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -138,6 +138,7 @@ import com.android.settings.security.CryptKeeperSettings; import com.android.settings.security.LockscreenDashboardFragment; import com.android.settings.security.SecuritySettings; import com.android.settings.shortcut.CreateShortcut; +import com.android.settings.sound.MediaControlsSettings; import com.android.settings.support.SupportDashboardActivity; import com.android.settings.system.ResetDashboardFragment; import com.android.settings.system.SystemDashboardFragment; @@ -305,7 +306,8 @@ public class SettingsGateway { BugReportHandlerPicker.class.getName(), GestureNavigationSettingsFragment.class.getName(), InteractAcrossProfilesSettings.class.getName(), - InteractAcrossProfilesDetails.class.getName() + InteractAcrossProfilesDetails.class.getName(), + MediaControlsSettings.class.getName() }; public static final String[] SETTINGS_FOR_RESTRICTED = { diff --git a/src/com/android/settings/development/AppPicker.java b/src/com/android/settings/development/AppPicker.java index 8e927dbc94e..51215a15ae5 100644 --- a/src/com/android/settings/development/AppPicker.java +++ b/src/com/android/settings/development/AppPicker.java @@ -47,10 +47,14 @@ public class AppPicker extends ListActivity { = "com.android.settings.extra.REQUESTIING_PERMISSION"; public static final String EXTRA_DEBUGGABLE = "com.android.settings.extra.DEBUGGABLE"; public static final String EXTRA_NON_SYSTEM = "com.android.settings.extra.NON_SYSTEM"; + public static final String EXTRA_INCLUDE_NOTHING = "com.android.settings.extra.INCLUDE_NOTHING"; + + public static final int RESULT_NO_MATCHING_APPS = -2; private String mPermissionName; private boolean mDebuggableOnly; private boolean mNonSystemOnly; + private boolean mIncludeNothing; @Override protected void onCreate(Bundle icicle) { @@ -60,9 +64,11 @@ public class AppPicker extends ListActivity { mPermissionName = getIntent().getStringExtra(EXTRA_REQUESTIING_PERMISSION); mDebuggableOnly = getIntent().getBooleanExtra(EXTRA_DEBUGGABLE, false); mNonSystemOnly = getIntent().getBooleanExtra(EXTRA_NON_SYSTEM, false); + mIncludeNothing = getIntent().getBooleanExtra(EXTRA_INCLUDE_NOTHING, true); mAdapter = new AppListAdapter(this); if (mAdapter.getCount() <= 0) { + setResult(RESULT_NO_MATCHING_APPS); finish(); } else { setListAdapter(mAdapter); @@ -160,9 +166,11 @@ public class AppPicker extends ListActivity { mPackageInfoList.add(info); } Collections.sort(mPackageInfoList, sDisplayNameComparator); - MyApplicationInfo info = new MyApplicationInfo(); - info.label = context.getText(R.string.no_application); - mPackageInfoList.add(0, info); + if (mIncludeNothing) { + MyApplicationInfo info = new MyApplicationInfo(); + info.label = context.getText(R.string.no_application); + mPackageInfoList.add(0, info); + } addAll(mPackageInfoList); } diff --git a/src/com/android/settings/development/compat/PlatformCompatDashboard.java b/src/com/android/settings/development/compat/PlatformCompatDashboard.java index 2f2c7509851..fe64948e905 100644 --- a/src/com/android/settings/development/compat/PlatformCompatDashboard.java +++ b/src/com/android/settings/development/compat/PlatformCompatDashboard.java @@ -20,6 +20,7 @@ import static com.android.internal.compat.OverrideAllowedState.ALLOWED; import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_COMPAT_CHANGE_APP; import android.app.Activity; +import android.app.AlertDialog; import android.app.settings.SettingsEnums; import android.compat.Compatibility.ChangeConfig; import android.content.Context; @@ -124,6 +125,14 @@ public class PlatformCompatDashboard extends DashboardFragment { } catch (PackageManager.NameNotFoundException e) { startAppPicker(); } + } else if (resultCode == AppPicker.RESULT_NO_MATCHING_APPS) { + new AlertDialog.Builder(getContext()) + .setTitle(R.string.platform_compat_dialog_title_no_apps) + .setMessage(R.string.platform_compat_dialog_text_no_apps) + .setPositiveButton(R.string.okay, (dialog, which) -> finish()) + .setOnDismissListener(dialog -> finish()) + .setCancelable(false) + .show(); } return; } @@ -254,7 +263,8 @@ public class PlatformCompatDashboard extends DashboardFragment { } private void startAppPicker() { - final Intent intent = new Intent(getContext(), AppPicker.class); + final Intent intent = new Intent(getContext(), AppPicker.class) + .putExtra(AppPicker.EXTRA_INCLUDE_NOTHING, false); // If build is neither userdebug nor eng, only include debuggable apps final boolean debuggableBuild = mAndroidBuildClassifier.isDebuggableBuild(); if (!debuggableBuild) { diff --git a/src/com/android/settings/sound/MediaControlsParentPreferenceController.java b/src/com/android/settings/sound/MediaControlsParentPreferenceController.java new file mode 100644 index 00000000000..9aebd752b9b --- /dev/null +++ b/src/com/android/settings/sound/MediaControlsParentPreferenceController.java @@ -0,0 +1,53 @@ +/* + * 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 static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME; + +import static com.android.settings.sound.MediaControlsPreferenceController.useQsMediaPlayer; + +import android.content.Context; +import android.provider.Settings; + +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; + +/** + * Parent menu summary of media controls settings + */ +public class MediaControlsParentPreferenceController extends BasePreferenceController { + + public MediaControlsParentPreferenceController(Context context, String key) { + super(context, key); + } + + @Override + public int getAvailabilityStatus() { + return useQsMediaPlayer(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; + } + + @Override + public CharSequence getSummary() { + int summary; + if (Settings.Secure.getInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, 1) == 0) { + summary = R.string.media_controls_hide_player; + } else { + summary = R.string.media_controls_show_player; + } + return mContext.getText(summary); + } +} diff --git a/src/com/android/settings/sound/MediaControlsPreferenceController.java b/src/com/android/settings/sound/MediaControlsPreferenceController.java new file mode 100644 index 00000000000..2e8b163057c --- /dev/null +++ b/src/com/android/settings/sound/MediaControlsPreferenceController.java @@ -0,0 +1,57 @@ +/* + * 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 static android.provider.Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS; +import static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME; + +import android.content.Context; +import android.provider.Settings; + +import com.android.settings.core.TogglePreferenceController; + +/** + * Toggle for media controls settings + */ +public class MediaControlsPreferenceController extends TogglePreferenceController { + + public MediaControlsPreferenceController(Context context, String key) { + super(context, key); + } + + @Override + public boolean isChecked() { + int val = Settings.Secure.getInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, 1); + return val == 0; + } + + @Override + public boolean setChecked(boolean isChecked) { + int val = isChecked ? 0 : 1; + return Settings.Secure.putInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, val); + } + + @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; + } +} diff --git a/src/com/android/settings/sound/MediaControlsSettings.java b/src/com/android/settings/sound/MediaControlsSettings.java new file mode 100644 index 00000000000..f914b5d6241 --- /dev/null +++ b/src/com/android/settings/sound/MediaControlsSettings.java @@ -0,0 +1,51 @@ +/* + * 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.app.settings.SettingsEnums; + +import com.android.settings.R; +import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; + +/** + * Media control settings located in the sound menu + */ +@SearchIndexable +public class MediaControlsSettings extends DashboardFragment { + + private static final String TAG = "MediaControlsSettings"; + + @Override + protected int getPreferenceScreenResId() { + return R.xml.media_controls_settings; + } + + @Override + protected String getLogTag() { + return TAG; + } + + @Override + public int getMetricsCategory() { + return SettingsEnums.MEDIA_CONTROLS_SETTINGS; + } + + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.media_controls_settings); +} diff --git a/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java new file mode 100644 index 00000000000..a1a3f127d8f --- /dev/null +++ b/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java @@ -0,0 +1,104 @@ +/* + * 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 static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; + +import android.content.ContentResolver; +import android.content.Context; +import android.provider.Settings; + +import com.android.settings.R; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class MediaControlsParentPreferenceControllerTest { + + private static final String KEY = "media_controls_summary"; + + private Context mContext; + private int mOriginalQs; + private int mOriginalResume; + private ContentResolver mContentResolver; + private MediaControlsParentPreferenceController mController; + + @Before + public void setUp() { + mContext = spy(RuntimeEnvironment.application); + mContentResolver = mContext.getContentResolver(); + mOriginalQs = Settings.Global.getInt(mContentResolver, + Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1); + mOriginalResume = Settings.Secure.getInt(mContentResolver, + Settings.Secure.MEDIA_CONTROLS_RESUME, 1); + mController = new MediaControlsParentPreferenceController(mContext, KEY); + } + + @After + public void tearDown() { + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, + mOriginalQs); + Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, + mOriginalResume); + } + + @Test + public void getAvailability_flagNotEnabled_returnUnsupportedOnDevice() { + // When the qs_media flag is not enabled + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0); + + // Then the media resume option should not appear + assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); + } + + @Test + public void getAvailability_flagEnabled_returnAvailable() { + // When the qs_media flag is enabled + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1); + + // Then the media resume option should appear + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + } + + @Test + public void getSummary_isOn_showPlayer() { + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1); + Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 1); + + assertThat(mController.getSummary()) + .isEqualTo(mContext.getString(R.string.media_controls_show_player)); + } + + @Test + public void getSummary_isOff_hidePlayer() { + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1); + Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 0); + + assertThat(mController.getSummary()) + .isEqualTo(mContext.getString(R.string.media_controls_hide_player)); + } +} diff --git a/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java new file mode 100644 index 00000000000..ff35ebf341c --- /dev/null +++ b/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java @@ -0,0 +1,110 @@ +/* + * 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 static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; + +import android.content.ContentResolver; +import android.content.Context; +import android.provider.Settings; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class MediaControlsPreferenceControllerTest { + + private static final String KEY = "media_controls_resume_switch"; + + private Context mContext; + private int mOriginalQs; + private int mOriginalResume; + private ContentResolver mContentResolver; + private MediaControlsPreferenceController mController; + + @Before + public void setUp() { + mContext = spy(RuntimeEnvironment.application); + mContentResolver = mContext.getContentResolver(); + mOriginalQs = Settings.Global.getInt(mContentResolver, + Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1); + mOriginalResume = Settings.Secure.getInt(mContentResolver, + Settings.Secure.MEDIA_CONTROLS_RESUME, 1); + mController = new MediaControlsPreferenceController(mContext, KEY); + } + + @After + public void tearDown() { + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, + mOriginalQs); + Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, + mOriginalResume); + } + + @Test + public void getAvailability_flagNotEnabled_returnUnsupportedOnDevice() { + // When the qs_media flag is not enabled + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0); + + // Then the media resume option should not appear + assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); + } + + @Test + public void getAvailability_flagEnabled_returnAvailable() { + // When the qs_media flag is enabled + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1); + + // Then the media resume option should appear + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + } + + @Test + public void setChecked_enable_shouldTurnOff() { + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1); + Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 1); + + assertThat(mController.isChecked()).isFalse(); + + mController.setChecked(true); + + assertThat(Settings.Secure.getInt(mContentResolver, + Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(0); + } + + @Test + public void setChecked_disable_shouldTurnOn() { + Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1); + Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 0); + + assertThat(mController.isChecked()).isTrue(); + + mController.setChecked(false); + + assertThat(Settings.Secure.getInt(mContentResolver, + Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(1); + } +} diff --git a/tests/robotests/src/com/android/settings/sound/MediaControlsSettingsTest.java b/tests/robotests/src/com/android/settings/sound/MediaControlsSettingsTest.java new file mode 100644 index 00000000000..a27cbaf36f5 --- /dev/null +++ b/tests/robotests/src/com/android/settings/sound/MediaControlsSettingsTest.java @@ -0,0 +1,50 @@ +/* + * 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 static com.google.common.truth.Truth.assertThat; + +import android.provider.SearchIndexableResource; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +import java.util.List; + +@RunWith(RobolectricTestRunner.class) +public class MediaControlsSettingsTest { + + private MediaControlsSettings mSettings; + + @Before + public void setUp() { + mSettings = new MediaControlsSettings(); + } + + @Test + public void testSearchIndexProvider_shouldIndexResource() { + final List indexRes = + MediaControlsSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex( + RuntimeEnvironment.application, true /* enabled */); + + assertThat(indexRes).isNotNull(); + assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId()); + } +}