diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index e5c3e06b24d..c791775ab3a 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -84,7 +84,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { public void onCreate(Bundle icicle) { super.onCreate(icicle); - if (FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2)) { + if (FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2) || true) { // Increase the number of children when the device contains more than 1 sim. final TelephonyManager telephonyManager = (TelephonyManager) getSystemService( Context.TELEPHONY_SERVICE); @@ -112,7 +112,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { @Override protected int getPreferenceScreenResId() { - return FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2) + return FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2) || true ? R.xml.device_info_settings_v2 : R.xml.device_info_settings; } @@ -149,7 +149,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { private static List buildPreferenceControllers(Context context, Activity activity, Fragment fragment, Lifecycle lifecycle) { - if (FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2)) { + if (FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2) || true) { final List controllers = new ArrayList<>(); // Device name @@ -213,7 +213,8 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { public List getXmlResourcesToIndex( Context context, boolean enabled) { final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.device_info_settings; + sir.xmlResId = FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2) || true + ? R.xml.device_info_settings_v2 : R.xml.device_info_settings; return Arrays.asList(sir); } diff --git a/src/com/android/settings/deviceinfo/BatteryInfoPreferenceController.java b/src/com/android/settings/deviceinfo/BatteryInfoPreferenceController.java index c37ff439b3b..b5c12f71af1 100644 --- a/src/com/android/settings/deviceinfo/BatteryInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BatteryInfoPreferenceController.java @@ -26,12 +26,18 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +/** + * Deprecated in About Phone V2 + * Information in this preference is available in {@link PowerUsageSummary} + */ +@Deprecated public class BatteryInfoPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index 7934ad7ced2..89df7cc3bec 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -51,7 +51,7 @@ public class DeviceModelPreferenceController extends AbstractPreferenceControlle super.displayPreference(screen); final Preference pref = screen.findPreference(KEY_DEVICE_MODEL); if (pref != null) { - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DEVICE_INFO_V2)) { + if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DEVICE_INFO_V2) || true) { pref.setSummary(mContext.getResources().getString(R.string.model_summary, getDeviceModel())); } else { diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java index 26f1ac2b53e..d1c6447d3a7 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java @@ -59,7 +59,7 @@ public class HardwareInfoDialogFragment extends InstrumentedDialogFragment { DeviceModelPreferenceController.getDeviceModel()); // Serial number - if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DEVICE_INFO_V2)) { + if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DEVICE_INFO_V2) || true) { setText(content, R.id.serial_number_label, R.id.serial_number_value, getSerialNumber()); } else { content.findViewById(R.id.serial_number_label).setVisibility(View.GONE); diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index ffdaca9891d..15ad5cf05e0 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -20,6 +20,7 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.DeviceInfoSettings; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -32,7 +33,10 @@ import java.util.List; /** * Fragment for showing device hardware info, such as MAC addresses and serial numbers + * Deprecated in About Phone V2 + * Information on this page is available in {@link DeviceInfoSettings} */ +@Deprecated public class Status extends DashboardFragment { private static final String TAG = "DeviceStatus"; diff --git a/src/com/android/settings/deviceinfo/UptimePreferenceController.java b/src/com/android/settings/deviceinfo/UptimePreferenceController.java index 8bb0df75d64..c25f984ff5e 100644 --- a/src/com/android/settings/deviceinfo/UptimePreferenceController.java +++ b/src/com/android/settings/deviceinfo/UptimePreferenceController.java @@ -19,12 +19,17 @@ package com.android.settings.deviceinfo; import android.content.Context; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractUptimePreferenceController; /** * Concrete subclass of uptime preference controller + * + * Deprecated in About Phone V2 + * Information in this preference is available in {@link PowerUsageSummary} */ +@Deprecated public class UptimePreferenceController extends AbstractUptimePreferenceController implements PreferenceControllerMixin { public UptimePreferenceController(Context context, Lifecycle lifecycle) { diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index 0aa2ab7115c..93b29486337 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -149,7 +149,6 @@ public final class SearchIndexableResources { addIndex(PrintSettingsFragment.class); addIndex(DevelopmentSettingsDashboardFragment.class); addIndex(DeviceInfoSettings.class); - addIndex(Status.class); addIndex(LegalSettings.class); addIndex(SystemDashboardFragment.class); addIndex(ResetDashboardFragment.class); diff --git a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry index 85e99c3fc74..3f4faaeff19 100644 --- a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry +++ b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry @@ -1,3 +1,4 @@ com.android.settings.development.DevelopmentSettings com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard com.android.settings.search.indexing.FakeSettingsFragment +com.android.settings.deviceinfo.Status diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java index 9f2415b0484..56343e2e9df 100644 --- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java +++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java @@ -43,6 +43,7 @@ import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; import com.android.settings.testutils.shadow.ShadowConnectivityManager; +import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.DeviceInfoUtils; @@ -61,7 +62,7 @@ import java.util.List; @Config( manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, - shadows = {ShadowUtils.class, ShadowConnectivityManager.class} + shadows = {ShadowUtils.class, ShadowConnectivityManager.class, ShadowUserManager.class} ) public class DeviceInfoSettingsTest { @@ -94,7 +95,7 @@ public class DeviceInfoSettingsTest { @Test public void getPrefXml_shouldReturnDeviceInfoXml() { - assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings); + assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings_v2); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index aa86fd97aa7..c344df34b4c 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -16,6 +16,8 @@ package com.android.settings.deviceinfo; +import static com.android.settings.deviceinfo.DeviceModelPreferenceController.getDeviceModel; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; @@ -28,6 +30,7 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.TestConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,25 +40,27 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DeviceModelPreferenceControllerTest { - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private Context mContext; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Fragment mFragment; @Mock private Preference mPreference; @Mock private PreferenceScreen mPreferenceScreen; + + private Context mContext; private DeviceModelPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; mController = new DeviceModelPreferenceController(mContext, mFragment); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())) .thenReturn(mPreference); @@ -71,7 +76,8 @@ public class DeviceModelPreferenceControllerTest { public void displayPref_shouldSetSummary() { mController.displayPreference(mPreferenceScreen); - verify(mPreference).setSummary(anyString()); + verify(mPreference).setSummary(mContext.getResources().getString(R.string.model_summary, + getDeviceModel())); } @Test