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

Commit b5edea83 authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am:... 

Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162df am: 37d7f209 am: 646b7c72

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

Change-Id: Ie3e03b1dae76440b8ad1e16862239b23ce091fdc
parents ef4197a1 646b7c72

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ public class DeviceChooserActivity extends Activity { 
            final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);

            setTitle(Html.fromHtml(getString(

                    R.string.confirmation_title,

                    getCallingAppName(),

                    selectedDevice.getDisplayName()), 0));

                    Html.escapeHtml(getCallingAppName()),

                    Html.escapeHtml(selectedDevice.getDisplayName())), 0));

            mPairButton = findViewById(R.id.button_pair);

            mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice));

            getService().mSelectedDevice = selectedDevice;
@@ -74,7 +74,8 @@ public class DeviceChooserActivity extends Activity { 
            setContentView(R.layout.device_chooser);

            mPairButton = findViewById(R.id.button_pair);

            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);

            final DeviceDiscoveryService.DevicesAdapter adapter = getService().mDevicesAdapter;

            mDeviceListView.setAdapter(adapter);