Create a mechanism to allow OEM config posture guidance with
'config_face_enroll_guidance_page', and customize the config
'config_face_enroll_supported_posture' with standard postures
0 : DEVICE_POSTURE_UNKNOWN
1 : DEVICE_POSTURE_CLOSED
2 : DEVICE_POSTURE_HALF_OPENED
3 : DEVICE_POSTURE_OPENED
4 : DEVICE_POSTURE_FLIPPED
For example, if we set 1 for the device, then device only
allow to enroll face in closed(folded) state, if device do
not in the allow state, we will prompt specific guidance
page activity defined in config_face_enroll_guidance_page.
At this stage , we only integrate 2 states OPENED/CLOSED through
ScreenSizeFoldProvider and register for onFoldUpdated() callback
- isFold(DEVICE_POSTURE_CLOSED): finish posture guidance
- !isFold(DEVICE_POSTURE_OPENED): launch posture guidance
- onActivityResult : reset mOnGuidanceShown false
1. Fix A11y lottie animation bug
2. Impl FoldProvider.FoldCallback
3. Register callback to ScreenSizeFoldProvider
4. Integrate back stack, skip, cancel events
- Back key : RESULT_CANCELED
- Skip btn : RESULT_SKIP
- Posture changed : RESULT_FINISHED
5. Set single instance for relative activities
6. FaceEnrollFoldPage listen for onConfigurationChanged()
7. Add empty face_posture_guidance_lottie.json for overlay
Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"
Test: Manual launch security settings face enroll, unfold device
and observe posture guidance showing fullscreen on top
Test: Fold device ensure the posture guidance activity finish
Bug: 261141826
Fixes: 231908496
Change-Id: Ib9f43f82f7d19f3f187c2f6f8984e76cd843afbc
Merged-In: Ib9f43f82f7d19f3f187c2f6f8984e76cd843afbc
248 lines
10 KiB
Java
248 lines
10 KiB
Java
/*
|
|
* Copyright (C) 2021 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.activityembedding;
|
|
|
|
import android.app.Activity;
|
|
import android.app.settings.SettingsEnums;
|
|
import android.content.ComponentName;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.util.FeatureFlagUtils;
|
|
import android.util.LayoutDirection;
|
|
import android.util.Log;
|
|
|
|
import androidx.window.embedding.ActivityFilter;
|
|
import androidx.window.embedding.ActivityRule;
|
|
import androidx.window.embedding.SplitController;
|
|
import androidx.window.embedding.SplitPairFilter;
|
|
import androidx.window.embedding.SplitPairRule;
|
|
import androidx.window.embedding.SplitPlaceholderRule;
|
|
import androidx.window.embedding.SplitRule;
|
|
|
|
import com.android.settings.Settings;
|
|
import com.android.settings.SettingsActivity;
|
|
import com.android.settings.SubSettings;
|
|
import com.android.settings.biometrics.face.FaceEnrollIntroductionInternal;
|
|
import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;
|
|
import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
|
|
import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroductionInternal;
|
|
import com.android.settings.core.FeatureFlags;
|
|
import com.android.settings.homepage.DeepLinkHomepageActivity;
|
|
import com.android.settings.homepage.DeepLinkHomepageActivityInternal;
|
|
import com.android.settings.homepage.SettingsHomepageActivity;
|
|
import com.android.settings.overlay.FeatureFactory;
|
|
import com.android.settingslib.users.AvatarPickerActivity;
|
|
|
|
import java.util.HashSet;
|
|
import java.util.Set;
|
|
|
|
/** A class to initialize split rules for activity embedding. */
|
|
public class ActivityEmbeddingRulesController {
|
|
|
|
private static final String TAG = "ActivityEmbeddingCtrl";
|
|
private static final ComponentName COMPONENT_NAME_WILDCARD = new ComponentName(
|
|
"*" /* pkg */, "*" /* cls */);
|
|
private final Context mContext;
|
|
private final SplitController mSplitController;
|
|
|
|
public ActivityEmbeddingRulesController(Context context) {
|
|
mContext = context;
|
|
mSplitController = SplitController.getInstance();
|
|
}
|
|
|
|
/**
|
|
* Set up embedding rules to place activities to the right pane.
|
|
*/
|
|
public void initRules() {
|
|
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(mContext)) {
|
|
Log.d(TAG, "Not support this feature now");
|
|
return;
|
|
}
|
|
|
|
mSplitController.clearRegisteredRules();
|
|
|
|
// Set a placeholder for home page.
|
|
registerHomepagePlaceholderRule();
|
|
|
|
registerAlwaysExpandRule();
|
|
}
|
|
|
|
/** Register a SplitPairRule for 2-pane. */
|
|
public static void registerTwoPanePairRule(Context context,
|
|
ComponentName primaryComponent,
|
|
ComponentName secondaryComponent,
|
|
String secondaryIntentAction,
|
|
int finishPrimaryWithSecondary,
|
|
int finishSecondaryWithPrimary,
|
|
boolean clearTop) {
|
|
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
|
|
return;
|
|
}
|
|
final Set<SplitPairFilter> filters = new HashSet<>();
|
|
filters.add(new SplitPairFilter(primaryComponent, secondaryComponent,
|
|
secondaryIntentAction));
|
|
|
|
SplitController.getInstance().registerRule(new SplitPairRule(filters,
|
|
finishPrimaryWithSecondary,
|
|
finishSecondaryWithPrimary,
|
|
clearTop,
|
|
ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),
|
|
ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(context),
|
|
ActivityEmbeddingUtils.getSplitRatio(context),
|
|
LayoutDirection.LOCALE));
|
|
}
|
|
|
|
/**
|
|
* Registers a {@link SplitPairRule} for all classes that Settings homepage can be invoked from.
|
|
*/
|
|
public static void registerTwoPanePairRuleForSettingsHome(Context context,
|
|
ComponentName secondaryComponent,
|
|
String secondaryIntentAction,
|
|
boolean finishPrimaryWithSecondary,
|
|
boolean finishSecondaryWithPrimary,
|
|
boolean clearTop) {
|
|
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
|
|
return;
|
|
}
|
|
|
|
registerTwoPanePairRule(
|
|
context,
|
|
new ComponentName(context, Settings.class),
|
|
secondaryComponent,
|
|
secondaryIntentAction,
|
|
finishPrimaryWithSecondary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,
|
|
finishSecondaryWithPrimary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,
|
|
clearTop);
|
|
|
|
registerTwoPanePairRule(
|
|
context,
|
|
new ComponentName(context, SettingsHomepageActivity.class),
|
|
secondaryComponent,
|
|
secondaryIntentAction,
|
|
finishPrimaryWithSecondary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,
|
|
finishSecondaryWithPrimary ? SplitRule.FINISH_ADJACENT : SplitRule.FINISH_NEVER,
|
|
clearTop);
|
|
|
|
// We should finish HomePageActivity altogether even if it shows in single pane for all deep
|
|
// link cases.
|
|
registerTwoPanePairRule(
|
|
context,
|
|
new ComponentName(context, DeepLinkHomepageActivity.class),
|
|
secondaryComponent,
|
|
secondaryIntentAction,
|
|
finishPrimaryWithSecondary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,
|
|
finishSecondaryWithPrimary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,
|
|
clearTop);
|
|
|
|
registerTwoPanePairRule(
|
|
context,
|
|
new ComponentName(context, DeepLinkHomepageActivityInternal.class),
|
|
secondaryComponent,
|
|
secondaryIntentAction,
|
|
finishPrimaryWithSecondary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,
|
|
finishSecondaryWithPrimary ? SplitRule.FINISH_ALWAYS : SplitRule.FINISH_NEVER,
|
|
clearTop);
|
|
}
|
|
|
|
/**
|
|
* Register a new SplitPairRule for Settings home.
|
|
*/
|
|
public static void registerTwoPanePairRuleForSettingsHome(Context context,
|
|
ComponentName secondaryComponent,
|
|
String secondaryIntentAction,
|
|
boolean clearTop) {
|
|
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
|
|
return;
|
|
}
|
|
|
|
registerTwoPanePairRuleForSettingsHome(
|
|
context,
|
|
secondaryComponent,
|
|
secondaryIntentAction,
|
|
true /* finishPrimaryWithSecondary */,
|
|
true /* finishSecondaryWithPrimary */,
|
|
clearTop);
|
|
}
|
|
|
|
/** Register a SplitPairRule for SubSettings if the device supports 2-pane. */
|
|
public static void registerSubSettingsPairRule(Context context, boolean clearTop) {
|
|
if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
|
|
return;
|
|
}
|
|
|
|
registerTwoPanePairRuleForSettingsHome(
|
|
context,
|
|
new ComponentName(context, SubSettings.class),
|
|
null /* secondaryIntentAction */,
|
|
clearTop);
|
|
|
|
registerTwoPanePairRuleForSettingsHome(
|
|
context,
|
|
COMPONENT_NAME_WILDCARD,
|
|
Intent.ACTION_SAFETY_CENTER,
|
|
clearTop
|
|
);
|
|
}
|
|
|
|
private void registerHomepagePlaceholderRule() {
|
|
final Set<ActivityFilter> activityFilters = new HashSet<>();
|
|
addActivityFilter(activityFilters, SettingsHomepageActivity.class);
|
|
addActivityFilter(activityFilters, Settings.class);
|
|
|
|
final Intent intent = new Intent(mContext, Settings.NetworkDashboardActivity.class);
|
|
intent.putExtra(SettingsActivity.EXTRA_IS_SECOND_LAYER_PAGE, true);
|
|
final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(
|
|
activityFilters,
|
|
intent,
|
|
false /* stickyPlaceholder */,
|
|
SplitRule.FINISH_ADJACENT,
|
|
ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(mContext),
|
|
ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(mContext),
|
|
ActivityEmbeddingUtils.getSplitRatio(mContext),
|
|
LayoutDirection.LOCALE);
|
|
|
|
mSplitController.registerRule(placeholderRule);
|
|
}
|
|
|
|
private void registerAlwaysExpandRule() {
|
|
final Set<ActivityFilter> activityFilters = new HashSet<>();
|
|
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SETTINGS_SEARCH_ALWAYS_EXPAND)) {
|
|
final Intent searchIntent = FeatureFactory.getFactory(mContext)
|
|
.getSearchFeatureProvider()
|
|
.buildSearchIntent(mContext, SettingsEnums.SETTINGS_HOMEPAGE);
|
|
addActivityFilter(activityFilters, searchIntent);
|
|
}
|
|
addActivityFilter(activityFilters, FingerprintEnrollIntroduction.class);
|
|
addActivityFilter(activityFilters, FingerprintEnrollIntroductionInternal.class);
|
|
addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class);
|
|
addActivityFilter(activityFilters, FaceEnrollIntroductionInternal.class);
|
|
addActivityFilter(activityFilters, Settings.FaceSettingsInternalActivity.class);
|
|
addActivityFilter(activityFilters, AvatarPickerActivity.class);
|
|
mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */));
|
|
}
|
|
|
|
private static void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {
|
|
activityFilters.add(new ActivityFilter(COMPONENT_NAME_WILDCARD, intent.getAction()));
|
|
}
|
|
|
|
private void addActivityFilter(Set<ActivityFilter> activityFilters,
|
|
Class<? extends Activity> activityClass) {
|
|
activityFilters.add(new ActivityFilter(new ComponentName(mContext, activityClass),
|
|
null /* intentAction */));
|
|
}
|
|
}
|