--- /dev/null
+/*
+ * 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.deviceinfo;
+
+import android.content.Context;
+import android.os.Build;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.PreferenceController;
+
+public class SerialNumberPreferenceController extends PreferenceController {
+
+ private static final String KEY_SERIAL_NUMBER = "serial_number";
+
+ private final String mSerialNumber;
+
+ public SerialNumberPreferenceController(Context context) {
+ this(context, Build.getSerial());
+ }
+
+ @VisibleForTesting
+ SerialNumberPreferenceController(Context context, String serialNumber) {
+ super(context);
+ mSerialNumber = serialNumber;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return !TextUtils.isEmpty(mSerialNumber);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ final Preference pref = screen.findPreference(KEY_SERIAL_NUMBER);
+ if (pref != null) {
+ pref.setSummary(mSerialNumber);
+ }
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ return false;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_SERIAL_NUMBER;
+ }
+}
package com.android.settings.deviceinfo;
-import static android.content.Context.CONNECTIVITY_SERVICE;
-import static android.content.Context.WIFI_SERVICE;
-
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
-import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.SystemProperties;
import android.os.UserManager;
import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import java.lang.ref.WeakReference;
+import static android.content.Context.CONNECTIVITY_SERVICE;
+import static android.content.Context.WIFI_SERVICE;
+
/**
* Display the following information
* # Battery Strength : TODO
private static final String KEY_IP_ADDRESS = "wifi_ip_address";
private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
private static final String KEY_BT_ADDRESS = "bt_address";
- private static final String KEY_SERIAL_NUMBER = "serial_number";
private static final String KEY_WIMAX_MAC_ADDRESS = "wimax_mac_address";
private static final String KEY_SIM_STATUS = "sim_status";
private static final String KEY_IMEI_INFO = "imei_info";
private Resources mRes;
- private String mUnknown;
private String mUnavailable;
+ private SerialNumberPreferenceController mSerialNumberPreferenceController;
+
private Preference mUptime;
private Preference mBatteryStatus;
private Preference mBatteryLevel;
private Preference mIpAddress;
private Preference mWifiMacAddress;
private Preference mWimaxMacAddress;
-
private Handler mHandler;
private static class MyHandler extends Handler {
mCM = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
+ mSerialNumberPreferenceController = new SerialNumberPreferenceController(getActivity());
addPreferencesFromResource(R.xml.device_info_status);
mBatteryLevel = findPreference(KEY_BATTERY_LEVEL);
mIpAddress = findPreference(KEY_IP_ADDRESS);
mRes = getResources();
- mUnknown = mRes.getString(R.string.device_info_default);
mUnavailable = mRes.getString(R.string.status_unavailable);
// Note - missing in zaku build, be careful later...
mUptime = findPreference("up_time");
-
+ final PreferenceScreen screen = getPreferenceScreen();
if (!hasBluetooth()) {
- getPreferenceScreen().removePreference(mBtAddress);
+ screen.removePreference(mBtAddress);
mBtAddress = null;
}
if (!hasWimax()) {
- getPreferenceScreen().removePreference(mWimaxMacAddress);
+ screen.removePreference(mWimaxMacAddress);
mWimaxMacAddress = null;
}
updateConnectivity();
- String serial = Build.SERIAL;
- if (serial != null && !serial.equals("")) {
- setSummaryText(KEY_SERIAL_NUMBER, serial);
- } else {
- removePreferenceFromScreen(KEY_SERIAL_NUMBER);
- }
+ mSerialNumberPreferenceController.displayPreference(screen);
// Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
// Also remove on Wi-Fi only devices.
}
}
- /**
- * @param preference The key for the Preference item
- * @param property The system property to fetch
- * @param alt The default value, if the property doesn't exist
- */
- private void setSummary(String preference, String property, String alt) {
- try {
- findPreference(preference).setSummary(
- SystemProperties.get(property, alt));
- } catch (RuntimeException e) {
-
- }
- }
-
- private void setSummaryText(String preference, String text) {
- if (TextUtils.isEmpty(text)) {
- text = mUnknown;
- }
- // some preferences may be missing
- if (findPreference(preference) != null) {
- findPreference(preference).setSummary(text);
- }
- }
-
private void setWimaxStatus() {
if (mWimaxMacAddress != null) {
String macAddress = SystemProperties.get("net.wimax.mac.address", mUnavailable);
--- /dev/null
+/*
+ * 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.deviceinfo;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+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;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SerialNumberPreferenceControllerTest {
+
+ @Mock(answer = RETURNS_DEEP_STUBS)
+ private Context mContext;
+ @Mock(answer = RETURNS_DEEP_STUBS)
+ private PreferenceScreen mScreen;
+
+ private SerialNumberPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ @Test
+ public void testIsAvaiable_noSerial_shouldReturnFalse() {
+ mController = new SerialNumberPreferenceController(mContext, null);
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void testIsAvaiable_hasSerial_shouldReturnTrue() {
+ mController = new SerialNumberPreferenceController(mContext, "123");
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void testDisplay_noSerial_shouldHidePreference() {
+ when(mScreen.findPreference(anyString())).thenReturn(mock(Preference.class));
+
+ mController = new SerialNumberPreferenceController(mContext, null);
+ mController.displayPreference(mScreen);
+
+ verify(mScreen).removePreference(any(Preference.class));
+ }
+
+ @Test
+ public void testDisplay_hasSerial_shouldSummary() {
+ final String serial = "123";
+ final Preference preference = mock(Preference.class);
+ when(mScreen.findPreference(anyString())).thenReturn(preference);
+
+ mController = new SerialNumberPreferenceController(mContext, serial);
+ mController.displayPreference(mScreen);
+
+ verify(mScreen, never()).removePreference(any(Preference.class));
+ verify(preference).setSummary(serial);
+ }
+}