380ac9a48e
This has the following changes: 1. On profile creation starts intent to add google account to the private profile for Pixel only devices. 2. On accout sign in failed show an error screen with message to try again. 3. Moves the lock setup fragment from private to main user which now calls the helper Activity as a private user which helps to setup lock. This activity can now also be called from the planned Secondary Auth settings page to set up private profile lock. 4. On set up complete use SHOW_WORK_APPS intent as a workaroud to start launcher. Bug: 308397617 Test: Manual setup Change-Id: I19b95375409f015b2a5d30fdad766c2f6baa634b
62 lines
2.5 KiB
Java
62 lines
2.5 KiB
Java
/*
|
|
* Copyright (C) 2023 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.privatespace;
|
|
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
|
|
import androidx.annotation.Nullable;
|
|
import androidx.fragment.app.FragmentActivity;
|
|
import androidx.navigation.fragment.NavHostFragment;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.SetupWizardUtils;
|
|
|
|
import com.google.android.setupdesign.util.ThemeHelper;
|
|
|
|
/** Activity class that helps in setting up of private space */
|
|
public class PrivateSpaceSetupActivity extends FragmentActivity {
|
|
public static final int SET_LOCK_ACTION = 1;
|
|
public static final int ACCOUNT_LOGIN_ACTION = 2;
|
|
public static final String EXTRA_ACTION_TYPE = "action_type";
|
|
private NavHostFragment mNavHostFragment;
|
|
@Override
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
|
|
ThemeHelper.trySetDynamicColor(this);
|
|
super.onCreate(savedInstanceState);
|
|
setContentView(R.layout.privatespace_setup_root);
|
|
mNavHostFragment = (NavHostFragment) getSupportFragmentManager()
|
|
.findFragmentById(R.id.ps_nav_host_fragment);
|
|
mNavHostFragment.getNavController().setGraph(R.navigation.privatespace_main_context_nav);
|
|
}
|
|
|
|
@Override
|
|
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
|
if (requestCode == SET_LOCK_ACTION && resultCode == RESULT_OK) {
|
|
mNavHostFragment.getNavController().navigate(R.id.action_success_fragment);
|
|
} else if (requestCode == ACCOUNT_LOGIN_ACTION) {
|
|
if (resultCode == RESULT_OK) {
|
|
mNavHostFragment.getNavController().navigate(R.id.action_set_lock_fragment);
|
|
} else {
|
|
mNavHostFragment.getNavController().navigate(R.id.action_advance_login_error);
|
|
}
|
|
}
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
}
|
|
}
|