PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Colin Cross
2022-03-02 00:01:05 +00:00
committed by Gerrit Code Review
parent 3340b8e3c3 3f67f87efe
commit 9c59242102
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
View File

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

2
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
View File

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

2
src/com/android/settings/deviceinfo/storage/StorageUtils.java
View File

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

2
src/com/android/settings/system/SystemUpdatePreferenceController.java
View File

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

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

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

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

@@ -65,6 +65,6 @@ public class FirmwareVersionPreferenceControllerTest {
public void updatePreference_shouldSetSummaryToBuildNumber() { public void updatePreference_shouldSetSummaryToBuildNumber() {
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_CODENAME); assertThat(mPreference.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY);
} }
} }

4
tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
View File

@@ -139,7 +139,7 @@ public class SystemUpdatePreferenceControllerTest {
assertThat(mPreference.getSummary()) assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.android_version_summary, .isEqualTo(mContext.getString(R.string.android_version_summary,
Build.VERSION.RELEASE_OR_CODENAME)); Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY));
} }
@Test @Test
@@ -168,4 +168,4 @@ public class SystemUpdatePreferenceControllerTest {
assertThat(mPreference.getSummary()) assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.android_version_pending_update_summary)); .isEqualTo(mContext.getString(R.string.android_version_pending_update_summary));
} }
} }