From 488211c752d0dd3c6035aad2c5d337c05bfe341e Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Tue, 23 Nov 2021 11:39:43 +0800 Subject: [PATCH] Make fingerprint registration flow full screen Since the fingerprint registration sometimes has a hardware dependency, to bring a better UX, make the flow full screen on large screen devices. Bug: 197717071 Test: Try to register a new fingerprint and see the pages are full screen. Change-Id: I5dcb720a8b6a58bd9fc67ecae35f730c20a2c4d3 --- .../ActivityEmbeddingRulesController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java index 667c8044cdd..076945e49c4 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java @@ -25,6 +25,7 @@ import android.util.Log; import androidx.annotation.NonNull; 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; @@ -33,6 +34,8 @@ import androidx.window.embedding.SplitRule; import com.android.settings.Settings; import com.android.settings.SubSettings; +import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling; +import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction; import com.android.settings.homepage.DeepLinkHomepageActivity; import com.android.settings.homepage.SettingsHomepageActivity; import com.android.settings.homepage.SliceDeepLinkHomepageActivity; @@ -65,6 +68,8 @@ public class ActivityEmbeddingRulesController { // Set a placeholder for home page. registerHomepagePlaceholderRule(); + + registerAlwaysExpandRule(); } /** Register a SplitPairRule for 2-pane. */ @@ -173,6 +178,13 @@ public class ActivityEmbeddingRulesController { mSplitController.registerRule(placeholderRule); } + private void registerAlwaysExpandRule() { + final Set activityFilters = new HashSet<>(); + addActivityFilter(activityFilters, FingerprintEnrollIntroduction.class); + addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class); + mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */)); + } + private void addActivityFilter(Set activityFilters, Class activityClass) { activityFilters.add(new ActivityFilter(getComponentName(activityClass),