diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 21300180b7e22bf16b1ef107a6ac045a972d2f64..b2da1d6ffc3f4746a3c91ba2ab3d70a2f9f61540 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -218,4 +218,7 @@ This will erase all data from your tablet\u2019s internal storage, including:\n\n
  • All your account
  • \n
  • System and app data and settings
  • \n
  • Downloaded apps
  • This will erase all data from your phone\u2019s internal storage, including:\n\n
  • All your account
  • \n
  • System and app data and settings
  • \n
  • Downloaded apps
  • + + + Updated to /e/OS v%1$s diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index 41f0360d540032833a2908202f2ae7d0e8a9ac78..c83c12b048e29b66a883ee5691a87600c02bc37d 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; +import android.os.SystemProperties; import android.os.SystemUpdateManager; import android.os.UserManager; import android.telephony.CarrierConfigManager; @@ -45,6 +46,8 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { private static final String KEY_SYSTEM_UPDATE_SETTINGS = "top_level_update"; + private static final String E_OS_VERSION_PROP = "ro.lineage.build.version"; + private final UserManager mUm; private final SystemUpdateManager mUpdateManager; @@ -88,8 +91,8 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { @Override public CharSequence getSummary() { - CharSequence summary = mContext.getString(R.string.android_version_summary, - Build.VERSION.RELEASE_OR_CODENAME); + CharSequence summary = mContext.getString(R.string.e_version_summary, + SystemProperties.get(E_OS_VERSION_PROP)); final FutureTask bundleFutureTask = new FutureTask<>( // Put the API call in a future to avoid StrictMode violation. () -> mUpdateManager.retrieveSystemUpdateInfo());