PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove wifi calling from Wifi settings"

Browse Source
This commit is contained in:
Lei Yu
2017-12-20 17:49:47 +00:00
committed by Android (Google) Code Review
parent 3abedefd38 4cd0b14e02
commit f1da75797e
4 changed files with 0 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/wifi_configure_settings.xml
View File

@@ -53,12 +53,6 @@
</intent> </intent>
</Preference> </Preference>
<Preference
android:key="wifi_calling_settings"
android:title="@string/wifi_calling_settings_title"
android:fragment="com.android.settings.WifiCallingSettings"
settings:keywords="@string/keywords_wifi_calling"/>
<Preference <Preference
android:key="network_scorer_picker" android:key="network_scorer_picker"
android:title="@string/network_scorer_picker_title" android:title="@string/network_scorer_picker_title"

54
src/com/android/settings/network/WifiCallingPreferenceController.java
View File

@@ -1,54 +0,0 @@
/*
* 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 android.support.v7.preference.Preference;
import android.telephony.TelephonyManager;
import com.android.ims.ImsManager;
import com.android.settings.WifiCallingSettings;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
public class WifiCallingPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
private TelephonyManager mTm;
public WifiCallingPreferenceController(Context context) {
super(context);
mTm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
}
@Override
public void updateState(Preference preference) {
preference.setSummary(WifiCallingSettings.getWfcModeSummary(
mContext, ImsManager.getWfcMode(mContext, mTm.isNetworkRoaming())));
}
@Override
public boolean isAvailable() {
return ImsManager.isWfcEnabledByPlatform(mContext)
&& ImsManager.isWfcProvisionedOnDevice(mContext);
}
@Override
public String getPreferenceKey() {
return KEY_WFC_SETTINGS;
}
}

2
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -30,7 +30,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.NetworkScorerPickerPreferenceController; import com.android.settings.network.NetworkScorerPickerPreferenceController;
import com.android.settings.network.WifiCallingPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; import com.android.settings.search.Indexable;
import com.android.settings.wifi.p2p.WifiP2pPreferenceController; import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
@@ -96,7 +95,6 @@ public class ConfigureWifiSettings extends DashboardFragment {
controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager)); controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager));
controllers.add(new CellularFallbackPreferenceController(context)); controllers.add(new CellularFallbackPreferenceController(context));
controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), wifiManager)); controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), wifiManager));
controllers.add(new WifiCallingPreferenceController(context));
controllers.add(new WpsPreferenceController( controllers.add(new WpsPreferenceController(
context, getLifecycle(), wifiManager, getFragmentManager())); context, getLifecycle(), wifiManager, getFragmentManager()));
return controllers; return controllers;

105
tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
View File

@@ -1,105 +0,0 @@
/*
* Copyright (C) 2017 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 static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.support.v7.preference.Preference;
import com.android.ims.ImsManager;
import com.android.settings.TestConfig;
import com.android.settings.network.WifiCallingPreferenceControllerTest.ShadowImsManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
shadows = {ShadowImsManager.class})
public class WifiCallingPreferenceControllerTest {
@Mock
private Preference mPreference;
private Context mContext;
private WifiCallingPreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
MockitoAnnotations.initMocks(this);
mController = new WifiCallingPreferenceController(mContext);
}
@After
public void teardown() {
ShadowImsManager.reset();
}
@Test
public void isAvailable_platformEnabledAndProvisioned_shouldReturnTrue() {
ShadowImsManager.wfcProvisioned = true;
ShadowImsManager.wfcEnabledByPlatform = true;
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void updateState_shouldUpdatePreferenceSummary() {
mController.updateState(mPreference);
verify(mPreference).setSummary(anyInt());
}
@Implements(ImsManager.class)
public static class ShadowImsManager {
public static boolean wfcEnabledByPlatform;
public static boolean wfcProvisioned;
public static void reset() {
wfcEnabledByPlatform = false;
wfcProvisioned = false;
}
@Implementation
public static boolean isWfcEnabledByPlatform(Context context) {
return wfcEnabledByPlatform;
}
@Implementation
public static boolean isWfcProvisionedOnDevice(Context context) {
return wfcProvisioned;
}
}
}