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

Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb2b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0416c3b3f9ce31ed35ba07363a519b15a4a0d0d
This commit is contained in:
tim peng
2020-12-08 06:28:52 +00:00
committed by Automerger Merge Worker
parent 3273b4ebb4 3cea72fb2b
commit c93b70e3a0
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/panel/MediaOutputPanel.java
View File

@@ -44,6 +44,7 @@ import com.android.settings.Utils;
import com.android.settingslib.media.InfoMediaDevice; import com.android.settingslib.media.InfoMediaDevice;
import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.LocalMediaManager;
import com.android.settingslib.media.MediaDevice; import com.android.settingslib.media.MediaDevice;
import com.android.settingslib.media.MediaOutputSliceConstants;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -72,7 +73,12 @@ public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceC
private MediaController mMediaController; private MediaController mMediaController;
public static MediaOutputPanel create(Context context, String packageName) { public static MediaOutputPanel create(Context context, String packageName) {
return new MediaOutputPanel(context, packageName); // Redirect to new media output dialog
context.sendBroadcast(new Intent()
.setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
.setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
.putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, packageName));
return null;
} }
private MediaOutputPanel(Context context, String packageName) { private MediaOutputPanel(Context context, String packageName) {

14
src/com/android/settings/panel/PanelFragment.java
View File

@@ -442,12 +442,14 @@ public class PanelFragment extends Fragment {
if (mLayoutView != null) { if (mLayoutView != null) {
mLayoutView.getViewTreeObserver().removeOnGlobalLayoutListener(mPanelLayoutListener); mLayoutView.getViewTreeObserver().removeOnGlobalLayoutListener(mPanelLayoutListener);
} }
mMetricsProvider.action( if (mPanel != null) {
0 /* attribution */, mMetricsProvider.action(
SettingsEnums.PAGE_HIDE, 0 /* attribution */,
mPanel.getMetricsCategory(), SettingsEnums.PAGE_HIDE,
mPanelClosedKey, mPanel.getMetricsCategory(),
0 /* value */); mPanelClosedKey,
0 /* value */);
}
} }
@VisibleForTesting @VisibleForTesting

10
tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.panel;
import static com.android.settings.panel.SettingsPanelActivity.KEY_MEDIA_PACKAGE_NAME; import static com.android.settings.panel.SettingsPanelActivity.KEY_MEDIA_PACKAGE_NAME;
import static com.android.settings.panel.SettingsPanelActivity.KEY_PANEL_TYPE_ARGUMENT; import static com.android.settings.panel.SettingsPanelActivity.KEY_PANEL_TYPE_ARGUMENT;
import static com.android.settingslib.media.MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -67,13 +66,4 @@ public class PanelFeatureProviderImplTest {
assertThat(panel).isInstanceOf(VolumePanel.class); assertThat(panel).isInstanceOf(VolumePanel.class);
} }
@Test
public void getPanel_mediaOutputKey_returnsCorrectPanel() {
mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, ACTION_MEDIA_OUTPUT);
final PanelContent panel = mProvider.getPanel(mContext, mBundle);
assertThat(panel).isInstanceOf(MediaOutputPanel.class);
}
} }