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

Commit 72c759e9 authored by Daniel Huang's avatar Daniel Huang Committed by Automerger Merge Worker
Browse files

Merge "[Fixed] The button label shows misaligned on the localized screen" into... 

Merge "[Fixed] The button label shows misaligned on the localized screen" into udc-dev am: 0b0e4c17

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



Change-Id: I76f86379b58bd4d129082b1b669e47be388cce6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a57b947c 0b0e4c17

packages/SystemUI/res/layout/keyboard_shortcuts_search_view.xml

+43 −38
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
                 android:layout_height="wrap_content">

        <EditText

            android:id="@+id/keyboard_shortcuts_search"

            android:layout_gravity="center_vertical|start"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="24dp"
@@ -54,20 +55,23 @@ 


        <ImageView

            android:id="@+id/keyboard_shortcuts_search_cancel"

            android:layout_gravity="center_vertical|end"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end"

            android:layout_marginTop="24dp"

            android:layout_marginBottom="24dp"

            android:layout_marginEnd="49dp"

            android:padding="16dp"

            android:contentDescription="@string/keyboard_shortcut_clear_text"

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

    </FrameLayout>



    <LinearLayout

    <HorizontalScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:scrollbars="none">

        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center_vertical"

            android:orientation="horizontal">

            <View

                android:layout_width="0dp"
@@ -76,7 +80,7 @@ 


            <Button

                android:id="@+id/shortcut_system"

            android:layout_width="120dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                style="@style/ShortCutButton"
@@ -84,7 +88,7 @@ 


            <Button

                android:id="@+id/shortcut_input"

            android:layout_width="120dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                style="@style/ShortCutButton"
@@ -92,7 +96,7 @@ 


            <Button

                android:id="@+id/shortcut_open_apps"

            android:layout_width="120dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                style="@style/ShortCutButton"
@@ -100,12 +104,13 @@ 


            <Button

                android:id="@+id/shortcut_specific_app"

            android:layout_width="120dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                style="@style/ShortCutButton"

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

        </LinearLayout>

    </HorizontalScrollView>



    <TextView

        android:id="@+id/shortcut_search_no_result"