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

Merge "To fix the title and switch button of the broadcast dialog" into tm-qpr-dev am: 747b4c2b46

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21535745

Change-Id: Ieaf9c3287462d63d5971e620cf6074bfe8a70fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Betty Chang
2023-02-23 09:22:26 +00:00
committed by Automerger Merge Worker
parent 60c1d39222 747b4c2b46
commit 68b61ad517
4 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialog.java
View File

@@ -46,11 +46,11 @@ public class BroadcastDialog extends SystemUIDialog {
@VisibleForTesting @VisibleForTesting
protected View mDialogView; protected View mDialogView;
private MediaOutputDialogFactory mMediaOutputDialogFactory; private MediaOutputDialogFactory mMediaOutputDialogFactory;
private String mSwitchBroadcastApp; private String mCurrentBroadcastApp;
private String mOutputPackageName; private String mOutputPackageName;
public BroadcastDialog(Context context, MediaOutputDialogFactory mediaOutputDialogFactory, public BroadcastDialog(Context context, MediaOutputDialogFactory mediaOutputDialogFactory,
String switchBroadcastApp, String outputPkgName, UiEventLogger uiEventLogger) { String currentBroadcastApp, String outputPkgName, UiEventLogger uiEventLogger) {
super(context); super(context);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Init BroadcastDialog"); Log.d(TAG, "Init BroadcastDialog");
@@ -58,7 +58,7 @@ public class BroadcastDialog extends SystemUIDialog {
mContext = getContext(); mContext = getContext();
mMediaOutputDialogFactory = mediaOutputDialogFactory; mMediaOutputDialogFactory = mediaOutputDialogFactory;
mSwitchBroadcastApp = switchBroadcastApp; mCurrentBroadcastApp = currentBroadcastApp;
mOutputPackageName = outputPkgName; mOutputPackageName = outputPkgName;
mUiEventLogger = uiEventLogger; mUiEventLogger = uiEventLogger;
} }
@@ -77,20 +77,18 @@ public class BroadcastDialog extends SystemUIDialog {
TextView title = mDialogView.requireViewById(R.id.dialog_title); TextView title = mDialogView.requireViewById(R.id.dialog_title);
TextView subTitle = mDialogView.requireViewById(R.id.dialog_subtitle); TextView subTitle = mDialogView.requireViewById(R.id.dialog_subtitle);
title.setText( title.setText(mContext.getString(
mContext.getString(R.string.bt_le_audio_broadcast_dialog_title, R.string.bt_le_audio_broadcast_dialog_title, mCurrentBroadcastApp));
MediaDataUtils.getAppLabel(mContext, mOutputPackageName, String switchBroadcastApp = MediaDataUtils.getAppLabel(mContext, mOutputPackageName,
mContext.getString( mContext.getString(R.string.bt_le_audio_broadcast_dialog_unknown_name));
R.string.bt_le_audio_broadcast_dialog_unknown_name)))); subTitle.setText(mContext.getString(
subTitle.setText( R.string.bt_le_audio_broadcast_dialog_sub_title, switchBroadcastApp));
mContext.getString(R.string.bt_le_audio_broadcast_dialog_sub_title,
mSwitchBroadcastApp));
Button switchBroadcast = mDialogView.requireViewById(R.id.switch_broadcast); Button switchBroadcast = mDialogView.requireViewById(R.id.switch_broadcast);
Button changeOutput = mDialogView.requireViewById(R.id.change_output); Button changeOutput = mDialogView.requireViewById(R.id.change_output);
Button cancelBtn = mDialogView.requireViewById(R.id.cancel); Button cancelBtn = mDialogView.requireViewById(R.id.cancel);
switchBroadcast.setText(mContext.getString( switchBroadcast.setText(mContext.getString(
R.string.bt_le_audio_broadcast_dialog_switch_app, mSwitchBroadcastApp), null); R.string.bt_le_audio_broadcast_dialog_switch_app, switchBroadcastApp));
changeOutput.setOnClickListener((view) -> { changeOutput.setOnClickListener((view) -> {
mMediaOutputDialogFactory.create(mOutputPackageName, true, null); mMediaOutputDialogFactory.create(mOutputPackageName, true, null);
dismiss(); dismiss();

9
packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialogController.java
View File

@@ -47,10 +47,15 @@ public class BroadcastDialogController {
mMediaOutputDialogFactory = mediaOutputDialogFactory; mMediaOutputDialogFactory = mediaOutputDialogFactory;
} }
public void createBroadcastDialog(String switchAppName, String outputPkgName, /** Creates a [BroadcastDialog] for the user to switch broadcast or change the output device
*
* @param currentBroadcastAppName Indicates the APP name currently broadcasting
* @param outputPkgName Indicates the output media package name to be switched
*/
public void createBroadcastDialog(String currentBroadcastAppName, String outputPkgName,
boolean aboveStatusBar, View view) { boolean aboveStatusBar, View view) {
BroadcastDialog broadcastDialog = new BroadcastDialog(mContext, mMediaOutputDialogFactory, BroadcastDialog broadcastDialog = new BroadcastDialog(mContext, mMediaOutputDialogFactory,
switchAppName, outputPkgName, mUiEventLogger); currentBroadcastAppName, outputPkgName, mUiEventLogger);
if (view != null) { if (view != null) {
mDialogLaunchAnimator.showFromView(broadcastDialog, view); mDialogLaunchAnimator.showFromView(broadcastDialog, view);
} else { } else {

11
packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java
View File

@@ -226,7 +226,7 @@ public class MediaControlPanel {
private final BroadcastDialogController mBroadcastDialogController; private final BroadcastDialogController mBroadcastDialogController;
private boolean mIsCurrentBroadcastedApp = false; private boolean mIsCurrentBroadcastedApp = false;
private boolean mShowBroadcastDialogButton = false; private boolean mShowBroadcastDialogButton = false;
private String mSwitchBroadcastApp; private String mCurrentBroadcastApp;
private MultiRippleController mMultiRippleController; private MultiRippleController mMultiRippleController;
private TurbulenceNoiseController mTurbulenceNoiseController; private TurbulenceNoiseController mTurbulenceNoiseController;
private final FeatureFlags mFeatureFlags; private final FeatureFlags mFeatureFlags;
@@ -572,9 +572,8 @@ public class MediaControlPanel {
// TODO(b/233698402): Use the package name instead of app label to avoid the // TODO(b/233698402): Use the package name instead of app label to avoid the
// unexpected result. // unexpected result.
mIsCurrentBroadcastedApp = device != null mIsCurrentBroadcastedApp = device != null
&& TextUtils.equals(device.getName(), && TextUtils.equals(device.getName(),
MediaDataUtils.getAppLabel(mContext, mPackageName, mContext.getString( mContext.getString(R.string.broadcasting_description_is_broadcasting));
R.string.bt_le_audio_broadcast_dialog_unknown_name)));
useDisabledAlpha = !mIsCurrentBroadcastedApp; useDisabledAlpha = !mIsCurrentBroadcastedApp;
// Always be enabled if the broadcast button is shown // Always be enabled if the broadcast button is shown
isTapEnabled = true; isTapEnabled = true;
@@ -629,8 +628,8 @@ public class MediaControlPanel {
// media output dialog. // media output dialog.
if (!mIsCurrentBroadcastedApp) { if (!mIsCurrentBroadcastedApp) {
mLogger.logOpenBroadcastDialog(mUid, mPackageName, mInstanceId); mLogger.logOpenBroadcastDialog(mUid, mPackageName, mInstanceId);
mSwitchBroadcastApp = device.getName().toString(); mCurrentBroadcastApp = device.getName().toString();
mBroadcastDialogController.createBroadcastDialog(mSwitchBroadcastApp, mBroadcastDialogController.createBroadcastDialog(mCurrentBroadcastApp,
mPackageName, true, mMediaViewHolder.getSeamlessButton()); mPackageName, true, mMediaViewHolder.getSeamlessButton());
} else { } else {
mLogger.logOpenOutputSwitcher(mUid, mPackageName, mInstanceId); mLogger.logOpenOutputSwitcher(mUid, mPackageName, mInstanceId);

29
packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogTest.java
View File

@@ -20,14 +20,14 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import androidx.test.filters.SmallTest;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper; import android.testing.TestableLooper;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import androidx.test.filters.SmallTest;
import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLogger;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.SysuiTestCase; import com.android.systemui.SysuiTestCase;
@@ -44,18 +44,21 @@ import org.mockito.MockitoAnnotations;
@TestableLooper.RunWithLooper(setAsMainLooper = true) @TestableLooper.RunWithLooper(setAsMainLooper = true)
public class BroadcastDialogTest extends SysuiTestCase { public class BroadcastDialogTest extends SysuiTestCase {
private static final String SWITCH_APP = "Music"; private static final String CURRENT_BROADCAST_APP = "Music";
private static final String SWITCH_APP = "Files by Google";
private static final String TEST_PACKAGE = "com.google.android.apps.nbu.files"; private static final String TEST_PACKAGE = "com.google.android.apps.nbu.files";
private BroadcastDialog mBroadcastDialog; private BroadcastDialog mBroadcastDialog;
private View mDialogView; private View mDialogView;
private TextView mTitle;
private TextView mSubTitle; private TextView mSubTitle;
private Button mSwitchBroadcastAppButton;
private Button mChangeOutputButton; private Button mChangeOutputButton;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mBroadcastDialog = new BroadcastDialog(mContext, mock(MediaOutputDialogFactory.class), mBroadcastDialog = new BroadcastDialog(mContext, mock(MediaOutputDialogFactory.class),
SWITCH_APP, TEST_PACKAGE, mock(UiEventLogger.class)); CURRENT_BROADCAST_APP, TEST_PACKAGE, mock(UiEventLogger.class));
mBroadcastDialog.show(); mBroadcastDialog.show();
mDialogView = mBroadcastDialog.mDialogView; mDialogView = mBroadcastDialog.mDialogView;
} }
@@ -66,13 +69,29 @@ public class BroadcastDialogTest extends SysuiTestCase {
} }
@Test @Test
public void onCreate_withCurrentApp_checkSwitchAppContent() { public void onCreate_withCurrentApp_titleIsCurrentAppName() {
mTitle = mDialogView.requireViewById(R.id.dialog_title);
assertThat(mTitle.getText().toString()).isEqualTo(mContext.getString(
R.string.bt_le_audio_broadcast_dialog_title, CURRENT_BROADCAST_APP));
}
@Test
public void onCreate_withCurrentApp_subTitleIsSwitchAppName() {
mSubTitle = mDialogView.requireViewById(R.id.dialog_subtitle); mSubTitle = mDialogView.requireViewById(R.id.dialog_subtitle);
assertThat(mSubTitle.getText()).isEqualTo( assertThat(mSubTitle.getText()).isEqualTo(
mContext.getString(R.string.bt_le_audio_broadcast_dialog_sub_title, SWITCH_APP)); mContext.getString(R.string.bt_le_audio_broadcast_dialog_sub_title, SWITCH_APP));
} }
@Test
public void onCreate_withCurrentApp_switchBtnIsSwitchAppName() {
mSwitchBroadcastAppButton = mDialogView.requireViewById(R.id.switch_broadcast);
assertThat(mSwitchBroadcastAppButton.getText().toString()).isEqualTo(
mContext.getString(R.string.bt_le_audio_broadcast_dialog_switch_app, SWITCH_APP));
}
@Test @Test
public void onClick_withChangeOutput_dismissBroadcastDialog() { public void onClick_withChangeOutput_dismissBroadcastDialog() {
mChangeOutputButton = mDialogView.requireViewById(R.id.change_output); mChangeOutputButton = mDialogView.requireViewById(R.id.change_output);