Merge branch 'q-settings-improvement' into 'v1-q' (56a2b468) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Utils.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@ public final class Utils extends com.android.settingslib.Utils {
		* Set the preference's title to the matching activity's label.
		*/
		public static final int UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY = 1;
		public static final int UPDATE_PREFERENCE_FLAG_DONT_SET_TITLE_TO_MATCHING_ACTIVITY = 0;

		public static final String SETTINGS_PACKAGE_NAME = "com.android.settings";

+2 −8

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {
		if (isAvailable()) {
		Utils.updatePreferenceToSpecificActivityOrRemove(mContext, screen,
		getPreferenceKey(),
		Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
		Utils.UPDATE_PREFERENCE_FLAG_DONT_SET_TITLE_TO_MATCHING_ACTIVITY);
		}
		}

		@@ -88,8 +88,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {

		@Override
		public CharSequence getSummary() {
		CharSequence summary = mContext.getString(R.string.android_version_summary,
		Build.VERSION.RELEASE);
		CharSequence summary = "";
		final FutureTask<Bundle> bundleFutureTask = new FutureTask<>(
		// Put the API call in a future to avoid StrictMode violation.
		() -> mUpdateManager.retrieveSystemUpdateInfo());
		@@ -112,11 +111,6 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {
		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);
		}
		break;
		}
		return summary;
		}