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

Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8 am: 37d7f20996 am: 646b7c72ef

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

Change-Id: Ie3e03b1dae76440b8ad1e16862239b23ce091fdc
This commit is contained in:
Evan Chen
2021-09-06 05:34:05 +00:00
committed by Automerger Merge Worker
parent ef4197a103 646b7c72ef
commit b5edea8384
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
View File

@@ -64,8 +64,8 @@ public class DeviceChooserActivity extends Activity {
final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0); final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);
setTitle(Html.fromHtml(getString( setTitle(Html.fromHtml(getString(
R.string.confirmation_title, R.string.confirmation_title,
getCallingAppName(), Html.escapeHtml(getCallingAppName()),
selectedDevice.getDisplayName()), 0)); Html.escapeHtml(selectedDevice.getDisplayName())), 0));
mPairButton = findViewById(R.id.button_pair); mPairButton = findViewById(R.id.button_pair);
mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice)); mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice));
getService().mSelectedDevice = selectedDevice; getService().mSelectedDevice = selectedDevice;
@@ -74,7 +74,8 @@ public class DeviceChooserActivity extends Activity {
setContentView(R.layout.device_chooser); setContentView(R.layout.device_chooser);
mPairButton = findViewById(R.id.button_pair); mPairButton = findViewById(R.id.button_pair);
mPairButton.setVisibility(View.GONE); mPairButton.setVisibility(View.GONE);
setTitle(Html.fromHtml(getString(R.string.chooser_title, getCallingAppName()), 0)); setTitle(Html.fromHtml(getString(R.string.chooser_title,
Html.escapeHtml(getCallingAppName())), 0));
mDeviceListView = findViewById(R.id.device_list); mDeviceListView = findViewById(R.id.device_list);
final DeviceDiscoveryService.DevicesAdapter adapter = getService().mDevicesAdapter; final DeviceDiscoveryService.DevicesAdapter adapter = getService().mDevicesAdapter;
mDeviceListView.setAdapter(adapter); mDeviceListView.setAdapter(adapter);