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

Commit 86efc33c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "CompatUI UX Improvements" into tm-qpr-dev am: b3d00601 am:... 

Merge "Merge "CompatUI UX Improvements" into tm-qpr-dev am: b3d00601 am: 2526e779" into udc-dev am: 0b253e3c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22237583



Change-Id: I6bd92c8c560c3eab74e38f9efd5f3c5cef1621e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a74d966 0b253e3c

libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml

+12 −683

File changed.

Preview size limit exceeded, changes collapsed.

libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml

+10 −683

File changed.

Preview size limit exceeded, changes collapsed.

libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml

+4 −8
Original line number Diff line number Diff line
@@ -22,48 +22,44 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <com.android.wm.shell.compatui.ReachabilityEduHandLayout

    <androidx.appcompat.widget.AppCompatTextView

        style="@style/ReachabilityEduHandLayout"

        android:text="@string/letterbox_reachability_reposition_text"

        app:drawableTopCompat="@drawable/reachability_education_ic_right_hand"

        android:layout_gravity="center_horizontal|top"

        android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin"

        android:id="@+id/reachability_move_up_button"

        android:maxWidth="@dimen/letterbox_reachability_education_item_width"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>



    <com.android.wm.shell.compatui.ReachabilityEduHandLayout

    <androidx.appcompat.widget.AppCompatTextView

        style="@style/ReachabilityEduHandLayout"

        android:text="@string/letterbox_reachability_reposition_text"

        app:drawableTopCompat="@drawable/reachability_education_ic_right_hand"

        android:layout_gravity="center_vertical|right"

        android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin"

        android:id="@+id/reachability_move_right_button"

        android:maxWidth="@dimen/letterbox_reachability_education_item_width"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>





    <com.android.wm.shell.compatui.ReachabilityEduHandLayout

    <androidx.appcompat.widget.AppCompatTextView

        style="@style/ReachabilityEduHandLayout"

        android:text="@string/letterbox_reachability_reposition_text"

        app:drawableTopCompat="@drawable/reachability_education_ic_left_hand"

        android:layout_gravity="center_vertical|left"

        android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin"

        android:id="@+id/reachability_move_left_button"

        android:maxWidth="@dimen/letterbox_reachability_education_item_width"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>



    <com.android.wm.shell.compatui.ReachabilityEduHandLayout

    <androidx.appcompat.widget.AppCompatTextView

        style="@style/ReachabilityEduHandLayout"

        android:text="@string/letterbox_reachability_reposition_text"

        app:drawableTopCompat="@drawable/reachability_education_ic_right_hand"

        android:layout_gravity="center_horizontal|bottom"

        android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin"

        android:id="@+id/reachability_move_down_button"

        android:maxWidth="@dimen/letterbox_reachability_education_item_width"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>

libs/WindowManager/Shell/res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ 
    <!-- Letterbox Dialog -->

    <color name="letterbox_dialog_background">@android:color/system_neutral1_900</color>



    <!-- Reachability Education color for hand icon and text-->

    <color name="letterbox_reachability_education_item_color">#BFC8CC</color>



    <!-- GM2 colors -->

    <color name="GM2_grey_200">#E8EAED</color>

    <color name="GM2_grey_700">#5F6368</color>

libs/WindowManager/Shell/res/values/dimen.xml

+0 −3
Original line number Diff line number Diff line
@@ -334,9 +334,6 @@ 
    <!-- The margin between the reachability dialog container and its parent. -->

    <dimen name="letterbox_reachability_education_dialog_margin">16dp</dimen>



    <!-- The width of each item in the reachability education -->

    <dimen name="letterbox_reachability_education_item_width">118dp</dimen>



    <!-- The size of the icon in the item of reachability education -->

    <dimen name="letterbox_reachability_education_item_image_size">24dp</dimen>