diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c715868b1dd..82dd09f73f5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3219,6 +3219,51 @@ android:value="true" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Network & Internet + + Connected devices diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml new file mode 100644 index 00000000000..42895502def --- /dev/null +++ b/res/xml/connected_devices.xml @@ -0,0 +1,31 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index c8af978d7d3..91db7fa0f15 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -165,6 +165,7 @@ public class Settings extends SettingsActivity { // Top level categories for new IA public static class NetworkDashboardActivity extends SettingsActivity {} + public static class ConnectedDeviceDashboardActivity extends SettingsActivity {} public static class StorageDashboardActivity extends SettingsActivity {} public static class SystemDashboardActivity extends SettingsActivity {} public static class SupportDashboardActivity extends SettingsActivity {} diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index a07762b13e4..08eb247465a 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -74,6 +74,7 @@ import com.android.settings.applications.UsageAccessDetails; import com.android.settings.applications.VrListenerSettings; import com.android.settings.applications.WriteSettingsDetails; import com.android.settings.bluetooth.BluetoothSettings; +import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; import com.android.settings.core.instrumentation.SharedPreferencesLogger; import com.android.settings.dashboard.DashboardContainerFragment; import com.android.settings.dashboard.DashboardFeatureProvider; @@ -279,6 +280,8 @@ public class SettingsActivity extends SettingsDrawerActivity // Home page > Network & Internet "com.android.settings.Settings.WifiDashboardAlias", "com.android.settings.Settings.DataUsageDashboardAlias", + // Home page > Connected devices + Settings.ConnectedDeviceDashboardActivity.class.getName(), // Home page > System "com.android.settings.Settings.LanguageAndInputDashboardAlias", "com.android.settings.Settings.DateTimeDashboardAlias", @@ -388,6 +391,7 @@ public class SettingsActivity extends SettingsDrawerActivity StorageDashboardFragment.class.getName(), SystemDashboardFragment.class.getName(), NetworkDashboardFragment.class.getName(), + ConnectedDeviceDashboardFragment.class.getName(), }; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java new file mode 100644 index 00000000000..771f9bab539 --- /dev/null +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2016 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 com.android.settings.R; +import com.android.settings.core.PreferenceController; +import com.android.settings.dashboard.DashboardFragment; +import com.android.settingslib.drawer.CategoryKey; + +import java.util.List; + +public class ConnectedDeviceDashboardFragment extends DashboardFragment { + + private static final String TAG = "ConnectedDeviceFrag"; + + @Override + public int getMetricsCategory() { + return CONNECTED_DEVICE_CATEGORY_FRAGMENT; + } + + @Override + protected String getCategoryKey() { + return CategoryKey.CATEGORY_DEVICE; + } + + @Override + protected String getLogTag() { + return TAG; + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.connected_devices; + } + + @Override + protected List getPreferenceControllers(Context context) { + return null; + } + +} \ No newline at end of file diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java index 95307277d74..7297953b4a3 100644 --- a/src/com/android/settings/core/InstrumentedFragment.java +++ b/src/com/android/settings/core/InstrumentedFragment.java @@ -38,6 +38,7 @@ public abstract class InstrumentedFragment extends ObservablePreferenceFragment protected final int SYSTEM_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 1; protected final int STORAGE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 2; protected final int NETWORK_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 3; + protected final int CONNECTED_DEVICE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 4; public InstrumentedFragment() { // Mixin that logs visibility change for activity. diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java new file mode 100644 index 00000000000..e6570e17967 --- /dev/null +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2016 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 com.android.settings.TestConfig; +import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settingslib.drawer.CategoryKey; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import static com.google.common.truth.Truth.assertThat; + +@RunWith(RobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class ConnectedDeviceDashboardFragmentTest { + + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private Context mContext; + + private ConnectedDeviceDashboardFragment mFragment; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + FakeFeatureFactory.setupForTest(mContext); + mFragment = new ConnectedDeviceDashboardFragment(); + } + + @Test + public void testCategory_isConnectedDevice() { + assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE); + } + +}