| commit | 3f45addfac3dc2cb3d6b6ed5e2584d9e548705b5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Nov 19 09:59:07 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 19 09:59:07 2024 +0000 |
| tree | b59cdaf2bd1018107a498888ee4d72c4fdff9323 | |
| parent | 194ffe48dfe87f43f8b10174b7374e538c7f130a [diff] | |
| parent | fce4a333e6feb7d931ec6006ccf45aaa3a71ca21 [diff] |
Merge "VmTerminalApp: Prefer resources in XML" into main am: 437ea10d0a am: fce4a333e6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3364138 Change-Id: I7353d27c9446d0bbfb31873dc76f382edc64d598 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsActivity.kt index 03768e9..73bb0b9 100644 --- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsActivity.kt +++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsActivity.kt
@@ -30,7 +30,6 @@ val toolbar: MaterialToolbar = findViewById(R.id.settings_toolbar) setSupportActionBar(toolbar) - supportActionBar?.title = resources.getString(R.string.action_settings) val settingsItems = arrayOf( SettingsItem( resources.getString(R.string.settings_disk_resize_title),
diff --git a/android/TerminalApp/res/layout/settings_activity.xml b/android/TerminalApp/res/layout/settings_activity.xml index 9edfd96..adeff36 100644 --- a/android/TerminalApp/res/layout/settings_activity.xml +++ b/android/TerminalApp/res/layout/settings_activity.xml
@@ -25,6 +25,7 @@ android:id="@+id/settings_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" + app:title="@string/action_settings" app:layout_constraintTop_toTopOf="parent"/> <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_list_recycler_view"