Merge "Support some phone information in Settings slice" (3600c033) · Commits · e / os / android_packages_apps_Settings

res/xml/my_device_info.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@
		android:title="@string/hardware_info"
		settings:keywords="@string/keywords_model_and_hardware"
		android:summary="@string/summary_placeholder"
		settings:allowDynamicSummaryInSlice="true"
		settings:controller=
		"com.android.settings.deviceinfo.DeviceModelPreferenceController" />

		@@ -109,11 +110,12 @@

		<!-- Android version -->
		<Preference
		android:key="my_device_firmware_version"
		android:key="firmware_version"
		android:order="32"
		android:title="@string/firmware_version"
		settings:keywords="@string/keywords_android_version"
		android:summary="@string/summary_placeholder"
		settings:allowDynamicSummaryInSlice="true"
		settings:controller=
		"com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController" />

+5 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,11 @@ public class DeviceModelPreferenceController extends BasePreferenceController {
		return true;
		}

		@Override
		public boolean isSliceable() {
		return true;
		}

		public static String getDeviceModel() {
		FutureTask<String> msvSuffixTask = new FutureTask<String>(new Callable<String>() {
		@Override

+5 −0

Original line number	Diff line number	Diff line
		@@ -56,4 +56,9 @@ public class FirmwareVersionPreferenceController extends BasePreferenceControlle
		FirmwareVersionDialogFragment.show(mFragment);
		return true;
		}

		@Override
		public boolean isSliceable() {
		return true;
		}
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ import org.robolectric.annotation.Config;
		@RunWith(SettingsRobolectricTestRunner.class)
		public class DeviceModelPreferenceControllerTest {

		private final String KEY = "device_model_key";
		private final String KEY = "device_model";

		@Mock
		private Fragment mFragment;
		@@ -101,6 +101,11 @@ public class DeviceModelPreferenceControllerTest {
		.add(any(HardwareInfoDialogFragment.class), eq(HardwareInfoDialogFragment.TAG));
		}

		@Test
		public void isSliceable_shouldBeTrue() {
		assertThat(mController.isSliceable()).isTrue();
		}

		private boolean containBuildModel(CharSequence result) {
		final String oracle = mContext.getResources().getString(R.string.model_summary,
		Build.MODEL);

+6 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ import org.robolectric.annotation.Resetter;
		@RunWith(SettingsRobolectricTestRunner.class)
		public class FirmwareVersionPreferenceControllerTest {

		private final String KEY = "firmware_key";
		private final String KEY = "firmware_version";

		@Mock
		private Fragment mFragment;
		@@ -103,6 +103,11 @@ public class FirmwareVersionPreferenceControllerTest {
		assertThat(result).isFalse();
		}

		@Test
		public void isSliceable_shouldBeTrue() {
		assertThat(mController.isSliceable()).isTrue();
		}

		@Implements(FirmwareVersionDialogFragment.class)
		public static class ShadowFirmwareVersionDialogFragment {