From fd7c9650ed55fc5043f1215af0382ec1304eb2d1 Mon Sep 17 00:00:00 2001 From: hughchen Date: Fri, 11 May 2018 20:11:56 +0800 Subject: [PATCH] Add controller to show the summary * Add AdvancedConnectedDeviceController that used to show which component is available * Add getConnectedDevices Summary Resource Id() to decide which string should be shown. Here have 4 cases to shown the string. case 1: driving mode available and NFC is availalbe, show "Bluetooth, driving mode, NFC" case 2: driving mode available and NFC is not availalbe, show "Bluetooth, driving mode" case 3: driving mode not available and NFC is availalbe, show "Bluetooth, NFC" case 4: driving mode not available and NFC not availalbe, show "Bluetooth" * Add test to verify the summary string is correct in each condition * Add test to verify getAvailabilityStatus() is AVAILABLE. Bug: 79299421 Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest Change-Id: I1048355bbd344db3ab645dd1537b4259eff57f38 Merged-In: I1048355bbd344db3ab645dd1537b4259eff57f38 --- res/xml/connected_devices.xml | 3 +- .../AdvancedConnectedDeviceController.java | 81 ++++++++++++++ ...AdvancedConnectedDeviceControllerTest.java | 104 ++++++++++++++++++ 3 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java create mode 100644 tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml index 75f99886400..30f5f136f6e 100644 --- a/res/xml/connected_devices.xml +++ b/res/xml/connected_devices.xml @@ -51,6 +51,7 @@ + android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment" + settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController"/> diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java new file mode 100644 index 00000000000..e6139bac5bb --- /dev/null +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java @@ -0,0 +1,81 @@ +/* + * Copyright 2018 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.connecteddevice; + +import android.content.Context; +import android.support.annotation.VisibleForTesting; +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; +import com.android.settings.nfc.NfcPreferenceController; + +/** + * Controller that used to show which component is available + */ +public class AdvancedConnectedDeviceController extends BasePreferenceController { + + public AdvancedConnectedDeviceController(Context context, String preferenceKey) { + super(context, preferenceKey); + } + + @Override + public int getAvailabilityStatus() { + return AVAILABLE; + } + + @Override + public CharSequence getSummary() { + return mContext.getText(getConnectedDevicesSummaryResourceId(mContext)); + } + + /** + * Get Connected Devices summary that depend on {@link NfcPreferenceController} or + * diving mode are available + */ + public static int getConnectedDevicesSummaryResourceId(Context context) { + final NfcPreferenceController nfcPreferenceController = + new NfcPreferenceController(context); + final boolean isDrivingModeAvailable = false; + + return getConnectedDevicesSummaryResourceId(nfcPreferenceController, + isDrivingModeAvailable); + } + + @VisibleForTesting + static int getConnectedDevicesSummaryResourceId(NfcPreferenceController + nfcPreferenceController, boolean isDrivingModeAvailable) { + final int resId; + + if (nfcPreferenceController.isAvailable()) { + if (isDrivingModeAvailable) { + // NFC available, driving mode available + resId = R.string.connected_devices_dashboard_summary; + } else { + // NFC available, driving mode not available + resId = R.string.connected_devices_dashboard_no_driving_mode_summary; + } + } else { + if (isDrivingModeAvailable) { + // NFC not available, driving mode available + resId = R.string.connected_devices_dashboard_no_nfc_summary; + } else { + // NFC not available, driving mode not available + resId = R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary; + } + } + + return resId; + } +} diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java new file mode 100644 index 00000000000..84588fd29d9 --- /dev/null +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -0,0 +1,104 @@ +/* + * Copyright 2018 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.connecteddevice; + +import static com.android.settings.core.BasePreferenceController.AVAILABLE; + +import android.content.Context; +import com.android.settings.R; +import com.android.settings.nfc.NfcPreferenceController; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowNfcAdapter; +import org.robolectric.util.ReflectionHelpers; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.spy; +import static org.robolectric.Shadows.shadowOf; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(shadows = ShadowNfcAdapter.class) +public class AdvancedConnectedDeviceControllerTest { + + private static final String KEY = "test_key"; + + private Context mContext; + private NfcPreferenceController mNfcController; + private ShadowNfcAdapter mShadowNfcAdapter; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mContext = spy(RuntimeEnvironment.application); + mNfcController = new NfcPreferenceController(mContext); + mShadowNfcAdapter = shadowOf(ShadowNfcAdapter.getNfcAdapter(mContext)); + } + + @Test + public void getAvailabilityStatus_returnStatusIsAvailable() { + AdvancedConnectedDeviceController controller = + new AdvancedConnectedDeviceController(mContext, KEY); + + assertThat(controller.getAvailabilityStatus()).isEqualTo( + AVAILABLE); + } + + @Test + public void getConnectedDevicesSummaryResourceId_NFCAndDrivingModeAvailable() { + // NFC available, driving mode available + final boolean isDrivingModeAvailable = true; + mShadowNfcAdapter.setEnabled(true); + assertThat(AdvancedConnectedDeviceController + .getConnectedDevicesSummaryResourceId(mNfcController, isDrivingModeAvailable)) + .isEqualTo(R.string.connected_devices_dashboard_summary); + } + + @Test + public void getConnectedDevicesSummaryResourceId_NFCAvailableAndDrivingModeNotAvailable() { + // NFC is available, driving mode not available + final boolean isDrivingModeAvailable = false; + mShadowNfcAdapter.setEnabled(true); + assertThat(AdvancedConnectedDeviceController + .getConnectedDevicesSummaryResourceId(mNfcController, isDrivingModeAvailable)) + .isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_summary); + } + + @Test + public void getConnectedDevicesSummaryResourceId_NFCNotAvailableDrivingModeAvailable() { + // NFC not available, driving mode available + final boolean isDrivingModeAvailable = true; + ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null); + assertThat(AdvancedConnectedDeviceController + .getConnectedDevicesSummaryResourceId(mNfcController, isDrivingModeAvailable)) + .isEqualTo(R.string.connected_devices_dashboard_no_nfc_summary); + } + + @Test + public void getConnectedDevicesSummaryResourceId_NFCAndDrivingModeNotAvailable() { + // NFC not available, driving mode not available + final boolean isDrivingModeAvailable = false; + ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null); + assertThat(AdvancedConnectedDeviceController + .getConnectedDevicesSummaryResourceId(mNfcController, isDrivingModeAvailable)) + .isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary); + } +}