PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert^2 "Add waiting screen before PS setup completion"

Browse Source 
This reverts commit d2c91b587e.

Reason for revert: Landing the original cl as the test passes locally with changes and failed test looks to be flaky and not related to the change.

Failure is not seen in the ABTD test run results with this CL  b/331935387#comment10

Change-Id: I744e11a04b70e265c5dcfe5aa8db7237561f3a08
This commit is contained in:
Joseph Vincent
2024-04-03 08:29:09 +00:00
parent cdd9b78e22
commit 0fee5fa0b0
8 changed files with 188 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/layout/private_space_pre_finish_delay.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2024 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.
-->
<com.google.android.setupdesign.GlifLoadingLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/private_space_pre_finish"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:icon="@drawable/ic_private_space_icon"
app:sudUsePartnerHeavyTheme="true"
app:sudIllustrationType="default"
app:sucHeaderText="@string/private_space_pre_finish_title">
</com.google.android.setupdesign.GlifLoadingLayout>

13
res/navigation/privatespace_main_context_nav.xml
View File

@@ -46,6 +46,13 @@
android:id="@+id/action_retry_profile_creation"
app:destination="@id/ps_auto_advance_fragment"/>
</fragment>
<fragment android:id="@+id/ps_pre_finish_delay_fragment"
android:name="com.android.settings.privatespace.SetupPreFinishDelayFragment"
android:label="fragment_ps_pre_finish">
<action
android:id="@+id/action_success_fragment"
app:destination="@id/ps_profile_success_fragment"/>
</fragment>
<fragment android:id="@+id/ps_profile_success_fragment"
android:name="com.android.settings.privatespace.SetupSuccessFragment"
android:label="fragment_ps_success"/>
@@ -64,7 +71,7 @@
android:label="fragment_ps_lock">
<action
android:id="@+id/action_lock_success_fragment"
app:destination="@id/ps_profile_success_fragment"/>
app:destination="@id/ps_pre_finish_delay_fragment"/>
</fragment>
<fragment android:id="@+id/ps_account_intro_fragment"
android:name="com.android.settings.privatespace.PrivateSpaceGaiaEducationFragment"
@@ -76,6 +83,6 @@
android:id="@+id/action_advance_login_error"
app:destination="@id/ps_account_error_fragment"/>
</fragment>
<action android:id="@+id/action_success_fragment"
app:destination="@id/ps_profile_success_fragment"/>
<action android:id="@+id/action_pre_finish_delay_fragment"
app:destination="@id/ps_pre_finish_delay_fragment"/>
</navigation>

2
res/values/strings.xml
View File

@@ -1352,6 +1352,8 @@
<string name="private_space_use_screenlock_label">Use screen lock</string>
<!-- Label for private space lock setup button to choose a new lock. [CHAR LIMIT=50] -->
<string name="private_space_set_lock_label">Choose new lock</string>
<!-- Title for private space setup pre completion screen to add a delay. [CHAR LIMIT=30] -->
<string name="private_space_pre_finish_title">Just a sec\u2026</string>
<!-- Title for private space setup success screen. [CHAR LIMIT=30] -->
<string name="private_space_success_title">All set!</string>
<!-- Summary for the private space setup success screen. [CHAR LIMIT=NONE] -->

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

@@ -60,7 +60,7 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
private static final int ANIMATION_DURATION_MILLIS = 500;
private static final int HEADER_TEXT_MAX_LINES = 4;
private GlifLayout mRootView;
private Handler mHandler;
private static final Handler sHandler = new Handler(Looper.getMainLooper());
private int mScreenTitleIndex;
private static final List<Pair<Integer, Integer>> HEADER_ILLUSTRATION_PAIRS =
ImmutableList.of(
@@ -78,7 +78,7 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
if (getActivity() != null) {
if (++mScreenTitleIndex < HEADER_ILLUSTRATION_PAIRS.size()) {
startFadeOutAnimation();
mHandler.postDelayed(mUpdateScreenResources, DELAY_BETWEEN_SCREENS);
sHandler.postDelayed(mUpdateScreenResources, DELAY_BETWEEN_SCREENS);
} else if (PrivateSpaceMaintainer.getInstance(getActivity())
.doesPrivateSpaceExist()) {
mMetricsFeatureProvider.action(
@@ -133,8 +133,6 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
mRootView.getHeaderTextView().setBreakStrategy(BREAK_STRATEGY_SIMPLE);
mRootView.getHeaderTextView().setAccessibilityLiveRegion(ACCESSIBILITY_LIVE_REGION_POLITE);
updateHeaderAndIllustration();
mHandler = new Handler(Looper.getMainLooper());
mHandler.postDelayed(mUpdateScreenResources, DELAY_BETWEEN_SCREENS);
OnBackPressedCallback callback =
new OnBackPressedCallback(true /* enabled by default */) {
@Override
@@ -155,12 +153,16 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
@Override
public void onDestroy() {
if (mHandler != null) {
mHandler.removeCallbacks(mUpdateScreenResources);
}
sHandler.removeCallbacks(mUpdateScreenResources);
super.onDestroy();
}
@Override
public void onResume() {
sHandler.postDelayed(mUpdateScreenResources, DELAY_BETWEEN_SCREENS);
super.onResume();
}
@Override
public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETUP_SPACE_CREATION;

2
src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
View File

@@ -97,7 +97,7 @@ public class PrivateSpaceSetLockFragment extends InstrumentedFragment {
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_USE_SCREEN_LOCK);
// Simply Use default screen lock. No need to handle
NavHostFragment.findNavController(PrivateSpaceSetLockFragment.this)
.navigate(R.id.action_lock_success_fragment);
.navigate(R.id.action_pre_finish_delay_fragment);
};
}

2
src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
View File

@@ -60,7 +60,7 @@ public class PrivateSpaceSetupActivity extends FragmentActivity {
@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);
mNavHostFragment.getNavController().navigate(R.id.action_pre_finish_delay_fragment);
} else if (requestCode == ACCOUNT_LOGIN_ACTION) {
if (resultCode == RESULT_OK) {
mMetricsFeatureProvider.action(

136
src/com/android/settings/privatespace/SetupPreFinishDelayFragment.java Normal file
View File

@@ -0,0 +1,136 @@
/*
* Copyright (C) 2024 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 static android.content.Intent.ACTION_PROFILE_INACCESSIBLE;
import static android.content.Intent.ACTION_PROFILE_UNAVAILABLE;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.navigation.fragment.NavHostFragment;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.google.android.setupdesign.GlifLayout;
public class SetupPreFinishDelayFragment extends InstrumentedFragment {
private static final String TAG = "SetupPreFinishDelayFrag";
private static final Handler sHandler = new Handler(Looper.getMainLooper());
private static final int MAX_DELAY_BEFORE_SETUP_FINISH = 5000;
private boolean mActionProfileUnavailable;
private boolean mActionProfileInaccessible;
protected final BroadcastReceiver mBroadcastReceiver =
new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (intent == null) {
return;
}
String action = intent.getAction();
Log.i(TAG, "Received broadcast: " + action);
if (ACTION_PROFILE_UNAVAILABLE.equals(action)) {
mActionProfileUnavailable = true;
} else if (ACTION_PROFILE_INACCESSIBLE.equals(action)) {
mActionProfileInaccessible = true;
}
if (mActionProfileUnavailable && mActionProfileInaccessible) {
showSetupSuccessScreen();
}
}
};
private Runnable mRunnable =
() -> {
showSetupSuccessScreen();
};
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
if (android.os.Flags.allowPrivateProfile()
&& android.multiuser.Flags.enablePrivateSpaceFeatures()) {
super.onCreate(savedInstanceState);
}
}
@NonNull
@Override
public View onCreateView(
@NonNull LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
GlifLayout rootView =
(GlifLayout)
inflater.inflate(R.layout.private_space_pre_finish_delay, container, false);
OnBackPressedCallback callback =
new OnBackPressedCallback(true /* enabled by default */) {
@Override
public void handleOnBackPressed() {
// Handle the back button event. We intentionally don't want to allow back
// button to work in this screen during the setup flow.
}
};
requireActivity().getOnBackPressedDispatcher().addCallback(this, callback);
if (savedInstanceState == null) {
// TODO(b/307729746): Add a test to verify PS is locked after setup completion.
PrivateSpaceMaintainer.getInstance(getActivity()).lockPrivateSpace();
}
return rootView;
}
@Override
public void onPause() {
super.onPause();
getActivity().unregisterReceiver(mBroadcastReceiver);
}
@Override
public void onResume() {
super.onResume();
final IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(ACTION_PROFILE_UNAVAILABLE);
intentFilter.addAction(ACTION_PROFILE_INACCESSIBLE);
getActivity().registerReceiver(mBroadcastReceiver, intentFilter);
sHandler.postDelayed(mRunnable, MAX_DELAY_BEFORE_SETUP_FINISH);
}
@Override
public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETUP_PRE_FINISH;
}
private void showSetupSuccessScreen() {
sHandler.removeCallbacks(mRunnable);
NavHostFragment.findNavController(SetupPreFinishDelayFragment.this)
.navigate(R.id.action_success_fragment);
}
}

2
src/com/android/settings/privatespace/SetupSuccessFragment.java
View File

@@ -87,8 +87,6 @@ public class SetupSuccessFragment extends InstrumentedFragment {
if (activity != null) {
mMetricsFeatureProvider.action(
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_DONE);
//TODO(b/307729746): Add a test to verify PS is locked after setup completion.
PrivateSpaceMaintainer.getInstance(activity).lockPrivateSpace();
Intent allAppsIntent = new Intent(Intent.ACTION_ALL_APPS);
ResolveInfo resolveInfo =
activity.getPackageManager()