PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: Ife1bbb4e839ee6115b2809113c715068cdb94e59
This commit is contained in:
Yifan Hong
2021-08-04 00:07:38 +00:00
committed by Automerger Merge Worker
parent 8a8f607218 eddbc8a356
commit bbd851fea7
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
View File

@@ -73,7 +73,7 @@ public class AdbDeviceDetailsFingerprintController extends AbstractPreferenceCon
final CharSequence titleFormat = mContext.getText( final CharSequence titleFormat = mContext.getText(
R.string.adb_device_fingerprint_title_format); R.string.adb_device_fingerprint_title_format);
mFingerprintPref.setTitle(String.format( mFingerprintPref.setTitle(String.format(
titleFormat.toString(), mPairedDevice.getGuid())); titleFormat.toString(), mPairedDevice.guid));
mFingerprintCategory.addPreference(mFingerprintPref); mFingerprintCategory.addPreference(mFingerprintPref);
} }
} }

2
src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
View File

@@ -81,7 +81,7 @@ public class AdbDeviceDetailsHeaderController extends AbstractPreferenceControll
mEntityHeaderController mEntityHeaderController
.setIcon(mContext.getDrawable(com.android.internal.R.drawable.ic_bt_laptop)) .setIcon(mContext.getDrawable(com.android.internal.R.drawable.ic_bt_laptop))
.setLabel(mPairedDevice.getDeviceName()) .setLabel(mPairedDevice.name)
.done(mFragment.getActivity(), true); .done(mFragment.getActivity(), true);
} }
} }

4
src/com/android/settings/development/AdbPairedDevicePreference.java
View File

@@ -77,8 +77,8 @@ public class AdbPairedDevicePreference extends Preference {
static void setTitle(AdbPairedDevicePreference preference, static void setTitle(AdbPairedDevicePreference preference,
PairDevice pairedDevice) { PairDevice pairedDevice) {
preference.setTitle(pairedDevice.getDeviceName()); preference.setTitle(pairedDevice.name);
preference.setSummary(pairedDevice.isConnected() preference.setSummary(pairedDevice.connected
? preference.getContext().getText(R.string.adb_wireless_device_connected_summary) ? preference.getContext().getText(R.string.adb_wireless_device_connected_summary)
: ""); : "");
} }

2
src/com/android/settings/development/WirelessDebuggingFragment.java
View File

@@ -434,7 +434,7 @@ public class WirelessDebuggingFragment extends DashboardFragment
case FORGET_ACTION: case FORGET_ACTION:
try { try {
p = (PairDevice) data.getParcelableExtra(PAIRED_DEVICE_EXTRA); p = (PairDevice) data.getParcelableExtra(PAIRED_DEVICE_EXTRA);
mAdbManager.unpairDevice(p.getGuid()); mAdbManager.unpairDevice(p.guid);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Unable to forget the device"); Log.e(TAG, "Unable to forget the device");
} }