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

Replace Banner with App Title Text

Browse Source 
Bug: 123719839
Test: switch different payment
Change-Id: Ica90394bf5d5d0062403f2a0888c56072fdce7ee
This commit is contained in:
George Chang
2019-02-15 18:48:43 +08:00
parent b87dfdc189
commit 8adb77fd3d
3 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/nfc_payment_option.xml
View File

@@ -26,15 +26,8 @@
android:background="?android:attr/selectableItemBackground"> android:background="?android:attr/selectableItemBackground">
<RadioButton xmlns:android="http://schemas.android.com/apk/res/android" <RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/button" android:id="@+id/button"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:checkMark="?android:attr/listChoiceIndicatorSingle" android:checkMark="?android:attr/listChoiceIndicatorSingle"
/> />
<ImageView
android:id="@+id/banner"
android:layout_width="wrap_content"
android:layout_height="64dp"
android:scaleType="centerInside"
android:clickable="true"
/>
</LinearLayout> </LinearLayout>

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

@@ -183,7 +183,7 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
} }
public void updateApps(PaymentAppInfo[] appInfos) { public void updateApps(PaymentAppInfo[] appInfos) {
// Clone app infos, only add those with a banner // Clone app infos, only add an application label
this.appInfos = appInfos; this.appInfos = appInfos;
notifyDataSetChanged(); notifyDataSetChanged();
} }
@@ -211,16 +211,11 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
convertView = mLayoutInflater.inflate( convertView = mLayoutInflater.inflate(
R.layout.nfc_payment_option, parent, false); R.layout.nfc_payment_option, parent, false);
holder = new ViewHolder(); holder = new ViewHolder();
holder.imageView = convertView.findViewById(R.id.banner);
holder.radioButton = convertView.findViewById(R.id.button); holder.radioButton = convertView.findViewById(R.id.button);
convertView.setTag(holder); convertView.setTag(holder);
} else { } else {
holder = (ViewHolder) convertView.getTag(); holder = (ViewHolder) convertView.getTag();
} }
holder.imageView.setImageDrawable(appInfo.banner);
holder.imageView.setTag(appInfo);
holder.imageView.setContentDescription(appInfo.label);
holder.imageView.setOnClickListener(this);
// Prevent checked callback getting called on recycled views // Prevent checked callback getting called on recycled views
holder.radioButton.setOnCheckedChangeListener(null); holder.radioButton.setOnCheckedChangeListener(null);
@@ -228,11 +223,11 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
holder.radioButton.setContentDescription(appInfo.label); holder.radioButton.setContentDescription(appInfo.label);
holder.radioButton.setOnCheckedChangeListener(this); holder.radioButton.setOnCheckedChangeListener(this);
holder.radioButton.setTag(appInfo); holder.radioButton.setTag(appInfo);
holder.radioButton.setText(appInfo.label);
return convertView; return convertView;
} }
private class ViewHolder { private class ViewHolder {
public ImageView imageView;
public RadioButton radioButton; public RadioButton radioButton;
} }

15
src/com/android/settings/nfc/PaymentBackend.java
View File

@@ -46,7 +46,6 @@ public class PaymentBackend {
public static class PaymentAppInfo { public static class PaymentAppInfo {
public CharSequence label; public CharSequence label;
CharSequence description; CharSequence description;
Drawable banner;
boolean isDefault; boolean isDefault;
public ComponentName componentName; public ComponentName componentName;
public ComponentName settingsComponent; public ComponentName settingsComponent;
@@ -111,7 +110,6 @@ public class PaymentBackend {
appInfo.settingsComponent = null; appInfo.settingsComponent = null;
} }
appInfo.description = service.getDescription(); appInfo.description = service.getDescription();
appInfo.banner = service.loadBanner(pm);
appInfos.add(appInfo); appInfos.add(appInfo);
} }
mAppInfos = appInfos; mAppInfos = appInfos;
@@ -141,19 +139,6 @@ public class PaymentBackend {
} }
} }
Drawable loadDrawableForPackage(String pkgName, int drawableResId) {
PackageManager pm = mContext.getPackageManager();
try {
Resources res = pm.getResourcesForApplication(pkgName);
Drawable banner = res.getDrawable(drawableResId);
return banner;
} catch (Resources.NotFoundException e) {
return null;
} catch (PackageManager.NameNotFoundException e) {
return null;
}
}
boolean isForegroundMode() { boolean isForegroundMode() {
try { try {
return Settings.Secure.getInt(mContext.getContentResolver(), return Settings.Secure.getInt(mContext.getContentResolver(),