Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I89bec972f19739e7f8dfcd803504e035f564adf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Huang
2023-05-09 10:32:42 +00:00
committed by Automerger Merge Worker
parent a57b947c41 0b0e4c1708
commit 2e8d3aaea9
1 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
packages/SystemUI/res/layout/keyboard_shortcuts_search_view.xml
View File

@@ -34,6 +34,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/keyboard_shortcuts_search" android:id="@+id/keyboard_shortcuts_search"
android:layout_gravity="center_vertical|start"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
@@ -54,58 +55,62 @@
<ImageView <ImageView
android:id="@+id/keyboard_shortcuts_search_cancel" android:id="@+id/keyboard_shortcuts_search_cancel"
android:layout_gravity="center_vertical|end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:layout_marginEnd="49dp" android:layout_marginEnd="49dp"
android:padding="16dp" android:padding="16dp"
android:contentDescription="@string/keyboard_shortcut_clear_text" android:contentDescription="@string/keyboard_shortcut_clear_text"
android:src="@drawable/ic_shortcutlist_search_button_cancel" /> android:src="@drawable/ic_shortcutlist_search_button_cancel" />
</FrameLayout> </FrameLayout>
<LinearLayout <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:scrollbars="none">
<View <LinearLayout
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="37dp"/>
<Button
android:id="@+id/shortcut_system"
android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:gravity="center_vertical"
style="@style/ShortCutButton" android:orientation="horizontal">
android:text="@string/keyboard_shortcut_search_category_system"/> <View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="37dp"/>
<Button <Button
android:id="@+id/shortcut_input" android:id="@+id/shortcut_system"
android:layout_width="120dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
style="@style/ShortCutButton" style="@style/ShortCutButton"
android:text="@string/keyboard_shortcut_search_category_input"/> android:text="@string/keyboard_shortcut_search_category_system"/>
<Button <Button
android:id="@+id/shortcut_open_apps" android:id="@+id/shortcut_input"
android:layout_width="120dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
style="@style/ShortCutButton" style="@style/ShortCutButton"
android:text="@string/keyboard_shortcut_search_category_open_apps"/> android:text="@string/keyboard_shortcut_search_category_input"/>
<Button <Button
android:id="@+id/shortcut_specific_app" android:id="@+id/shortcut_open_apps"
android:layout_width="120dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
style="@style/ShortCutButton" style="@style/ShortCutButton"
android:text="@string/keyboard_shortcut_search_category_current_app"/> android:text="@string/keyboard_shortcut_search_category_open_apps"/>
</LinearLayout>
<Button
android:id="@+id/shortcut_specific_app"
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 <TextView
android:id="@+id/shortcut_search_no_result" android:id="@+id/shortcut_search_no_result"