commit 6f6629e6cd307ce1e3a783613fe0d426a458d43c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 10 02:44:25 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 10 02:44:25 2024 +0000
tree e2bfbb91bbd37bca8c781f9c141113af1ddbcc03
parent 1f440aacec4e38f7fb507e96a91901dfa41f2675
parent 33aba0a6941b17b4a2ee23f9ab95074aeff68100

Merge "Fix the flicker in the Lock screen page" into 24D1-dev

res/xml/security_lockscreen_settings.xml

diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index cb1ce44..15d5303 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -69,9 +69,11 @@
             android:summary="@string/lockscreen_trivial_controls_summary"
             settings:controller="com.android.settings.display.ControlsTrivialPrivacyPreferenceController"/>
 
+        <!-- Shortcuts -->
         <Preference
             android:key="customizable_lock_screen_quick_affordances"
             android:title="@string/lockscreen_quick_affordances_title"
+            android:summary="@string/summary_placeholder"
             settings:controller="com.android.settings.display.CustomizableLockScreenQuickAffordancesPreferenceController" />
 
         <SwitchPreferenceCompat