Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e23884ee authored Mar 02, 2022 by Colin Cross Committed by Automerger Merge Worker Mar 02, 2022

Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c592421

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: If31ca44328dd6794977bba78e7c07d89e7d1c796

parents b3fedd06 9c592421

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon

	@Override		@Override
	public CharSequence getSummary() {		public CharSequence getSummary() {
	return Build.VERSION.RELEASE_OR_CODENAME;		return Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY;
	}		}

	@Override		@Override

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,6 @@ public class FirmwareVersionPreferenceController extends BasePreferenceControlle

	@Override		@Override
	public CharSequence getSummary() {		public CharSequence getSummary() {
	return Build.VERSION.RELEASE_OR_CODENAME;		return Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY;
	}		}
	}		}

src/com/android/settings/deviceinfo/storage/StorageUtils.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -219,7 +219,7 @@ public class StorageUtils {
	public Dialog onCreateDialog(Bundle savedInstanceState) {		public Dialog onCreateDialog(Bundle savedInstanceState) {
	return new AlertDialog.Builder(getActivity())		return new AlertDialog.Builder(getActivity())
	.setMessage(getContext().getString(R.string.storage_detail_dialog_system,		.setMessage(getContext().getString(R.string.storage_detail_dialog_system,
	Build.VERSION.RELEASE_OR_CODENAME))		Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY))
	.setPositiveButton(android.R.string.ok, null)		.setPositiveButton(android.R.string.ok, null)
	.create();		.create();
	}		}

src/com/android/settings/system/SystemUpdatePreferenceController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {
	@Override		@Override
	public CharSequence getSummary() {		public CharSequence getSummary() {
	CharSequence summary = mContext.getString(R.string.android_version_summary,		CharSequence summary = mContext.getString(R.string.android_version_summary,
	Build.VERSION.RELEASE_OR_CODENAME);		Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY);
	final FutureTask<Bundle> bundleFutureTask = new FutureTask<>(		final FutureTask<Bundle> bundleFutureTask = new FutureTask<>(
	// Put the API call in a future to avoid StrictMode violation.		// Put the API call in a future to avoid StrictMode violation.
	() -> mUpdateManager.retrieveSystemUpdateInfo());		() -> mUpdateManager.retrieveSystemUpdateInfo());

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ public class FirmwareVersionDetailPreferenceControllerTest {

	@Test		@Test
	public void getSummary_shouldGetBuildVersion() {		public void getSummary_shouldGetBuildVersion() {
	assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_CODENAME);		assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY);
	}		}

	@Test		@Test