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

Commit 78eefb37 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge changes Id57adff2,I8b523c9f 

* changes:
  Fix some entrance animations for new QSHeaders
  Add privacy indicators to combined QS header
parents f645f421 3cd40e06

packages/SystemUI/res/layout/combined_qs_header.xml

+12 −0
Original line number Original line Diff line number Diff line
@@ -101,4 +101,16 @@ 
        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

    />

    />





    <FrameLayout

        android:id="@+id/privacy_container"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        android:gravity="center"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="@id/date"

        app:layout_constraintBottom_toBottomOf="@id/date"

        >

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

    </FrameLayout>



</androidx.constraintlayout.motion.widget.MotionLayout>
 
</androidx.constraintlayout.motion.widget.MotionLayout>
 
 No newline at end of file

packages/SystemUI/res/xml/combined_qs_header_scene.xml

+12 −1
Original line number Original line Diff line number Diff line
@@ -23,11 +23,22 @@ 
        app:constraintSetEnd="@id/qs_header_constraint"

        app:constraintSetEnd="@id/qs_header_constraint"

        app:constraintSetStart="@id/qqs_header_constraint">

        app:constraintSetStart="@id/qqs_header_constraint">

        <KeyFrameSet>

        <KeyFrameSet>

            <!-- These positions are to prevent visual movement of @id/date -->

            <KeyPosition

            <KeyPosition

                app:keyPositionType="pathRelative"

                app:keyPositionType="pathRelative"

                app:percentX="0"

                app:percentX="0"

                app:framePosition="50"

                app:framePosition="49"

                app:motionTarget="@id/date" />

                app:motionTarget="@id/date" />

            <KeyPosition

                app:keyPositionType="pathRelative"

                app:percentX="1"

                app:framePosition="51"

                app:motionTarget="@id/date" />

            <KeyAttribute

                app:motionTarget="@id/date"

                app:framePosition="50"

                android:alpha="0"

                />

        </KeyFrameSet>

        </KeyFrameSet>

    </Transition>

    </Transition>

packages/SystemUI/res/xml/qqs_header.xml

+18 −1
Original line number Original line Diff line number Diff line
@@ -48,6 +48,14 @@ 
        />

        />

    </Constraint>

    </Constraint>





    <Constraint

        android:id="@+id/statusIcons">

    </Constraint>



    <Constraint

        android:id="@+id/batteryRemainingIcon" >

    </Constraint>



    <Constraint

    <Constraint

        android:id="@+id/carrier_group">

        android:id="@+id/carrier_group">

        <CustomAttribute

        <CustomAttribute
@@ -56,6 +64,15 @@ 
        />

        />

    </Constraint>

    </Constraint>







    <Constraint

        android:id="@+id/privacy_container">

        <Layout

            android:layout_width="wrap_content"

            android:layout_height="0dp"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="@id/date"

            app:layout_constraintBottom_toBottomOf="@id/date"

        />

    </Constraint>





</ConstraintSet>
 
</ConstraintSet>
 
 No newline at end of file

packages/SystemUI/res/xml/qs_header.xml

+10 −1
Original line number Original line Diff line number Diff line
@@ -58,5 +58,14 @@ 
        />

        />

    </Constraint>

    </Constraint>







    <Constraint

        android:id="@+id/privacy_container">

        <Layout

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="@id/date"

            app:layout_constraintBottom_toBottomOf="@id/date"

        />

    </Constraint>

</ConstraintSet>
 
</ConstraintSet>
 
 No newline at end of file

packages/SystemUI/res/xml/split_header.xml

+24 −0
Original line number Original line Diff line number Diff line
@@ -53,5 +53,29 @@ 
        />

        />

    </Constraint>

    </Constraint>





    <Constraint

        android:id="@+id/batteryRemainingIcon">

        <Layout

            android:layout_width="wrap_content"

            android:layout_height="0dp"

            app:layout_constraintHeight_min="@dimen/split_shade_header_min_height"

            app:layout_constraintStart_toEndOf="@id/statusIcons"

            app:layout_constraintEnd_toStartOf="@id/privacy_container"

            app:layout_constraintTop_toTopOf="@id/clock"

            app:layout_constraintBottom_toBottomOf="parent"

        />

    </Constraint>



    <Constraint

        android:id="@+id/privacy_container">

        <Layout

            android:layout_width="wrap_content"

            android:layout_height="0dp"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="@id/date"

            app:layout_constraintBottom_toBottomOf="@id/date"

            app:layout_constraintStart_toEndOf="@id/batteryRemainingIcon"

        />

    </Constraint>





</ConstraintSet>
 
</ConstraintSet>
 
 No newline at end of file