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

Commit f91e3b2c authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '2752-u-split_screen' into 'v1-u' 

fix: split screen crash and also theme hint toast

See merge request e/os/BlissLauncher3!73
parents b923b9cf c31ae035

quickstep/res/drawable/split_instructions_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <solid android:color="?androidprv:attr/colorAccentPrimary" />

    <solid android:color="@color/e_background_inverse" />

    <corners android:radius="@dimen/split_instructions_radius" />

</shape>
 
 No newline at end of file

quickstep/res/layout/split_instructions_view.xml

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

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

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

        android:textColor="@color/e_background"

        android:text="@string/toast_split_select_app" />



    <androidx.appcompat.widget.AppCompatTextView

        android:id="@+id/split_instructions_text_cancel"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

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

        android:textColor="@color/e_background"

        android:layout_marginStart="@dimen/split_instructions_start_margin_cancel"

        android:text="@string/toast_split_select_app_cancel"

        android:visibility="gone"/>