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

Commit d35a5901 authored by tim peng's avatar tim peng Committed by Android (Google) Code Review
Browse files

Merge changes from topic "rename_const" 

* changes:
  Rename MediaOutputSliceConstants to MediaOutputConstants
  Rename MediaOutputSliceConstants to MediaOutputConstants
parents 7e4e0acc ded7fa76

packages/SettingsLib/src/com/android/settingslib/media/MediaOutputSliceConstants.java→packages/SettingsLib/src/com/android/settingslib/media/MediaOutputConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.settingslib.media; 
/**

 * Class to access MediaOutput constants.

 */

public class MediaOutputSliceConstants {

public class MediaOutputConstants {



    /**

     * Key for the Remote Media slice.

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager; 
import com.android.settingslib.media.InfoMediaManager;

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 com.android.systemui.R;

import com.android.systemui.plugins.ActivityStarter;
@@ -449,8 +449,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { 
        mCallback.dismissDialog();

        final ActivityStarter.OnDismissAction postKeyguardAction = () -> {

            mContext.sendBroadcast(new Intent()

                    .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING)

                    .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME));

                    .setAction(MediaOutputConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING)

                    .setPackage(MediaOutputConstants.SETTINGS_PACKAGE_NAME));

            mShadeController.animateCollapsePanels();

            return true;

        };

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.content.BroadcastReceiver 
import android.content.Context

import android.content.Intent

import android.text.TextUtils

import com.android.settingslib.media.MediaOutputSliceConstants

import com.android.settingslib.media.MediaOutputConstants

import javax.inject.Inject



/**
@@ -30,10 +30,10 @@ class MediaOutputDialogReceiver @Inject constructor( 
    private val mediaOutputDialogFactory: MediaOutputDialogFactory

) : BroadcastReceiver() {

    override fun onReceive(context: Context, intent: Intent) {

        if (TextUtils.equals(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG,

        if (TextUtils.equals(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG,

                        intent.action)) {

            mediaOutputDialogFactory.create(

                    intent.getStringExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME), false)

                    intent.getStringExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME), false)

        }

    }

}