commit f7c714547f83eca1587796e705d8e8959ec05ebf
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 28 19:20:17 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 28 19:20:17 2021 +0000
tree 13ce43d5096e8fb23e9720c4de48279b8189d04e
parent f91bc70bb6e4f12f1f086c701f83436cfb60071c
parent 1d5f64b1e1c916505331c01f13cba95c727dcf65

Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev

res/values-de/arrays.xml

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 4eefc80..f47e2fb 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -265,7 +265,7 @@
     <item msgid="1249691739381713634">"Sprachlautstärke"</item>
     <item msgid="6485000384018554920">"Klingeltonlautstärke"</item>
     <item msgid="3378000878531336372">"Medienlautstärke"</item>
-    <item msgid="5272927168355895681">"Weckruflautstärke"</item>
+    <item msgid="5272927168355895681">"Weckerlautstärke"</item>
     <item msgid="4422070755065530548">"Benachrichtigungslautstärke"</item>
     <item msgid="3250654589277825306">"Bluetooth-Lautstärke"</item>
     <item msgid="4212187233638382465">"aktiv lassen"</item>
@@ -332,7 +332,7 @@
     <item msgid="4722479281326245754">"Sprachlautstärke"</item>
     <item msgid="6749550886745567276">"Klingeltonlautstärke"</item>
     <item msgid="2218685029915863168">"Medienlautstärke"</item>
-    <item msgid="4266577290496513640">"Weckruflautstärke"</item>
+    <item msgid="4266577290496513640">"Weckerlautstärke"</item>
     <item msgid="8608084169623998854">"Benachrichtigungslautstärke"</item>
     <item msgid="7948784184567841794">"Bluetooth-Lautstärke"</item>
     <item msgid="1148968792599973150">"Aktiv lassen"</item>

src/com/android/settings/core/SettingsBaseActivity.java

diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index fd6ca50..74494a7 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -61,6 +61,7 @@
     private static final int DEFAULT_REQUEST = -1;
     private static final int FULLY_EXPANDED_OFFSET = 0;
     private static final int TOOLBAR_MAX_LINE_NUMBER = 2;
+    private static final float TOOLBAR_LINE_SPACING_MULTIPLIER = 1.1f;
     private static final String KEY_IS_TOOLBAR_COLLAPSED = "is_toolbar_collapsed";
 
     protected CategoryMixin mCategoryMixin;
@@ -307,6 +308,8 @@
                             getResources().getDimensionPixelSize(
                                     R.dimen.scrim_visible_height_trigger_three_lines));
                     mCollapsingToolbarLayout.setLayoutParams(lp);
+                    mCollapsingToolbarLayout
+                            .setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);
                 } else if (count == TOOLBAR_MAX_LINE_NUMBER) {
                     final ViewGroup.LayoutParams lp = mCollapsingToolbarLayout.getLayoutParams();
                     lp.height = getResources()
@@ -315,6 +318,8 @@
                             getResources().getDimensionPixelSize(
                                     R.dimen.scrim_visible_height_trigger_two_lines));
                     mCollapsingToolbarLayout.setLayoutParams(lp);
+                    mCollapsingToolbarLayout
+                            .setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);
                 }
             }
         });