Merge branch '694-s-summary_support' into 'v1-s' (08e0cd89) · Commits · e / os / android_packages_apps_Settings

res/values/cm_strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -224,4 +224,7 @@

		<!-- Summary of /e/ version info [CHAR LIMIT=NONE] -->
		<string name="e_version_summary">Updated to /e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g></string>
		<string name="e_version_pending_update_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - update available</string>
		<string name="e_version_in_progress_update_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - update in progress</string>
		<string name="e_version_reboot_pending_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - installed reboot required</string>
		</resources>

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

+11 −12

Original line number	Diff line number	Diff line
		@@ -91,8 +91,8 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {

		@Override
		public CharSequence getSummary() {
		CharSequence summary = mContext.getString(R.string.e_version_summary,
		SystemProperties.get(E_OS_VERSION_PROP));
		final String currentVersion = SystemProperties.get(E_OS_VERSION_PROP);
		CharSequence summary = mContext.getString(R.string.e_version_summary, currentVersion);
		final FutureTask<Bundle> bundleFutureTask = new FutureTask<>(
		// Put the API call in a future to avoid StrictMode violation.
		() -> mUpdateManager.retrieveSystemUpdateInfo());
		@@ -104,21 +104,20 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {
		Log.w(TAG, "Error getting system update info.");
		return summary;
		}

		String version = updateInfo.getString(SystemUpdateManager.KEY_TITLE);
		switch (updateInfo.getInt(SystemUpdateManager.KEY_STATUS)) {
		case SystemUpdateManager.STATUS_WAITING_DOWNLOAD:
		summary = mContext.getString(R.string.e_version_pending_update_summary, version);
		break;
		case SystemUpdateManager.STATUS_IN_PROGRESS:
		case SystemUpdateManager.STATUS_WAITING_INSTALL:
		summary = mContext.getString(R.string.e_version_in_progress_update_summary, version);
		break;
		case SystemUpdateManager.STATUS_WAITING_REBOOT:
		summary = mContext.getText(R.string.android_version_pending_update_summary);
		summary = mContext.getString(R.string.e_version_reboot_pending_summary, version);
		break;
		case SystemUpdateManager.STATUS_UNKNOWN:
		Log.d(TAG, "Update statue unknown");
		// fall through to next branch
		case SystemUpdateManager.STATUS_IDLE:
		final String version = updateInfo.getString(SystemUpdateManager.KEY_TITLE);
		if (!TextUtils.isEmpty(version)) {
		summary = mContext.getString(R.string.android_version_summary, version);
		}
		default:
		summary = mContext.getString(R.string.e_version_summary, currentVersion);
		break;
		}
		return summary;