Merge "Fix wrapping when zoom or large font is used" into main

This commit is contained in:
Nino Jagar
2023-11-30 07:26:39 +00:00
committed by Android (Google) Code Review

View File

@@ -40,8 +40,9 @@
<com.android.settingslib.RestrictedSwitchPreference
android:key="content_protection_preference_user_consent_work_profile_switch"
android:title="@string/content_protection_preference_user_consent_work_profile_switch_title"
settings:controller="com.android.settings.security.ContentProtectionWorkSwitchController"
settings:restrictedSwitchSummary="@string/summary_placeholder"
settings:controller="com.android.settings.security.ContentProtectionWorkSwitchController"/>
settings:useAdditionalSummary="true"/>
<com.android.settingslib.widget.FooterPreference
android:key="content_protection_preference_subpage_footer"