Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove temp GAIA education screen from PS setup code

Browse Source 
With this change the temp GAIA education screen is removed from private
space setup code and adds a new loading screen with "Just a sec" title
in the activity while the gms intent in launched to fix blank screen issue.

Screenrecording link:
b/336822960#comment7

Bug: 336822960
Test: Manual
Change-Id: I9ee41835b39c194fefb970321b7a9d5a30f87306
This commit is contained in:
josephpv
2024-04-24 18:26:22 +00:00
parent 8f93b4d789
commit d27f97393d
10 changed files with 86 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
View File

@@ -29,6 +29,7 @@ import static com.android.settings.privatespace.PrivateSpaceSetupActivity.SET_LO
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.util.Log;
import androidx.activity.result.ActivityResult;
@@ -70,11 +71,20 @@ public class PrivateProfileContextHelperActivity extends FragmentActivity {
if (savedInstanceState == null) {
int action = getIntent().getIntExtra(EXTRA_ACTION_TYPE, -1);
if (action == ACCOUNT_LOGIN_ACTION) {
setContentView(R.layout.private_space_wait_screen);
PrivateSpaceLoginFeatureProvider privateSpaceLoginFeatureProvider =
FeatureFactory.getFeatureFactory().getPrivateSpaceLoginFeatureProvider();
if (!privateSpaceLoginFeatureProvider.initiateAccountLogin(
this, mAddAccountToPrivateProfile)) {
setResult(RESULT_OK);
UserHandle userHandle =
PrivateSpaceMaintainer.getInstance(this).getPrivateProfileHandle();
if (userHandle != null) {
if (!privateSpaceLoginFeatureProvider.initiateAccountLogin(
createContextAsUser(userHandle, 0), mAddAccountToPrivateProfile)) {
setResult(RESULT_OK);
finish();
}
} else {
Log.w(TAG, "Private profile user handle is null");
setResult(RESULT_CANCELED);
finish();
}
} else if (action == SET_LOCK_ACTION) {