Merge "Add controller to show the summary" into pi-dev
am: 863b27270d
Change-Id: I612207108138216ba865cb026b00866ae9f53250
This commit is contained in:
@@ -52,6 +52,7 @@
|
|||||||
<Preference
|
<Preference
|
||||||
android:key="connection_preferences"
|
android:key="connection_preferences"
|
||||||
android:title="@string/connected_device_connections_title"
|
android:title="@string/connected_device_connections_title"
|
||||||
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"/>
|
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
|
||||||
|
settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController"/>
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user