Merge "Import translations. DO NOT MERGE" into qt-r1-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 303e646..37f2f1d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2829,6 +2829,8 @@
<!-- Display settings screen, display white balance settings title [CHAR LIMIT=30] -->
<string name="display_white_balance_title">Display white balance</string>
+ <!-- Display settings screen, display white balance settings summary [CHAR LIMIT=NONE] -->
+ <string name="display_white_balance_summary"></string>
<!-- Display settings screen, setting option name to enable adaptive sleep [CHAR LIMIT=30] -->
<string name="adaptive_sleep_title">Screen attention</string>
<!-- Setting option summary when adaptive sleep is on [CHAR LIMIT=NONE] -->
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index ad06e95..54b43dc 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -93,6 +93,7 @@
<SwitchPreference
android:key="display_white_balance"
android:title="@string/display_white_balance_title"
+ android:summary="@string/display_white_balance_summary"
settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" />
<Preference
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 0ed1644..1a6c8e8 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -26,6 +26,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
+import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.core.SubSettingLauncher;
@@ -97,6 +98,7 @@
super.onCreate(savedState);
tryLaunchFontSizeSettings();
+ findViewById(R.id.content_parent).setFitsSystemWindows(false);
}
@VisibleForTesting