From c91d017080503593033b2fe90cc54b384ef299fb Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Sat, 17 Jun 2023 00:07:16 +0800 Subject: [PATCH 1/2] [LE Broadcast] Fix crash when scan QR code Crash happens when rotated screen. QrCodeScanModeFragment should only have default constructor. Remove unused params to fix. To start this page, adb shell am start \ -a android.settings.BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER Fix: 287363885 Test: Manually Change-Id: I3c4bcfdb8ae6ddf750e16d8e7565cb9d45d11788 --- .../settings/bluetooth/QrCodeScanModeActivity.java | 2 +- .../settings/bluetooth/QrCodeScanModeFragment.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java b/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java index 92786c9b813..a0b249dee87 100644 --- a/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java +++ b/src/com/android/settings/bluetooth/QrCodeScanModeActivity.java @@ -98,7 +98,7 @@ public class QrCodeScanModeActivity extends QrCodeScanModeBaseActivity { BluetoothBroadcastUtils.TAG_FRAGMENT_QR_CODE_SCANNER); if (fragment == null) { - fragment = new QrCodeScanModeFragment(mIsGroupOp, mSink); + fragment = new QrCodeScanModeFragment(); } else { if (fragment.isVisible()) { return; diff --git a/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java b/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java index f89dac6f935..80aedd7142a 100644 --- a/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java +++ b/src/com/android/settings/bluetooth/QrCodeScanModeFragment.java @@ -18,7 +18,6 @@ package com.android.settings.bluetooth; import android.app.Activity; import android.app.settings.SettingsEnums; -import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.Intent; import android.graphics.Matrix; @@ -71,9 +70,7 @@ public class QrCodeScanModeFragment extends InstrumentedFragment implements public static final String KEY_BROADCAST_METADATA = "key_broadcast_metadata"; - private boolean mIsGroupOp; private int mCornerRadius; - private BluetoothDevice mSink; private String mBroadcastMetadata; private Context mContext; private QrCamera mCamera; @@ -81,11 +78,6 @@ public class QrCodeScanModeFragment extends InstrumentedFragment implements private TextView mSummary; private TextView mErrorMessage; - public QrCodeScanModeFragment(boolean isGroupOp, BluetoothDevice sink) { - mIsGroupOp = isGroupOp; - mSink = sink; - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); From 7aaceaa782462a214c867734c54cc337d33c7230 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Mon, 19 Jun 2023 10:15:08 +0800 Subject: [PATCH 2/2] [lint] Fix Wrong Resource Type Bug: 285231003 Test: m Settings Change-Id: I8dfbaf1342f014af35cd08906ac3f498b6c8c11a --- res/{layout => xml}/wifi_api_test.xml | 0 .../fuelgauge/batterytip/tips/BatteryTip.java | 15 +++------------ src/com/android/settings/wifi/WifiAPITest.java | 2 +- .../fuelgauge/batterytip/tips/BatteryTipTest.java | 6 +++--- 4 files changed, 7 insertions(+), 16 deletions(-) rename res/{layout => xml}/wifi_api_test.xml (100%) diff --git a/res/layout/wifi_api_test.xml b/res/xml/wifi_api_test.xml similarity index 100% rename from res/layout/wifi_api_test.xml rename to res/xml/wifi_api_test.xml diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index 8aabc37c6dc..fdafca65c0c 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -20,9 +20,8 @@ import android.content.Context; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseIntArray; -import android.view.View; -import androidx.annotation.IdRes; +import androidx.annotation.DrawableRes; import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -134,7 +133,8 @@ public abstract class BatteryTip implements Comparable, Parcelable { public abstract CharSequence getSummary(Context context); - @IdRes + /** Gets the drawable resource id for the icon. */ + @DrawableRes public abstract int getIconId(); /** @@ -162,21 +162,12 @@ public abstract class BatteryTip implements Comparable, Parcelable { preference.setTitle(getTitle(context)); preference.setSummary(getSummary(context)); preference.setIcon(getIconId()); - @IdRes int iconTintColorId = getIconTintColorId(); - if (iconTintColorId != View.NO_ID) { - preference.getIcon().setTint(context.getColor(iconTintColorId)); - } final CardPreference cardPreference = castToCardPreferenceSafely(preference); if (cardPreference != null) { cardPreference.resetLayoutState(); } } - /** Returns the color resid for tinting {@link #getIconId()} or {@link View#NO_ID} if none. */ - public @IdRes int getIconTintColorId() { - return View.NO_ID; - } - public boolean shouldShowDialog() { return mShowDialog; } diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 15465edb04b..c8bcf7fe173 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -69,7 +69,7 @@ public class WifiAPITest extends SettingsPreferenceFragment implements @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - addPreferencesFromResource(R.layout.wifi_api_test); + addPreferencesFromResource(R.xml.wifi_api_test); final PreferenceScreen preferenceScreen = getPreferenceScreen(); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java index 35131688b02..ecac4f9981e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java @@ -18,11 +18,11 @@ package com.android.settings.fuelgauge.batterytip.tips; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.view.View; import android.os.Parcel; import android.os.Parcelable; +import android.view.View; -import androidx.annotation.IdRes; +import androidx.annotation.DrawableRes; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; @@ -45,7 +45,7 @@ public class BatteryTipTest { private static final String TITLE = "title"; private static final String SUMMARY = "summary"; - @IdRes + @DrawableRes private static final int ICON_ID = R.drawable.ic_fingerprint; private Context mContext;