diff --git a/res/raw/lineage_wizard_script_managed_profile.xml b/res/raw/lineage_wizard_script_managed_profile.xml new file mode 100644 index 00000000..d32f5bba --- /dev/null +++ b/res/raw/lineage_wizard_script_managed_profile.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 8253bc5d..39247030 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,6 +21,7 @@ android.resource://org.lineageos.setupwizard/raw/lineage_wizard_script android.resource://org.lineageos.setupwizard/raw/lineage_wizard_script_user + android.resource://org.lineageos.setupwizard/raw/lineage_wizard_script_managed_profile diff --git a/src/org/lineageos/setupwizard/SetupWizardActivity.java b/src/org/lineageos/setupwizard/SetupWizardActivity.java index 7d7ddfe3..876b63d5 100644 --- a/src/org/lineageos/setupwizard/SetupWizardActivity.java +++ b/src/org/lineageos/setupwizard/SetupWizardActivity.java @@ -26,6 +26,7 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV; import android.annotation.Nullable; import android.content.Intent; import android.os.Bundle; +import android.os.UserManager; import android.util.Log; import com.google.android.setupcompat.util.WizardManagerHelper; @@ -54,6 +55,9 @@ public class SetupWizardActivity extends BaseSetupWizardActivity { Intent intent = new Intent(ACTION_LOAD); if (isPrimaryUser()) { intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri)); + } else if (getSystemService(UserManager.class).isManagedProfile()) { + intent.putExtra(EXTRA_SCRIPT_URI, getString( + R.string.lineage_wizard_script_managed_profile_uri)); } else { intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_user_uri)); diff --git a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java index a209ebb5..3ec65877 100644 --- a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java +++ b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java @@ -24,6 +24,7 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV; import android.annotation.Nullable; import android.content.Intent; import android.os.Bundle; +import android.os.UserManager; import android.util.Log; import org.lineageos.setupwizard.util.PhoneMonitor; @@ -41,7 +42,9 @@ public class SetupWizardExitActivity extends BaseSetupWizardActivity { } SetupWizardUtils.enableCaptivePortalDetection(this); PhoneMonitor.onSetupFinished(); - launchHome(); + if (!getSystemService(UserManager.class).isManagedProfile()) { + launchHome(); + } finish(); applyForwardTransition(TRANSITION_ID_FADE); Intent i = new Intent();