Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69617f80 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24077619',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24077619', 'googleplex-android-review.googlesource.com/24130084', 'googleplex-android-review.googlesource.com/24147764', 'googleplex-android-review.googlesource.com/24133051', 'googleplex-android-review.googlesource.com/24134363', 'googleplex-android-review.googlesource.com/24133208', 'googleplex-android-review.googlesource.com/24157194'] into udc-release.

Change-Id: I1be7d1e10152d41939c84275b50ceb94b41c6b25
parents 59f52175 58d31fbf

core/res/res/values/config.xml

+11 −0
Original line number Diff line number Diff line
@@ -2560,6 +2560,17 @@ 
         assistant activities (ACTIVITY_TYPE_ASSISTANT) -->

    <bool name="config_dismissDreamOnActivityStart">false</bool>



    <!-- Whether to send a user activity event to PowerManager when a dream quits unexpectedly so

         that the screen won't immediately shut off.



         When a dream stops unexpectedly, such as due to an app update, if the device has been

         inactive less than the user's screen timeout, the device goes to keyguard and times out

         back to dreaming after a few seconds. If the device has been inactive longer, the screen

         will immediately turn off. With this flag on, the device will go back to keyguard in all

         scenarios rather than turning off, which gives the device a chance to start dreaming

         again. -->

    <bool name="config_resetScreenTimeoutOnUnexpectedDreamExit">false</bool>



    <!-- The prefixes of dream component names that are loggable.

         Matched against ComponentName#flattenToString() for dream components.

         If empty, logs "other" for all. -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2207,6 +2207,7 @@ 
  <java-symbol type="array" name="config_supportedDreamComplications" />

  <java-symbol type="array" name="config_disabledDreamComponents" />

  <java-symbol type="bool" name="config_dismissDreamOnActivityStart" />

  <java-symbol type="bool" name="config_resetScreenTimeoutOnUnexpectedDreamExit" />

  <java-symbol type="integer" name="config_dreamOverlayReconnectTimeoutMs" />

  <java-symbol type="integer" name="config_dreamOverlayMaxReconnectAttempts" />

  <java-symbol type="integer" name="config_minDreamOverlayDurationMs" />

packages/SystemUI/res/layout/activity_rear_display_education.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        app:cardCornerRadius="28dp"

        app:cardBackgroundColor="@color/rear_display_overlay_animation_background_color">



            <com.airbnb.lottie.LottieAnimationView

            <com.android.systemui.reardisplay.RearDisplayEducationLottieViewWrapper

                android:id="@+id/rear_display_folded_animation"

                android:importantForAccessibility="no"

                android:layout_width="@dimen/rear_display_animation_width"

packages/SystemUI/res/layout/activity_rear_display_education_opened.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        app:cardCornerRadius="28dp"

        app:cardBackgroundColor="@color/rear_display_overlay_animation_background_color">



        <com.airbnb.lottie.LottieAnimationView

        <com.android.systemui.reardisplay.RearDisplayEducationLottieViewWrapper

            android:id="@+id/rear_display_folded_animation"

            android:importantForAccessibility="no"

            android:layout_width="@dimen/rear_display_animation_width_opened"

packages/SystemUI/res/layout/auth_biometric_contents.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


        <include layout="@layout/auth_biometric_icon"/>



        <com.airbnb.lottie.LottieAnimationView

        <com.android.systemui.biometrics.BiometricPromptLottieViewWrapper

            android:id="@+id/biometric_icon_overlay"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"