From 56ad92c3b992981ec4843909d90c7918a555c0d3 Mon Sep 17 00:00:00 2001 From: Joshua Duong Date: Tue, 17 Mar 2020 09:38:54 -0700 Subject: [PATCH] Add visibility control to ADB QR code preference. The preference should be hidden if isAdbWifiQrSupported() is false. Bug: 150163684 Bug: 149843499 Test: make RunSettingsRoboTests ROBOTEST_FILTER=AdbQrCodePreferenceControllerTest Change-Id: I3e833440fb1a6f369ac97cec8db04f2b99dd4640 (cherry picked from commit 6178918653785b38251bc83cd427b2343ad04b15) Exempt-From-Owner-Approval: cherry-pick --- res/xml/adb_wireless_settings.xml | 3 +- .../AdbQrCodePreferenceController.java | 79 ++++++++++++ .../development/AdbQrcodeScannerFragment.java | 2 + .../WirelessDebuggingFragment.java | 90 ++++++------- .../AdbQrCodePreferenceControllerTest.java | 118 ++++++++++++++++++ 5 files changed, 238 insertions(+), 54 deletions(-) create mode 100644 src/com/android/settings/development/AdbQrCodePreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/AdbQrCodePreferenceControllerTest.java diff --git a/res/xml/adb_wireless_settings.xml b/res/xml/adb_wireless_settings.xml index 7f60c698e70..945611e839e 100644 --- a/res/xml/adb_wireless_settings.xml +++ b/res/xml/adb_wireless_settings.xml @@ -47,7 +47,8 @@ android:key="adb_pair_method_qrcode_pref" android:icon="@drawable/ic_scan_24dp" android:title="@string/adb_pair_method_qrcode_title" - android:summary="@string/adb_pair_method_qrcode_summary"/> + android:summary="@string/adb_pair_method_qrcode_summary" + settings:controller="com.android.settings.development.AdbQrCodePreferenceController"/> mPairedDevicePreferences; - private IAdbManager mAdbManager; private int mConnectionPort; - - class PairingCodeDialogListener implements AdbWirelessDialog.AdbWirelessDialogListener { - @Override - public void onDismiss() { - Log.i(TAG, "onDismiss"); - mPairingCodeDialog = null; - try { - mAdbManager.disablePairing(); - } catch (RemoteException e) { - Log.e(TAG, "Unable to cancel pairing"); - } - } - } - final PairingCodeDialogListener mPairingCodeDialogListener = new PairingCodeDialogListener(); - AdbWirelessDialog mPairingCodeDialog; - private IntentFilter mIntentFilter; + private AdbWirelessDialog mPairingCodeDialog; + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -171,6 +149,25 @@ public class WirelessDebuggingFragment extends DashboardFragment } }; + class PairingCodeDialogListener implements AdbWirelessDialog.AdbWirelessDialogListener { + @Override + public void onDismiss() { + Log.i(TAG, "onDismiss"); + mPairingCodeDialog = null; + try { + mAdbManager.disablePairing(); + } catch (RemoteException e) { + Log.e(TAG, "Unable to cancel pairing"); + } + } + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + use(AdbQrCodePreferenceController.class).setParentFragment(this); + } + @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -203,12 +200,6 @@ public class WirelessDebuggingFragment extends DashboardFragment showDialog(AdbWirelessDialogUiBase.MODE_PAIRING); return true; }); - mQrcodePairingPreference = - (Preference) findPreference(PREF_KEY_ADB_QRCODE_PAIRING); - mQrcodePairingPreference.setOnPreferenceClickListener(preference -> { - launchQrcodeScannerFragment(); - return true; - }); mPairedDevicesCategory = (PreferenceCategory) findPreference(PREF_KEY_PAIRED_DEVICES_CATEGORY); @@ -462,6 +453,7 @@ public class WirelessDebuggingFragment extends DashboardFragment showDialog(AdbWirelessDialogUiBase.MODE_PAIRING_FAILED); break; default: + Log.d(TAG, "Successfully paired device"); break; } } @@ -476,16 +468,8 @@ public class WirelessDebuggingFragment extends DashboardFragment return deviceName; } - private void launchQrcodeScannerFragment() { - new SubSettingLauncher(getContext()) - .setDestination(AdbQrcodeScannerFragment.class.getName()) - .setSourceMetricsCategory(getMetricsCategory()) - .setResultListener(this, PAIRING_DEVICE_REQUEST) - .launch(); - } - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.development_tile_settings) { + new BaseSearchIndexProvider(R.xml.adb_wireless_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/tests/robotests/src/com/android/settings/development/AdbQrCodePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbQrCodePreferenceControllerTest.java new file mode 100644 index 00000000000..4906ed4a971 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/AdbQrCodePreferenceControllerTest.java @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.development; + +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.Intent; +import android.debug.IAdbManager; +import android.os.RemoteException; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + +import com.android.settings.testutils.shadow.ShadowUtils; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; +import org.robolectric.util.ReflectionHelpers; + +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowUtils.class) +public class AdbQrCodePreferenceControllerTest { + @Mock + private PreferenceScreen mScreen; + @Mock + private Preference mPreference; + @Mock + private IAdbManager mAdbManager; + @Mock + private WirelessDebuggingFragment mFragment; + + private AdbQrCodePreferenceController mController; + private Context mContext; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = spy(new AdbQrCodePreferenceController(mContext, "test_key")); + mController.setParentFragment(mFragment); + ReflectionHelpers.setField(mController, "mAdbManager", mAdbManager); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + when(mPreference.getContext()).thenReturn(mContext); + } + + @Test + public void getAvailabilityStatus_isAdbWifiQrSupported_yes_shouldBeTrue() + throws RemoteException { + when(mAdbManager.isAdbWifiQrSupported()).thenReturn(true); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + } + + @Test + public void getAvailabilityStatus_isAdbWifiQrSupported_no_shouldBeFalse() + throws RemoteException { + when(mAdbManager.isAdbWifiQrSupported()).thenReturn(false); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); + } + + @Test + public void displayPreference_isAdbWifiQrSupported_yes_prefIsVisible() throws RemoteException { + when(mAdbManager.isAdbWifiQrSupported()).thenReturn(true); + + mController.displayPreference(mScreen); + verify(mPreference).setVisible(true); + } + + @Test + public void displayPreference_isAdbWifiQrSupported_no_prefIsNotVisible() + throws RemoteException { + when(mAdbManager.isAdbWifiQrSupported()).thenReturn(false); + + mController.displayPreference(mScreen); + verify(mPreference).setVisible(false); + } + + @Test + public void handlePreferenceTreeClick_launchActivity() { + final String preferenceKey = mController.getPreferenceKey(); + when(mPreference.getKey()).thenReturn(preferenceKey); + mController.handlePreferenceTreeClick(mPreference); + + verify(mFragment).startActivityForResult(any(Intent.class), + eq(WirelessDebuggingFragment.PAIRING_DEVICE_REQUEST)); + } +}