Merge "Use SystemUpdateManager to provide system update info." (644bea8e) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -8345,8 +8345,10 @@
		<!-- Backup disabled summary [CHAR LIMIT=NONE] -->
		<string name="backup_disabled">Back up disabled</string>

		<!-- Summary of device info page [CHAR LIMIT=NONE] -->
		<string name="about_summary">Updated to Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>
		<!-- Summary of Android version info [CHAR LIMIT=NONE] -->
		<string name="android_version_summary">Updated to Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>
		<!-- Summary of Android version info (when there is a pending upgrade available) [CHAR LIMIT=NONE] -->
		<string name="android_version_pending_update_summary">Update available</string>

		<!-- Title for dialog displayed when user clicks on a setting locked by an admin [CHAR LIMIT=30] -->
		<string name="disabled_by_policy_title">Action not allowed</string>

res/xml/system_dashboard_fragment.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_system_update"
		android:order="-30"
		settings:controller="com.android.settings.deviceinfo.SystemUpdatePreferenceController">
		settings:controller="com.android.settings.system.SystemUpdatePreferenceController">
		<intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
		</Preference>

		@@ -63,7 +63,7 @@
		android:key="additional_system_update_settings"
		android:title="@string/additional_system_update_settings_list_item_title"
		android:order="-31"
		settings:controller="com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController">
		settings:controller="com.android.settings.system.AdditionalSystemUpdatePreferenceController">
		<intent android:action="android.intent.action.MAIN"
		android:targetPackage="@string/additional_system_update"
		android:targetClass="@string/additional_system_update_menu" />

src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java→src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -13,13 +13,11 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings.deviceinfo;
		package com.android.settings.system;

		import android.content.Context;

		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.core.AbstractPreferenceController;

		public class AdditionalSystemUpdatePreferenceController extends BasePreferenceController {

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		import com.android.settings.backup.BackupSettingsActivityPreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
		import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
		import com.android.settings.gestures.GesturesSettingPreferenceController;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;

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

+27 −2

Original line number	Diff line number	Diff line
		@@ -13,14 +13,17 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings.deviceinfo;
		package com.android.settings.system;

		import static android.content.Context.CARRIER_CONFIG_SERVICE;
		import static android.content.Context.SYSTEM_UPDATE_SERVICE;

		import android.content.Context;
		import android.content.Intent;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.PersistableBundle;
		import android.os.SystemUpdateManager;
		import android.os.UserManager;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceScreen;
		@@ -39,10 +42,12 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {
		private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";

		private final UserManager mUm;
		private final SystemUpdateManager mUpdateManager;

		public SystemUpdatePreferenceController(Context context) {
		super(context, KEY_SYSTEM_UPDATE_SETTINGS);
		mUm = UserManager.get(context);
		mUpdateManager = (SystemUpdateManager) context.getSystemService(SYSTEM_UPDATE_SERVICE);
		}

		@Override
		@@ -84,7 +89,27 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {

		@Override
		public String getSummary() {
		return mContext.getString(R.string.about_summary, Build.VERSION.RELEASE);
		final Bundle updateInfo = mUpdateManager.retrieveSystemUpdateInfo();
		String summary = mContext.getString(R.string.android_version_summary,
		Build.VERSION.RELEASE);
		switch (updateInfo.getInt(SystemUpdateManager.KEY_STATUS)) {
		case SystemUpdateManager.STATUS_WAITING_DOWNLOAD:
		case SystemUpdateManager.STATUS_IN_PROGRESS:
		case SystemUpdateManager.STATUS_WAITING_INSTALL:
		case SystemUpdateManager.STATUS_WAITING_REBOOT:
		summary = mContext.getString(R.string.android_version_pending_update_summary);
		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);
		}
		break;
		}
		return summary;
		}

		/**