Make 'customize lock screen' button config aware.

Fixes: 378605071
Flag: EXEMPT bugfix
Test: change font size and it changes
Change-Id: I209dff266ef269847b68f2a2db79d44abd325b34

3 files changed, 17 insertions, 12 deletions

diff --git a/packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml b/packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml
index e47fc62c6e16..8944efb99f69 100644
--- a/packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml
+++ b/packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml
@@ -42,7 +42,6 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="@androidprv:color/materialColorOnSecondaryFixed"
-        android:textSize="14sp"
         android:maxLines="1"
         android:ellipsize="end" />
 
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSettingsViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSettingsViewBinder.kt
index 13c2ffb70220..220846d08de7 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSettingsViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSettingsViewBinder.kt
@@ -18,6 +18,7 @@
 package com.android.systemui.keyguard.ui.binder
 
 import android.graphics.Rect
+import android.util.TypedValue
 import android.view.View
 import android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED
 import android.widget.TextView
@@ -101,6 +102,13 @@ object KeyguardSettingsViewBinder {
                             }
                         }
                     }
+
+                    launch("$TAG#viewModel.textSize") {
+                        viewModel.textSize.collect { textSize ->
+                            val textView: TextView = view.requireViewById(R.id.text)
+                            textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize.toFloat())
+                        }
+                    }
                 }
             }
         return disposableHandle
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsMenuViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsMenuViewModel.kt
index 36a342b13df7..4584ea24b0f2 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsMenuViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSettingsMenuViewModel.kt
@@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.viewmodel
 
 import com.android.systemui.common.shared.model.Icon
 import com.android.systemui.common.shared.model.Text
+import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
 import com.android.systemui.keyguard.domain.interactor.KeyguardTouchHandlingInteractor
 import com.android.systemui.res.R
 import javax.inject.Inject
@@ -29,19 +30,18 @@ class KeyguardSettingsMenuViewModel
 @Inject
 constructor(
     private val interactor: KeyguardTouchHandlingInteractor,
+    configurationInteractor: ConfigurationInteractor,
 ) {
     val isVisible: Flow<Boolean> = interactor.isMenuVisible
     val shouldOpenSettings: Flow<Boolean> = interactor.shouldOpenSettings
 
-    val icon: Icon =
-        Icon.Resource(
-            res = R.drawable.ic_palette,
-            contentDescription = null,
-        )
+    val icon: Icon = Icon.Resource(res = R.drawable.ic_palette, contentDescription = null)
+
+    val text: Text = Text.Resource(res = R.string.lock_screen_settings)
 
-    val text: Text =
-        Text.Resource(
-            res = R.string.lock_screen_settings,
+    val textSize =
+        configurationInteractor.dimensionPixelSize(
+            com.android.internal.R.dimen.text_size_small_material
         )
 
     fun onTouchGestureStarted() {
@@ -49,9 +49,7 @@ constructor(
     }
 
     fun onTouchGestureEnded(isClick: Boolean) {
-        interactor.onMenuTouchGestureEnded(
-            isClick = isClick,
-        )
+        interactor.onMenuTouchGestureEnded(isClick = isClick)
     }
 
     fun onSettingsShown() {