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

Commit 54a9fd4e authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions"... 

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

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

Change-Id: I6e850608c5454ce80562a956074bc9ebe5c1597d
parents f8861798 f21625fe

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

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


    @Override

    public CharSequence getSummary() {

        return Build.VERSION.RELEASE_OR_CODENAME;

        return Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY;

    }



    @Override

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

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


    @Override

    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 Diff line number Diff line
@@ -219,7 +219,7 @@ public class StorageUtils { 
        public Dialog onCreateDialog(Bundle savedInstanceState) {

            return new AlertDialog.Builder(getActivity())

                    .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)

                    .create();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { 
    @Override

    public CharSequence getSummary() {

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

                // Put the API call in a future to avoid StrictMode violation.

                () -> mUpdateManager.retrieveSystemUpdateInfo());

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

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


    @Test

    public void getSummary_shouldGetBuildVersion() {

        assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_CODENAME);

        assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY);

    }



    @Test