Snap for 9552684 from b5215abde7 to tm-qpr3-release

Change-Id: I459d226e0f18c5cc1b2bc87e278e17a21be288a7

res/xml/bubble_notification_settings.xml

@@ -27,6 +27,7 @@
             android:key="bubbles_illustration"
             settings:searchable="false"
             app:lottie_rawRes="@raw/lottie_bubbles"
+            settings:dynamicColor="true"
             settings:controller="com.android.settings.notification.BubbleNotificationIllustrationPreferenceController"/>
 
         <com.android.settingslib.widget.MainSwitchPreference

src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java

@@ -36,6 +36,7 @@ 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.FaceEnrollIntroduction;
 import com.android.settings.biometrics.face.FaceEnrollIntroductionInternal;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
@@ -231,7 +232,7 @@ public class ActivityEmbeddingRulesController {
         addActivityFilter(activityFilters, FingerprintEnrollIntroductionInternal.class);
         addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class);
         addActivityFilter(activityFilters, FaceEnrollIntroductionInternal.class);
-        addActivityFilter(activityFilters, Settings.FaceSettingsInternalActivity.class);
+        addActivityFilter(activityFilters, FaceEnrollIntroduction.class);
         addActivityFilter(activityFilters, AvatarPickerActivity.class);
         addActivityFilter(activityFilters, ChooseLockPattern.class);
         mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */));

src/com/android/settings/gestures/SystemNavigationGestureSettings.java

@@ -18,6 +18,7 @@ package com.android.settings.gestures;
 
 import static android.os.UserHandle.USER_CURRENT;
 import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
@@ -74,6 +75,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
 
     private static final String KEY_SHOW_A11Y_TUTORIAL_DIALOG = "show_a11y_tutorial_dialog_bool";
 
+    private static final int MIN_LARGESCREEN_WIDTH_DP = 600;
+
     private boolean mA11yTutorialDialogShown = false;
 
     private IOverlayManager mOverlayManager;
@@ -112,6 +115,11 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
                 ServiceManager.getService(Context.OVERLAY_SERVICE));
 
         mVideoPreference = new IllustrationPreference(context);
+        Context windowContext = context.createWindowContext(TYPE_APPLICATION_OVERLAY, null);
+        if (windowContext.getResources()
+                .getConfiguration().smallestScreenWidthDp >= MIN_LARGESCREEN_WIDTH_DP) {
+            mVideoPreference.applyDynamicColor();
+        }
         setIllustrationVideo(mVideoPreference, getDefaultKey());
 
         migrateOverlaySensitivityToSettings(context, mOverlayManager);

src/com/android/settings/notification/BubbleNotificationIllustrationPreferenceController.java

@@ -18,11 +18,7 @@ package com.android.settings.notification;
 
 import android.content.Context;
 
-import androidx.preference.PreferenceScreen;
-
 import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.widget.IllustrationPreference;
-import com.android.settingslib.widget.LottieColorUtils;
 
 /**
  * Controller for the illustration shown for the feature level settings screen for bubbles.
@@ -37,13 +33,4 @@ public class BubbleNotificationIllustrationPreferenceController extends BasePref
     public int getAvailabilityStatus() {
         return AVAILABLE;
     }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        IllustrationPreference illustrationPreference = screen.findPreference(getPreferenceKey());
-        illustrationPreference.setOnBindListener(animationView -> {
-            LottieColorUtils.applyDynamicColors(mContext, animationView);
-        });
-    }
 }