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

NFC support in work profile

Browse Source 
Configure NFC payment settings based on userId.

Bug: 202367033
Test: mauanl tests
Change-Id: I97e275f374d34618b64188d5de185ec6c527e0fd
This commit is contained in:
Jack Yu
2021-10-13 19:56:09 +08:00
parent ab7640dcd9
commit 2a2e0275cc
3 changed files with 134 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/nfc/NfcPaymentPreferenceController.java
View File

@@ -20,6 +20,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.nfc.NfcAdapter;
import android.os.UserManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -127,7 +128,10 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
public CharSequence getSummary() {
final PaymentAppInfo defaultApp = mPaymentBackend.getDefaultApp();
if (defaultApp != null) {
return defaultApp.label;
UserManager um = mContext.createContextAsUser(
defaultApp.userHandle, /*flags=*/0).getSystemService(UserManager.class);
return defaultApp.label + " (" + um.getUserName() + ")";
} else {
return mContext.getText(R.string.nfc_payment_default_not_set);
}
@@ -218,12 +222,15 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
}
// Prevent checked callback getting called on recycled views
UserManager um = mContext.createContextAsUser(
appInfo.userHandle, /*flags=*/0).getSystemService(UserManager.class);
holder.radioButton.setOnCheckedChangeListener(null);
holder.radioButton.setChecked(appInfo.isDefault);
holder.radioButton.setContentDescription(appInfo.label);
holder.radioButton.setContentDescription(appInfo.label + " (" + um.getUserName() + ")");
holder.radioButton.setOnCheckedChangeListener(this);
holder.radioButton.setTag(appInfo);
holder.radioButton.setText(appInfo.label);
holder.radioButton.setText(appInfo.label + " (" + um.getUserName() + ")");
return convertView;
}
@@ -245,7 +252,8 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
private void makeDefault(PaymentAppInfo appInfo) {
if (!appInfo.isDefault) {
mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
mPaymentBackend.setDefaultPaymentApp(appInfo.componentName,
appInfo.userHandle.getIdentifier());
}
final Dialog dialog = mPreference.getDialog();
if (dialog != null) {