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

Commit 00e241f8 authored by Andy Wickham's avatar Andy Wickham
Browse files

Simplifies Tutorial fragment layout. 

Removes nested LinearLayout and RelativeLayout, as well
as a Space (instead just aligning buttons to the bottom).

Test: Manually verified result looks same as before.

Change-Id: I773079107be5f8862bae68c0f8f5bf6edff79ce8
parent ed7c8a41

quickstep/res/layout/gesture_tutorial_fragment.xml

+44 −65
Original line number Diff line number Diff line
@@ -38,24 +38,20 @@ 
        android:contentDescription="@string/gesture_tutorial_close_button_content_description"

        android:src="@drawable/gesture_tutorial_close_button"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="70dp"

        android:orientation="vertical">



    <LinearLayout

        android:id="@+id/gesture_tutorial_fragment_titles_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

            android:orientation="vertical"

            android:focusable="true">

        android:layout_marginTop="70dp"

        android:layout_alignParentTop="true"

        android:focusable="true"

        android:gravity="center_horizontal"

        android:orientation="vertical">



        <TextView

            android:id="@+id/gesture_tutorial_fragment_title_view"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

            android:layout_marginStart="@dimen/gesture_tutorial_title_margin_start_end"

            android:layout_marginEnd="@dimen/gesture_tutorial_title_margin_start_end"

            style="@style/TextAppearance.GestureTutorial.Title"/>
@@ -64,38 +60,22 @@ 
            android:id="@+id/gesture_tutorial_fragment_subtitle_view"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

            android:layout_marginTop="10dp"

            android:layout_marginStart="@dimen/gesture_tutorial_subtitle_margin_start_end"

            android:layout_marginEnd="@dimen/gesture_tutorial_subtitle_margin_start_end"

            style="@style/TextAppearance.GestureTutorial.Subtitle"/>



    </LinearLayout>



        <Space

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:layout_marginTop="48dp"

            android:layout_gravity="center_horizontal"

            android:gravity="center_horizontal"

            android:orientation="vertical"/>



    <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase

         of elevation and shadow) which is replaced by ripple effect in android:foreground -->

        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="46dp"

            android:layout_marginBottom="48dp"

            android:layout_gravity="center_horizontal">



    <Button

        android:id="@+id/gesture_tutorial_fragment_action_button"

        android:layout_width="142dp"

        android:layout_height="49dp"

        android:layout_marginEnd="@dimen/gesture_tutorial_button_margin_start_end"

        android:layout_marginBottom="48dp"

        android:layout_alignParentEnd="true"

        android:layout_alignParentBottom="true"

        android:stateListAnimator="@null"

        android:background="@drawable/gesture_tutorial_action_button_background"

        android:foreground="?android:attr/selectableItemBackgroundBorderless"
@@ -106,12 +86,11 @@ 
        android:layout_width="142dp"

        android:layout_height="49dp"

        android:layout_marginStart="@dimen/gesture_tutorial_button_margin_start_end"

        android:layout_marginBottom="48dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentBottom="true"

        android:stateListAnimator="@null"

        android:background="@null"

        android:foreground="?android:attr/selectableItemBackgroundBorderless"

        style="@style/TextAppearance.GestureTutorial.TextButtonLabel"/>



        </RelativeLayout>

    </LinearLayout>

</RelativeLayout>
 
 No newline at end of file