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

Commit c93b70e3 authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0416c3b3f9ce31ed35ba07363a519b15a4a0d0d
parents 3273b4eb 3cea72fb

src/com/android/settings/panel/MediaOutputPanel.java

+7 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.settings.Utils; 
import com.android.settingslib.media.InfoMediaDevice;

import com.android.settingslib.media.LocalMediaManager;

import com.android.settingslib.media.MediaDevice;

import com.android.settingslib.media.MediaOutputSliceConstants;



import java.util.ArrayList;

import java.util.List;
@@ -72,7 +73,12 @@ public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceC 
    private MediaController mMediaController;



    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) {

src/com/android/settings/panel/PanelFragment.java

+8 −6
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ public class PanelFragment extends Fragment { 
        if (mLayoutView != null) {

            mLayoutView.getViewTreeObserver().removeOnGlobalLayoutListener(mPanelLayoutListener);

        }

        if (mPanel != null) {

            mMetricsProvider.action(

                    0 /* attribution */,

                    SettingsEnums.PAGE_HIDE,
@@ -449,6 +450,7 @@ public class PanelFragment extends Fragment { 
                    mPanelClosedKey,

                    0 /* value */);

        }

    }



    @VisibleForTesting

    View.OnClickListener getSeeMoreListener() {

tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java

+0 −10
Original line number Diff line number Diff line
@@ -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_PANEL_TYPE_ARGUMENT;

import static com.android.settingslib.media.MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT;



import static com.google.common.truth.Truth.assertThat;
@@ -67,13 +66,4 @@ public class PanelFeatureProviderImplTest { 


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

    }

}