diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 29f69b8e743..8d7d276a063 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3028,11 +3028,15 @@ - + - + + + + + diff --git a/src/com/android/settings/panel/NfcPanel.java b/src/com/android/settings/panel/NfcPanel.java index 8fa41d9d303..6a9c74dbb20 100644 --- a/src/com/android/settings/panel/NfcPanel.java +++ b/src/com/android/settings/panel/NfcPanel.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2019 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.panel; import android.app.settings.SettingsEnums; diff --git a/src/com/android/settings/panel/PanelFeatureProviderImpl.java b/src/com/android/settings/panel/PanelFeatureProviderImpl.java index 6b096a15b64..67c300f5f0f 100644 --- a/src/com/android/settings/panel/PanelFeatureProviderImpl.java +++ b/src/com/android/settings/panel/PanelFeatureProviderImpl.java @@ -28,12 +28,14 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider { switch (panelType) { case Settings.Panel.ACTION_INTERNET_CONNECTIVITY: return InternetConnectivityPanel.create(context); - case Settings.Panel.ACTION_VOLUME: - return VolumePanel.create(context); - case Settings.Panel.ACTION_NFC: - return NfcPanel.create(context); case ACTION_MEDIA_OUTPUT: return MediaOutputPanel.create(context, mediaPackageName); + case Settings.Panel.ACTION_NFC: + return NfcPanel.create(context); + case Settings.Panel.ACTION_WIFI: + return WifiPanel.create(context); + case Settings.Panel.ACTION_VOLUME: + return VolumePanel.create(context); } throw new IllegalStateException("No matching panel for: " + panelType); diff --git a/src/com/android/settings/panel/WifiPanel.java b/src/com/android/settings/panel/WifiPanel.java new file mode 100644 index 00000000000..6d83742fe1a --- /dev/null +++ b/src/com/android/settings/panel/WifiPanel.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2019 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.panel; + +import android.app.settings.SettingsEnums; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; + +import com.android.settings.R; +import com.android.settings.SubSettings; +import com.android.settings.network.NetworkDashboardFragment; +import com.android.settings.slices.CustomSliceRegistry; +import com.android.settings.slices.SliceBuilderUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * Panel data class for Wifi settings. + */ +public class WifiPanel implements PanelContent { + + private final Context mContext; + + public static WifiPanel create(Context context) { + return new WifiPanel(context); + } + + private WifiPanel(Context context) { + mContext = context.getApplicationContext(); + } + + @Override + public CharSequence getTitle() { + return mContext.getText(R.string.wifi_settings); + } + + @Override + public List getSlices() { + final List uris = new ArrayList<>(); + uris.add(CustomSliceRegistry.WIFI_SLICE_URI); + return uris; + } + + @Override + public Intent getSeeMoreIntent() { + final String screenTitle = + mContext.getText(R.string.network_dashboard_title).toString(); + final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, + NetworkDashboardFragment.class.getName(), + null /* key */, + screenTitle, + SettingsEnums.SETTINGS_NETWORK_CATEGORY); + intent.setClassName(mContext.getPackageName(), SubSettings.class.getName()); + return intent; + } + + @Override + public int getMetricsCategory() { + return SettingsEnums.PANEL_WIFI; + } +} diff --git a/tests/robotests/src/com/android/settings/panel/NfcPanelTest.java b/tests/robotests/src/com/android/settings/panel/NfcPanelTest.java index bf6662dc946..1de2c5aa6dd 100644 --- a/tests/robotests/src/com/android/settings/panel/NfcPanelTest.java +++ b/tests/robotests/src/com/android/settings/panel/NfcPanelTest.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2019 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.panel; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/panel/WifiPanelTest.java b/tests/robotests/src/com/android/settings/panel/WifiPanelTest.java new file mode 100644 index 00000000000..08db23e9399 --- /dev/null +++ b/tests/robotests/src/com/android/settings/panel/WifiPanelTest.java @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2019 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.panel; + +import static com.google.common.truth.Truth.assertThat; + +import android.net.Uri; + +import com.android.settings.slices.CustomSliceRegistry; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +import java.util.List; + +@RunWith(RobolectricTestRunner.class) +public class WifiPanelTest { + + private WifiPanel mPanel; + + @Before + public void setUp() { + mPanel = WifiPanel.create(RuntimeEnvironment.application); + } + + @Test + public void getSlices_containsNecessarySlices() { + final List uris = mPanel.getSlices(); + + assertThat(uris).containsExactly( + CustomSliceRegistry.WIFI_SLICE_URI); + } + + @Test + public void getSeeMoreIntent_notNull() { + assertThat(mPanel.getSeeMoreIntent()).isNotNull(); + } +}