Merge "Use disabled alpha from the theme when available." into udc-dev

3 files changed, 19 insertions, 3 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt
index b8c9e035e..313798088 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt
@@ -121,7 +121,7 @@ class SafetySubpageEntryPreference(
 
         val titleView = holder.findViewById(android.R.id.title) as? TextView?
         val summaryView = holder.findViewById(android.R.id.summary) as? TextView?
-        changeEnabledState(entry.isEnabled, isEnabled(), titleView, summaryView)
+        changeEnabledState(context, entry.isEnabled, isEnabled(), titleView, summaryView)
     }
 
     override fun shouldHideSecondTarget(): Boolean = entry.iconAction == null
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryCommonViewsManager.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryCommonViewsManager.kt
index c985ba006..4be327285 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryCommonViewsManager.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryCommonViewsManager.kt
@@ -16,6 +16,7 @@
 
 package com.android.permissioncontroller.safetycenter.ui.view
 
+import android.content.Context
 import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED
 import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON
 import android.view.View
@@ -66,6 +67,8 @@ internal class SafetyEntryCommonViewsManager(rootEntryView: ViewGroup?) {
 
     companion object {
 
+        private const val DEFAULT_DISABLED_ALPHA = 0.4f
+
         /**
          * Change opacity to make some entries look disabled but still be clickable
          *
@@ -75,19 +78,31 @@ internal class SafetyEntryCommonViewsManager(rootEntryView: ViewGroup?) {
          * @param summaryView view displaying the summary text of the entry
          */
         fun changeEnabledState(
+            context: Context,
             isEntryEnabled: Boolean,
             isPreferenceEnabled: Boolean,
             titleView: TextView?,
             summaryView: TextView?
         ) {
+            val disabledAlpha = getDisabledAlpha(context)
             if (isEntryEnabled) {
                 titleView?.alpha = 1f
                 summaryView?.alpha = 1f
             } else if (isPreferenceEnabled) {
                 /* Check that preference is enabled before lowering because disabled preferences
                  * already have a low visibility */
-                titleView?.alpha = 0.4f
-                summaryView?.alpha = 0.4f
+                titleView?.alpha = disabledAlpha
+                summaryView?.alpha = disabledAlpha
+            }
+        }
+
+        private fun getDisabledAlpha(context: Context): Float {
+            val styledAttributes =
+                context.obtainStyledAttributes(intArrayOf(android.R.attr.disabledAlpha))
+            try {
+                return styledAttributes.getFloat(0, DEFAULT_DISABLED_ALPHA)
+            } finally {
+                styledAttributes.recycle()
             }
         }
     }
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryView.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryView.kt
index 1c29b92f9..ff7233686 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryView.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryView.kt
@@ -175,6 +175,7 @@ constructor(
         isClickable = true
         isEnabled = entry.pendingIntent != null
         changeEnabledState(
+            context,
             entry.isEnabled,
             isEnabled,
             commonEntryView?.titleView,