Misc fixes in device info page

- 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

tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java

@@ -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

tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java

@@ -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);
     }
 

tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java

@@ -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);

tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java

@@ -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);