Merge "[BC25] Allow link footer to be underlined" into main

3 files changed, 16 insertions, 0 deletions

diff --git a/PermissionController/res/values/bools.xml b/PermissionController/res/values/bools.xml
index 4cfed5e79..4483fc48f 100644
--- a/PermissionController/res/values/bools.xml
+++ b/PermissionController/res/values/bools.xml
@@ -21,4 +21,5 @@
     <bool name="is_at_least_u">false</bool>
     <bool name="is_at_least_v">false</bool>
     <bool name="config_usePreferenceForAppPermissionSettings">false</bool>
+    <bool name="config_appPermissionFooterLinkPreferenceSummaryUnderlined">false</bool>
 </resources>
diff --git a/PermissionController/res/values/overlayable.xml b/PermissionController/res/values/overlayable.xml
index 510bb900f..ea7929746 100644
--- a/PermissionController/res/values/overlayable.xml
+++ b/PermissionController/res/values/overlayable.xml
@@ -78,6 +78,7 @@
 
             <item type="bool" name="config_usePreferenceForAppPermissionSettings" />
             <item type="bool" name="config_permissionFooterPreferenceIconVisible" />
+            <item type="bool" name="config_appPermissionFooterLinkPreferenceSummaryUnderlined" />
             <item type="dimen" name="permission_preference_app_icon_size" />
             <item type="dimen" name="permission_preference_permission_group_icon_size" />
 
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/AppPermissionFooterLinkPreference.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/AppPermissionFooterLinkPreference.kt
index f5f511253..01554880a 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/AppPermissionFooterLinkPreference.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/AppPermissionFooterLinkPreference.kt
@@ -19,9 +19,11 @@ package com.android.permissioncontroller.permission.ui.handheld.v36
 import android.content.Context
 import android.os.Build
 import android.util.AttributeSet
+import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.RequiresApi
 import androidx.annotation.StyleRes
+import androidx.preference.PreferenceViewHolder
 import com.android.permissioncontroller.R
 import com.android.permissioncontroller.permission.ui.handheld.PermissionPreference
 
@@ -47,4 +49,16 @@ class AppPermissionFooterLinkPreference : PermissionPreference {
     init {
         layoutResource = R.layout.app_permission_footer_link_preference
     }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        super.onBindViewHolder(holder)
+        if (
+            context.resources.getBoolean(
+                R.bool.config_appPermissionFooterLinkPreferenceSummaryUnderlined
+            )
+        ) {
+            val summary = holder.findViewById(android.R.id.summary) as TextView
+            summary.paint.isUnderlineText = true
+        }
+    }
 }