| commit | a9e99ac589164044d9f5ff9854cff3e4d19b43c9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 20 16:43:35 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 20 16:43:35 2024 +0000 |
| tree | c72f6b9cee6e24cd8c285b6ff738892343e071d8 | |
| parent | dd2bec79757fdb8b8650e4548a3613d90e0b8f93 [diff] | |
| parent | 1f3f13881c6116b80d229ba8ae2ec863a6a1bdd7 [diff] |
Merge "VmTerminalApp: Enable hyphenation if needed" into main am: d621b0a743 am: 1f3f13881c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3368057 Change-Id: I6e438a367b7e2bfe0f891ae91bd4956059e1fcf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/TerminalApp/res/layout/settings_disk_resize.xml b/android/TerminalApp/res/layout/settings_disk_resize.xml index 1a2b5ef..21ff070 100644 --- a/android/TerminalApp/res/layout/settings_disk_resize.xml +++ b/android/TerminalApp/res/layout/settings_disk_resize.xml
@@ -29,6 +29,7 @@ android:layout_width="wrap_content" android:text="@string/settings_disk_resize_title" android:textSize="48sp" + android:hyphenationFrequency="normal" android:layout_marginBottom="24dp"/> <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/android/TerminalApp/res/layout/settings_port_forwarding.xml b/android/TerminalApp/res/layout/settings_port_forwarding.xml index 199b8cb..98ba02c 100644 --- a/android/TerminalApp/res/layout/settings_port_forwarding.xml +++ b/android/TerminalApp/res/layout/settings_port_forwarding.xml
@@ -28,6 +28,7 @@ android:layout_width="wrap_content" android:text="@string/settings_port_forwarding_title" android:textSize="48sp" + android:hyphenationFrequency="normal" android:layout_marginBottom="24dp"/> <androidx.recyclerview.widget.RecyclerView @@ -35,4 +36,4 @@ android:layout_marginHorizontal="16dp" android:layout_width="match_parent" android:layout_height="match_parent" /> -</LinearLayout> \ No newline at end of file +</LinearLayout>
diff --git a/android/TerminalApp/res/layout/settings_recovery.xml b/android/TerminalApp/res/layout/settings_recovery.xml index 3f83588..c72447f 100644 --- a/android/TerminalApp/res/layout/settings_recovery.xml +++ b/android/TerminalApp/res/layout/settings_recovery.xml
@@ -28,6 +28,7 @@ android:layout_width="wrap_content" android:text="@string/settings_recovery_title" android:textSize="48sp" + android:hyphenationFrequency="normal" android:layout_marginStart="24dp" android:layout_marginBottom="24dp"/> <FrameLayout