diff --git a/AndroidManifest.xml b/AndroidManifest.xml index afe0730d467..c715868b1dd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3033,6 +3033,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 415d96ae759..f856ab13b73 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5915,6 +5915,8 @@ Show %d hidden items + + Network & Internet diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml new file mode 100644 index 00000000000..e990f9d2622 --- /dev/null +++ b/res/xml/network_and_internet.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 477c326206d..c8af978d7d3 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -164,7 +164,7 @@ public class Settings extends SettingsActivity { public static class SystemSettings extends SettingsActivity { /* empty */ } // Top level categories for new IA - public static class DisplayDashboardActivity extends SettingsActivity {} + public static class NetworkDashboardActivity 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 f9974b61f41..a07762b13e4 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -104,6 +104,7 @@ import com.android.settings.inputmethod.SpellCheckersSettings; import com.android.settings.inputmethod.UserDictionaryList; import com.android.settings.localepicker.LocaleListEditor; import com.android.settings.location.LocationSettings; +import com.android.settings.network.NetworkDashboardFragment; import com.android.settings.nfc.AndroidBeam; import com.android.settings.nfc.PaymentSettings; import com.android.settings.notification.AppNotificationSettings; @@ -270,10 +271,14 @@ public class SettingsActivity extends SettingsDrawerActivity // New IA // Home page + Settings.NetworkDashboardActivity.class.getName(), "com.android.settings.Settings.BatteryDashboardAlias", "com.android.settings.Settings.DisplayDashboardAlias", Settings.SystemDashboardActivity.class.getName(), Settings.SupportDashboardActivity.class.getName(), + // Home page > Network & Internet + "com.android.settings.Settings.WifiDashboardAlias", + "com.android.settings.Settings.DataUsageDashboardAlias", // Home page > System "com.android.settings.Settings.LanguageAndInputDashboardAlias", "com.android.settings.Settings.DateTimeDashboardAlias", @@ -382,6 +387,7 @@ public class SettingsActivity extends SettingsDrawerActivity SupportFragment.class.getName(), StorageDashboardFragment.class.getName(), SystemDashboardFragment.class.getName(), + NetworkDashboardFragment.class.getName(), }; diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java index d416e661641..95307277d74 100644 --- a/src/com/android/settings/core/InstrumentedFragment.java +++ b/src/com/android/settings/core/InstrumentedFragment.java @@ -37,6 +37,7 @@ public abstract class InstrumentedFragment extends ObservablePreferenceFragment protected final int PLACEHOLDER_METRIC = 10000; 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; public InstrumentedFragment() { // Mixin that logs visibility change for activity. diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java new file mode 100644 index 00000000000..966898ea93b --- /dev/null +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -0,0 +1,55 @@ +/* + * 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.network; + +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 NetworkDashboardFragment extends DashboardFragment { + + private static final String TAG = "NetworkDashboardFrag"; + + @Override + public int getMetricsCategory() { + return NETWORK_CATEGORY_FRAGMENT; + } + + @Override + protected String getCategoryKey() { + return CategoryKey.CATEGORY_NETWORK; + } + + @Override + protected String getLogTag() { + return TAG; + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.network_and_internet; + } + + @Override + protected List getPreferenceControllers(Context context) { + return null; + } +} diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java new file mode 100644 index 00000000000..386fbc6c77e --- /dev/null +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -0,0 +1,55 @@ +/* + * 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.network; + +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 NetworkDashboardFragmentTest { + + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private Context mContext; + + private NetworkDashboardFragment mFragment; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + FakeFeatureFactory.setupForTest(mContext); + mFragment = new NetworkDashboardFragment(); + } + + @Test + public void testCategory_isNetwork() { + assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NETWORK); + } +}