Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "rename_const"

Browse Source 
* changes:
  Rename MediaOutputSliceConstants to MediaOutputConstants
  Rename MediaOutputSliceConstants to MediaOutputConstants
This commit is contained in:
tim peng
2021-01-11 05:08:26 +00:00
committed by Android (Google) Code Review
parent 7e4e0acc8e ded7fa7616
commit d35a590157
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.

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

@@ -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;
};

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

@@ -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)
}
}
}