SetupWizard: update recovery after setup (e90cf31f) · Commits · e / os / android_packages_apps_SetupWizard

res/values/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,6 +110,6 @@
		<!-- Update Recovery -->
		<string name="update_recovery_title">Update Lineage Recovery</string>
		<string name="update_recovery_description">Updates Lineage Recovery on first boot subsequent to every update.</string>
		<string name="update_recovery_warning">Recovery will be updated as soon as you proceed to the next step. If you wish to keep it intact, disable this feature.</string>
		<string name="update_recovery_warning">Recovery will be updated as soon as you finish the setup. If you wish to keep it intact, disable this feature.</string>
		<string name="update_recovery_setting">Update Lineage Recovery alongside the OS</string>
		</resources>

src/org/lineageos/setupwizard/FinishActivity.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -19,8 +19,10 @@ package org.lineageos.setupwizard;

		import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_COMPLETE;
		import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
		import static org.lineageos.setupwizard.SetupWizardApp.ENABLE_RECOVERY_UPDATE;
		import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
		import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
		import static org.lineageos.setupwizard.SetupWizardApp.UPDATE_RECOVERY_PROP;

		import android.animation.Animator;
		import android.app.Activity;
		@@ -34,6 +36,7 @@ import android.graphics.Point;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.UserHandle;
		import android.os.SystemProperties;
		import android.preference.PreferenceManager;
		import android.view.View;
		import android.view.ViewAnimationUtils;
		@@ -174,6 +177,7 @@ public class FinishActivity extends BaseSetupWizardActivity {
		}
		handleEnableMetrics(mSetupWizardApp);
		handleNavKeys(mSetupWizardApp);
		handleRecoveryUpdate(mSetupWizardApp);
		final WallpaperManager wallpaperManager =
		WallpaperManager.getInstance(mSetupWizardApp);
		wallpaperManager.forgetLoadedWallpaper();
		@@ -200,6 +204,15 @@ public class FinishActivity extends BaseSetupWizardActivity {
		}
		}

		private static void handleRecoveryUpdate(SetupWizardApp setupWizardApp) {
		if (setupWizardApp.getSettingsBundle().containsKey(ENABLE_RECOVERY_UPDATE)) {
		boolean update = setupWizardApp.getSettingsBundle()
		.getBoolean(ENABLE_RECOVERY_UPDATE);

		SystemProperties.set(UPDATE_RECOVERY_PROP, String.valueOf(update));
		}
		}

		private static void writeDisableNavkeysOption(Context context, boolean enabled) {
		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

src/org/lineageos/setupwizard/SetupWizardApp.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,8 @@ public class SetupWizardApp extends Application {
		public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";
		public static final String KEY_SEND_METRICS = "send_metrics";
		public static final String DISABLE_NAV_KEYS = "disable_nav_keys";
		public static final String ENABLE_RECOVERY_UPDATE = "enable_recovery_update";
		public static final String UPDATE_RECOVERY_PROP = "persist.vendor.recovery_update";

		public static final int REQUEST_CODE_SETUP_WIFI = 0;
		public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL= 4;

src/org/lineageos/setupwizard/UpdateRecoveryActivity.java

+20 −8

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019-2020 The Calyx Institute
		* Copyright (C) 2020 The LineageOS Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -16,6 +16,9 @@

		package org.lineageos.setupwizard;

		import static org.lineageos.setupwizard.SetupWizardApp.ENABLE_RECOVERY_UPDATE;
		import static org.lineageos.setupwizard.SetupWizardApp.UPDATE_RECOVERY_PROP;

		import android.app.Activity;
		import android.content.Intent;
		import android.os.Bundle;
		@@ -30,13 +33,14 @@ import org.lineageos.setupwizard.util.SetupWizardUtils;

		public class UpdateRecoveryActivity extends BaseSetupWizardActivity {

		private static final String UPDATE_RECOVERY_PROP = "persist.vendor.recovery_update";

		private CheckBox mRecoveryUpdateCheckbox;
		private SetupWizardApp mSetupWizardApp;
		private static boolean sFirstTime = true;

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		mSetupWizardApp = (SetupWizardApp) getApplication();

		if (!SetupWizardUtils.hasRecoveryUpdater(this)) {
		Log.v(TAG, "No recovery updater, skipping UpdateRecoveryActivity");
		@@ -54,21 +58,29 @@ public class UpdateRecoveryActivity extends BaseSetupWizardActivity {
		cbView.setOnClickListener(v -> {
		mRecoveryUpdateCheckbox.setChecked(!mRecoveryUpdateCheckbox.isChecked());
		});

		// Allow overriding the default checkbox state
		if (sFirstTime) {
		mSetupWizardApp.getSettingsBundle().putBoolean(ENABLE_RECOVERY_UPDATE,
		SystemProperties.getBoolean(UPDATE_RECOVERY_PROP, true));
		}

		sFirstTime = false;
		}

		@Override
		public void onResume() {
		super.onResume();

		// Default the checkbox to true, the effect will be reflected when going next
		mRecoveryUpdateCheckbox.setChecked(
		SystemProperties.getBoolean(UPDATE_RECOVERY_PROP, true));
		final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
		final boolean checked = myPageBundle.getBoolean(ENABLE_RECOVERY_UPDATE, true);
		mRecoveryUpdateCheckbox.setChecked(checked);
		}

		@Override
		protected void onNextPressed() {
		SystemProperties.set(UPDATE_RECOVERY_PROP,
		String.valueOf(mRecoveryUpdateCheckbox.isChecked()));
		mSetupWizardApp.getSettingsBundle().putBoolean(ENABLE_RECOVERY_UPDATE,
		mRecoveryUpdateCheckbox.isChecked());

		Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK);
		nextAction(NEXT_REQUEST, intent);