diff options
| author | Android Build Prod User <android-build-prod@system.gserviceaccount.com> | 2023-03-06 08:07:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-06 08:07:23 +0000 |
| commit | 99767790a09c0093125c4e0758ac5b276bd99655 (patch) | |
| tree | fc404eee2f2da4d5f5b695665acbbdbfc55d7c68 | |
| parent | c4b63dc4850edcb4efa1170f42a93ed99f7aac7b (diff) | |
| parent | eb3edef5ada09ddfa14848b46516ee12c2695260 (diff) | |
Merge "SystemUI: Fix emergency call button shows on lock screen" into t-keystone-qcom-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt index c4e3d4e4c1b5..d905cb7280a7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt @@ -27,6 +27,7 @@ import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle +import com.android.keyguard.EmergencyCarrierArea import com.android.settingslib.Utils import com.android.systemui.R import com.android.systemui.animation.ActivityLaunchAnimator @@ -86,6 +87,8 @@ object KeyguardBottomAreaViewBinder { val indicationText: TextView = view.requireViewById(R.id.keyguard_indication_text) val indicationTextBottom: TextView = view.requireViewById(R.id.keyguard_indication_text_bottom) + val emergencyCarrierArea: EmergencyCarrierArea = + view.requireViewById(R.id.keyguard_selector_fade_container) view.clipChildren = false view.clipToPadding = false @@ -122,6 +125,16 @@ object KeyguardBottomAreaViewBinder { } else { View.INVISIBLE } + val showEmergencyButton: Boolean = + view.context.resources.getBoolean(R.bool.config_showEmergencyButton) + emergencyCarrierArea.visibility = + if (!showEmergencyButton) { + View.GONE + } else if (isVisible) { + View.VISIBLE + } else { + View.INVISIBLE + } } } @@ -138,6 +151,7 @@ object KeyguardBottomAreaViewBinder { indicationArea.alpha = alpha startButton.alpha = alpha endButton.alpha = alpha + emergencyCarrierArea.alpha = alpha } } |