Update wifi calling summary text during onResume

Change-Id: Ic376e65b418a966c53eef30bea7ca55edf72ac29
Fix: 35323207
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-02-21 14:12:57 -08:00
parent aba2c95ae0
commit 010c2af1bf
3 changed files with 126 additions and 8 deletions

View File

@@ -17,7 +17,6 @@ package com.android.settings.network;
import android.content.Context; import android.content.Context;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import com.android.ims.ImsManager; import com.android.ims.ImsManager;
@@ -35,13 +34,9 @@ public class WifiCallingPreferenceController extends PreferenceController {
} }
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void updateState(Preference preference) {
super.displayPreference(screen); preference.setSummary(WifiCallingSettings.getWfcModeSummary(
final Preference pref = screen.findPreference(KEY_WFC_SETTINGS); mContext, ImsManager.getWfcMode(mContext, mTm.isNetworkRoaming())));
if (pref != null) {
pref.setSummary(WifiCallingSettings.getWfcModeSummary(
mContext, ImsManager.getWfcMode(mContext, mTm.isNetworkRoaming())));
}
} }
@Override @Override

View File

@@ -0,0 +1,44 @@
/*
* 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.ims;
import android.content.Context;
/**
* Fake test class to com.android.ims.ImsManager
*/
public class ImsManager {
public static boolean wfcEnabledByPlatform;
public static boolean wfcProvisioned;
public static boolean isWfcEnabledByPlatform(Context context) {
return wfcEnabledByPlatform;
}
public static boolean isWfcProvisionedOnDevice(Context context) {
return wfcProvisioned;
}
public static int getWfcMode(Context context, boolean roaming) {
return 0;
}
public static boolean isWfcEnabledByUser(Context context) {
return false;
}
}

View File

@@ -0,0 +1,79 @@
/*
* 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 android.content.Context;
import android.support.v7.preference.Preference;
import android.telephony.CarrierConfigManager;
import android.telephony.TelephonyManager;
import com.android.ims.ImsManager;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
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.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiCallingPreferenceControllerTest {
@Mock
private Context mContext;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private CarrierConfigManager mCarrierConfigManager;
@Mock
private TelephonyManager mTelephonyManager;
@Mock
private Preference mPreference;
private WifiCallingPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE))
.thenReturn(mCarrierConfigManager);
when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
.thenReturn(mTelephonyManager);
mController = new WifiCallingPreferenceController(mContext);
}
@Test
public void isAvailable_platformEnabledAndProvisioned_shouldReturnTrue() {
ImsManager.wfcEnabledByPlatform = true;
ImsManager.wfcProvisioned = true;
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void updateState_shouldUpdatePreferenceSummary() {
mController.updateState(mPreference);
verify(mPreference).setSummary(anyInt());
}
}