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

Commit 3fa291e1 authored by Winson Chung's avatar Winson Chung
Browse files

Add max width to the screen instructions view text 

- This ensures that the instruction wraps if the text is too long

Fixes: 328577545
Fixes: 345128488
Flag: EXEMPT bugfix
Test: Visual inspection of instructions view in different languages/form
      factors
Change-Id: I73e889372a5c482277b0e4b61fb834304304c0a6
Merged-In: I73e889372a5c482277b0e4b61fb834304304c0a6
(cherry picked from commit 73cf3bc3)
parent f309097a

quickstep/res/layout/split_instructions_view.xml

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
        android:id="@+id/split_instructions_text"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:maxWidth="@dimen/split_instructions_view_max_width"

        android:textColor="?androidprv:attr/textColorOnAccent"

        android:text="@string/toast_split_select_app" />
@@ -36,6 +37,7 @@ 
        android:id="@+id/split_instructions_text_cancel"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_gravity="center_vertical"

        android:textColor="?androidprv:attr/textColorOnAccent"

        android:layout_marginStart="@dimen/split_instructions_start_margin_cancel"

        android:text="@string/toast_split_select_app_cancel"

quickstep/res/values-sw600dp/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -45,4 +45,8 @@ 
    <dimen name="allset_page_allset_text_size">38sp</dimen>

    <dimen name="allset_page_swipe_up_text_size">15sp</dimen>



    <!-- Splitscreen -->

    <!-- Max width of the split instructions view -->

    <dimen name="split_instructions_view_max_width">300dp</dimen>



</resources>

quickstep/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -464,4 +464,8 @@ 
    <dimen name="desktop_mode_floating_app_select_text_size">14sp</dimen>

    <dimen name="desktop_mode_floating_app_select_text_margin">8dp</dimen>



    <!-- Splitscreen -->

    <!-- Max width of the split instructions view -->

    <dimen name="split_instructions_view_max_width">220dp</dimen>



</resources>