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

Commit a7a73c4c authored by timhypeng's avatar timhypeng Committed by tim peng
Browse files

Rename MediaOutputSliceConstants to MediaOutputConstants 

-Slice is not used and it is better to remove the slice string

Bug: 165772904
Test: build pass
Change-Id: I38b26187f03509d0d9f5cdb8ef30f3f3ef8779d8
parent a12003a9

src/com/android/settings/media/BluetoothPairingReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.text.TextUtils; 
import com.android.settings.R;

import com.android.settings.bluetooth.BluetoothPairingDetail;

import com.android.settings.core.SubSettingLauncher;

import com.android.settingslib.media.MediaOutputSliceConstants;

import com.android.settingslib.media.MediaOutputConstants;



/**

 * BroadcastReceiver for handling media output intent
@@ -33,7 +33,7 @@ import com.android.settingslib.media.MediaOutputSliceConstants; 
public class BluetoothPairingReceiver extends BroadcastReceiver {

    @Override

    public void onReceive(Context context, Intent intent) {

        if (TextUtils.equals(MediaOutputSliceConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING,

        if (TextUtils.equals(MediaOutputConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING,

                intent.getAction())) {

            context.startActivity(new SubSettingLauncher(context)

                    .setDestination(BluetoothPairingDetail.class.getName())

src/com/android/settings/media/MediaOutputIndicatorSlice.java

+7 −7
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.settings.R; 
import com.android.settings.Utils;

import com.android.settings.slices.CustomSliceable;

import com.android.settings.slices.SliceBackgroundWorker;

import com.android.settingslib.media.MediaOutputSliceConstants;

import com.android.settingslib.media.MediaOutputConstants;



public class MediaOutputIndicatorSlice implements CustomSliceable {
@@ -128,15 +128,15 @@ public class MediaOutputIndicatorSlice implements CustomSliceable { 
        }

        // Launch media output dialog

        mContext.sendBroadcast(new Intent()

                .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)

                .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)

                .putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,

                .setPackage(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME)

                .setAction(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)

                .putExtra(MediaOutputConstants.KEY_MEDIA_SESSION_TOKEN,

                        mediaController.getSessionToken())

                .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,

                .putExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME,

                        mediaController.getPackageName()));

        // Dismiss volume panel

        mContext.sendBroadcast(new Intent()

                .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME)

                .setAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL));

                .setPackage(MediaOutputConstants.SETTINGS_PACKAGE_NAME)

                .setAction(MediaOutputConstants.ACTION_CLOSE_PANEL));

    }

}

src/com/android/settings/media/RemoteMediaSlice.java

+6 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import com.android.settings.slices.CustomSliceable; 
import com.android.settings.slices.SliceBackgroundWorker;

import com.android.settings.slices.SliceBroadcastReceiver;

import com.android.settings.slices.SliceBuilderUtils;

import com.android.settingslib.media.MediaOutputSliceConstants;

import com.android.settingslib.media.MediaOutputConstants;



import java.util.List;
@@ -86,14 +86,14 @@ public class RemoteMediaSlice implements CustomSliceable { 
            // Launch Media Output Dialog

            final RoutingSessionInfo info = intent.getParcelableExtra(SESSION_INFO);

            mContext.sendBroadcast(new Intent()

                    .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)

                    .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)

                    .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,

                    .setPackage(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME)

                    .setAction(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)

                    .putExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME,

                            info.getClientPackageName()));

            // Dismiss volume panel

            mContext.sendBroadcast(new Intent()

                    .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME)

                    .setAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL));

                    .setPackage(MediaOutputConstants.SETTINGS_PACKAGE_NAME)

                    .setAction(MediaOutputConstants.ACTION_CLOSE_PANEL));

        }

    }

src/com/android/settings/notification/RemoteVolumeGroupController.java

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; 
import com.android.settingslib.core.lifecycle.events.OnDestroy;

import com.android.settingslib.media.LocalMediaManager;

import com.android.settingslib.media.MediaDevice;

import com.android.settingslib.media.MediaOutputSliceConstants;

import com.android.settingslib.media.MediaOutputConstants;

import com.android.settingslib.utils.ThreadUtils;



import java.util.ArrayList;
@@ -196,9 +196,9 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem 
            if (TextUtils.equals(info.getId(),

                    preference.getKey().substring(SWITCHER_PREFIX.length()))) {

                final Intent intent = new Intent()

                        .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)

                        .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)

                        .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,

                        .setAction(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)

                        .setPackage(MediaOutputConstants.SYSTEMUI_PACKAGE_NAME)

                        .putExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME,

                                info.getClientPackageName());

                mContext.sendBroadcast(intent);

                return true;

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.panel;



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

import static com.android.settingslib.media.MediaOutputConstants.EXTRA_PACKAGE_NAME;



import android.content.Intent;

import android.content.res.Configuration;