Count isActivityEmbedded() state to show split screen warning dialog
According to Activity#isInMultiWindowMode() API design, When the Task is in fullscreen windowing mode, and the app is in ActivityEmbedding split (two activities split left and right), Activity.isInMultiWindowMode() == true. With the reason, we should consider additional condidion for foldable device in unfolded mode, while settings activities config to embedded activity, we can't only count on isInMultiWindowMode() for split-screen mode Bug: 278176550 Bug: 276938441 Test: atest CombinedBiometricProfileSettingsTest Test: atest FingerprintSettingsFragmentTest Test: manaul go to split screen mode and try to enroll face Test: manual unfold device and enroll finger or face Change-Id: I02bd223f27889e74e67b73051531a5b4554f3de1
This commit is contained in:
@@ -82,6 +82,7 @@ import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.settingslib.RestrictedSwitchPreference;
|
||||
import com.android.settingslib.activityembedding.ActivityEmbeddingUtils;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.transition.SettingsTransitionHelper;
|
||||
import com.android.settingslib.widget.FooterPreference;
|
||||
@@ -700,7 +701,9 @@ public class FingerprintSettings extends SubSettings {
|
||||
if (KEY_FINGERPRINT_ADD.equals(key)) {
|
||||
// If it's in split mode, show the error dialog and don't need to show adding
|
||||
// fingerprint intent.
|
||||
if (getActivity().isInMultiWindowMode()) {
|
||||
final boolean isActivityEmbedded = ActivityEmbeddingUtils.isActivityEmbedded(
|
||||
getActivity());
|
||||
if (getActivity().isInMultiWindowMode() && !isActivityEmbedded) {
|
||||
BiometricsSplitScreenDialog.newInstance(TYPE_FINGERPRINT).show(
|
||||
getActivity().getSupportFragmentManager(),
|
||||
BiometricsSplitScreenDialog.class.getName());
|
||||
|
Reference in New Issue
Block a user