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

Misc fixes in device info page

Browse Source 
- Move DeviceInfoSettings to deviceinfo package
- Remove deprecated manifest entries
- Rename a bunch of things
- Add ripple and change text color to accent for security patch

Change-Id: I35c04e53829a67cba553f984ad1a1b9319077873
Fixes: 71775150
Test: robotests
This commit is contained in:
Fan Zhang
2018-01-10 15:58:20 -08:00
parent 66898b0cc9
commit 1f37d2cc7a
13 changed files with 45 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
AndroidManifest.xml
View File

@@ -1006,7 +1006,7 @@
<meta-data android:name="com.android.settings.title"
android:resource="@string/about_settings" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.DeviceInfoSettings" />
android:value="com.android.settings.deviceinfo.DeviceInfoSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
@@ -1782,45 +1782,6 @@
<activity android:name=".EncryptionInterstitial"
android:theme="@style/GlifTheme.Light" />
<activity android:name=".Settings$StatusActivity"
android:label="@string/device_status_activity_title"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$DeviceInfoSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.Status" />
</activity>
<!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".Settings$SimStatusActivity"
android:label="@string/sim_status_title"
android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.SimStatus" />
</activity>
<!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".Settings$ImeiInformationActivity"
android:label="@string/imei_information_title"
android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.ImeiInformation" />
</activity>
<activity android:name=".Settings$StorageDashboardActivity"
android:label="@string/storage_settings"
android:icon="@drawable/ic_settings_storage"

4
res/layout/dialog_firmware_version.xml
View File

@@ -47,7 +47,9 @@
style="@style/device_info_dialog_value"
android:id="@+id/security_patch_level_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:textColor="?android:attr/colorAccent"/>
<TextView
style="@style/device_info_dialog_label"

0
res/xml/device_info_settings_v2.xml → res/xml/device_info_settings.xml
View File

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -20,7 +20,6 @@ import com.android.settings.ApnEditor;
import com.android.settings.ApnSettings;
import com.android.settings.DateTimeSettings;
import com.android.settings.DeviceAdminSettings;
import com.android.settings.DeviceInfoSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.IccLockSettings;
import com.android.settings.MasterClear;
@@ -64,6 +63,7 @@ import com.android.settings.datausage.DataUsageList;
import com.android.settings.datausage.DataUsageSummary;
import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
import com.android.settings.development.DevelopmentSettingsDashboardFragment;
import com.android.settings.deviceinfo.DeviceInfoSettings;
import com.android.settings.deviceinfo.PrivateVolumeForget;
import com.android.settings.deviceinfo.PrivateVolumeSettings;
import com.android.settings.deviceinfo.PublicVolumeSettings;

36
src/com/android/settings/DeviceInfoSettings.java → src/com/android/settings/deviceinfo/DeviceInfoSettings.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings;
package com.android.settings.deviceinfo;
import android.app.Activity;
import android.app.Fragment;
@@ -26,23 +26,13 @@ import android.support.annotation.VisibleForTesting;
import android.telephony.TelephonyManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;
import com.android.settings.deviceinfo.BuildNumberPreferenceController;
import com.android.settings.deviceinfo.DeviceModelPreferenceController;
import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
import com.android.settings.deviceinfo.FeedbackPreferenceController;
import com.android.settings.deviceinfo.ImsStatusPreferenceController;
import com.android.settings.deviceinfo.IpAddressPreferenceController;
import com.android.settings.deviceinfo.ManualPreferenceController;
import com.android.settings.deviceinfo.PhoneNumberPreferenceController;
import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController;
import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController;
import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -84,8 +74,8 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
|| !arguments.containsKey(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY)) {
// Increase the number of children when the device contains more than 1 sim.
final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(
Context.TELEPHONY_SERVICE);
final TelephonyManager telephonyManager = (TelephonyManager) getContext()
.getSystemService(Context.TELEPHONY_SERVICE);
final int numberOfChildren = Math.max(SIM_PREFERENCES_COUNT,
SIM_PREFERENCES_COUNT * telephonyManager.getPhoneCount())
+ NON_SIM_PREFERENCES_COUNT;
@@ -110,7 +100,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
@Override
protected int getPreferenceScreenResId() {
return R.xml.device_info_settings_v2;
return R.xml.device_info_settings;
}
@Override
@@ -148,10 +138,10 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
Activity activity, Fragment fragment, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new PhoneNumberPreferenceController(context));
controllers.add(new SimStatusPreferenceControllerV2(context, fragment));
controllers.add(new SimStatusPreferenceController(context, fragment));
controllers.add(new DeviceModelPreferenceController(context, fragment));
controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));
controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));
controllers.add(new ImeiInfoPreferenceController(context, fragment));
controllers.add(new FirmwareVersionPreferenceController(context, fragment));
controllers.add(new ImsStatusPreferenceController(context, lifecycle));
controllers.add(new IpAddressPreferenceController(context, lifecycle));
controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
@@ -176,7 +166,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.device_info_settings_v2;
sir.xmlResId = R.xml.device_info_settings;
return Arrays.asList(sir);
}

5
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2.java → src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
View File

@@ -26,20 +26,19 @@ import android.text.TextUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
public class FirmwareVersionPreferenceControllerV2 extends AbstractPreferenceController implements
public class FirmwareVersionPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
private final static String FIRMWARE_VERSION_KEY = "firmware_version";
private final Fragment mFragment;
public FirmwareVersionPreferenceControllerV2(Context context, Fragment fragment) {
public FirmwareVersionPreferenceController(Context context, Fragment fragment) {
super(context);
mFragment = fragment;
}
@Override
public boolean isAvailable() {
return true;

4
src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java → src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
View File

@@ -35,7 +35,7 @@ import java.util.List;
/**
* Controller that manages preference for single and multi sim devices.
*/
public class ImeiInfoPreferenceControllerV2 extends
public class ImeiInfoPreferenceController extends
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
private static final String KEY_IMEI_INFO = "imei_info";
@@ -45,7 +45,7 @@ public class ImeiInfoPreferenceControllerV2 extends
private final List<Preference> mPreferenceList = new ArrayList<>();
private final Fragment mFragment;
public ImeiInfoPreferenceControllerV2(Context context, Fragment fragment) {
public ImeiInfoPreferenceController(Context context, Fragment fragment) {
super(context);
mFragment = fragment;

4
src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java → src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
View File

@@ -32,7 +32,7 @@ import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceCon
import java.util.ArrayList;
import java.util.List;
public class SimStatusPreferenceControllerV2 extends
public class SimStatusPreferenceController extends
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
private static final String KEY_SIM_STATUS = "sim_status";
@@ -42,7 +42,7 @@ public class SimStatusPreferenceControllerV2 extends
private final Fragment mFragment;
private final List<Preference> mPreferenceList = new ArrayList<>();
public SimStatusPreferenceControllerV2(Context context, Fragment fragment) {
public SimStatusPreferenceController(Context context, Fragment fragment) {
super(context);
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

2
src/com/android/settings/search/SearchIndexableResources.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.search;
import android.support.annotation.VisibleForTesting;
import com.android.settings.DateTimeSettings;
import com.android.settings.DeviceInfoSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.LegalSettings;
import com.android.settings.accessibility.AccessibilitySettings;
@@ -39,6 +38,7 @@ import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
import com.android.settings.datausage.DataUsageSummary;
import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
import com.android.settings.development.DevelopmentSettingsDashboardFragment;
import com.android.settings.deviceinfo.DeviceInfoSettings;
import com.android.settings.deviceinfo.StorageDashboardFragment;
import com.android.settings.deviceinfo.StorageSettings;
import com.android.settings.display.AmbientDisplaySettings;

17
tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java → tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 The Android Open Source Project
* Copyright (C) 2018 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.
@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.android.settings;
package com.android.settings.deviceinfo;
import static com.android.settings.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT;
import static com.android.settings.DeviceInfoSettings.SIM_PREFERENCES_COUNT;
import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
import static com.android.settings.deviceinfo.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT;
import static com.android.settings.deviceinfo.DeviceInfoSettings.SIM_PREFERENCES_COUNT;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
@@ -33,6 +33,8 @@ import android.os.Bundle;
import android.support.v7.preference.PreferenceScreen;
import android.telephony.TelephonyManager;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -51,6 +53,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import java.util.List;
@@ -82,12 +85,14 @@ public class DeviceInfoSettingsTest {
mSettings = spy(new DeviceInfoSettings());
doReturn(mActivity).when(mSettings).getActivity();
doReturn(mContext).when(mSettings).getContext();
doReturn(mContext.getTheme()).when(mActivity).getTheme();
doReturn(mContext.getResources()).when(mSettings).getResources();
doNothing().when(mSettings).onCreatePreferences(any(), any());
doReturn(mScreen).when(mSettings).getPreferenceScreen();
doReturn(mTelephonyManager).when(mSettings).getSystemService(Context.TELEPHONY_SERVICE);
ShadowApplication.getInstance().setSystemService(Context.TELEPHONY_SERVICE,
mTelephonyManager);
}
@Test
@@ -95,7 +100,7 @@ public class DeviceInfoSettingsTest {
SettingsShadowSystemProperties.class
})
public void getPrefXml_shouldReturnDeviceInfoXml() {
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings_v2);
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
}
@Test

6
tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
View File

@@ -44,7 +44,7 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FirmwareVersionPreferenceControllerV2Test {
public class FirmwareVersionPreferenceControllerTest {
@Mock
private Preference mPreference;
@@ -54,13 +54,13 @@ public class FirmwareVersionPreferenceControllerV2Test {
private Fragment mFragment;
private Context mContext;
private FirmwareVersionPreferenceControllerV2 mController;
private FirmwareVersionPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new FirmwareVersionPreferenceControllerV2(mContext, mFragment);
mController = new FirmwareVersionPreferenceController(mContext, mFragment);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}

6
tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
View File

@@ -50,7 +50,7 @@ import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ImeiInfoPreferenceControllerV2Test {
public class ImeiInfoPreferenceControllerTest {
@Mock
private Preference mPreference;
@@ -66,14 +66,14 @@ public class ImeiInfoPreferenceControllerV2Test {
private Fragment mFragment;
private Context mContext;
private ImeiInfoPreferenceControllerV2 mController;
private ImeiInfoPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
mController = spy(new ImeiInfoPreferenceControllerV2(mContext, mFragment));
mController = spy(new ImeiInfoPreferenceController(mContext, mFragment));
doReturn(true).when(mController).isAvailable();
when(mScreen.getContext()).thenReturn(mContext);
doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);

6
tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
View File

@@ -47,7 +47,7 @@ import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SimStatusPreferenceControllerV2Test {
public class SimStatusPreferenceControllerTest {
@Mock
private Preference mPreference;
@@ -63,14 +63,14 @@ public class SimStatusPreferenceControllerV2Test {
private Fragment mFragment;
private Context mContext;
private SimStatusPreferenceControllerV2 mController;
private SimStatusPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
mController = spy(new SimStatusPreferenceControllerV2(mContext, mFragment));
mController = spy(new SimStatusPreferenceController(mContext, mFragment));
doReturn(true).when(mController).isAvailable();
when(mScreen.getContext()).thenReturn(mContext);
doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);