Adds Google account login during private space setup
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
This commit is contained in:
@@ -46,6 +46,7 @@ import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settings.overlay.SupportFeatureProvider;
|
||||
import com.android.settings.overlay.SurveyFeatureProvider;
|
||||
import com.android.settings.panel.PanelFeatureProvider;
|
||||
import com.android.settings.privatespace.PrivateSpaceLoginFeatureProvider;
|
||||
import com.android.settings.search.SearchFeatureProvider;
|
||||
import com.android.settings.security.SecurityFeatureProvider;
|
||||
import com.android.settings.security.SecuritySettingsFeatureProvider;
|
||||
@@ -99,6 +100,7 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
public StylusFeatureProvider mStylusFeatureProvider;
|
||||
public OnboardingFeatureProvider mOnboardingFeatureProvider;
|
||||
public FastPairFeatureProvider mFastPairFeatureProvider;
|
||||
public PrivateSpaceLoginFeatureProvider mPrivateSpaceLoginFeatureProvider;
|
||||
|
||||
/**
|
||||
* Call this in {@code @Before} method of the test class to use fake factory.
|
||||
@@ -146,6 +148,7 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
mStylusFeatureProvider = mock(StylusFeatureProvider.class);
|
||||
mOnboardingFeatureProvider = mock(OnboardingFeatureProvider.class);
|
||||
mFastPairFeatureProvider = mock(FastPairFeatureProvider.class);
|
||||
mPrivateSpaceLoginFeatureProvider = mock(PrivateSpaceLoginFeatureProvider.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -323,5 +326,10 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
public FastPairFeatureProvider getFastPairFeatureProvider() {
|
||||
return mFastPairFeatureProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PrivateSpaceLoginFeatureProvider getPrivateSpaceLoginFeatureProvider() {
|
||||
return mPrivateSpaceLoginFeatureProvider;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user