| commit | 437ea10d0a9b3f2660e70dfe544335fc78b8445c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Nov 19 09:08:42 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Nov 19 09:08:42 2024 +0000 |
| tree | f1d3e9f1d1c7960ed6ae04f15781d28243653f65 | |
| parent | a9fc3fe44ad3e1ccaee73b4bf097da2a4acbcba7 [diff] | |
| parent | a4f63cab55664b0296006be3279d47932ec0bc20 [diff] |
Merge "VmTerminalApp: Prefer resources in XML" into main
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"