Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am: 39715d3023 am: 3362abc551

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24265323

Change-Id: I95a7256b5488b7847ebd348c455162fa08a2c3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Casey
2023-08-07 19:47:09 +00:00
committed by Automerger Merge Worker
4 changed files with 71 additions and 4 deletions

View File

@@ -226,11 +226,9 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
private Button createActionButton(Drawable icon, CharSequence title, View.OnClickListener r) {
final Button b = (Button) LayoutInflater.from(getContext()).inflate(
com.android.internal.R.layout.chooser_action_button, null);
R.layout.action_button, null);
if (icon != null) {
final int size = getResources()
.getDimensionPixelSize(
com.android.internal.R.dimen.chooser_action_button_icon_size);
final int size = getResources().getDimensionPixelSize(R.dimen.action_button_icon_size);
icon.setBounds(0, 0, size, size);
b.setCompoundDrawablesRelative(icon, null, null, null);
}