Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue of indication area over top of customize lockscreen button

Browse Source 
This mostly adds back the xml that was removed here: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/24265928/4/packages/SystemUI/res/layout/keyguard_bottom_area.xml

See bug for detailed findings

Currently the indication area and customize lockscreen button belong to 2 different parents, which causes difficulties in z-ordering related to the shortcuts touchability and the customization button touchability.

Once the MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA flag is relased and removed, this added xml will be removed.

Fixes: 295045628
Test: manual - with no default flags
Test: manual - with split keyguard flag enabled
Change-Id: Ia6a20fe779a712e0b175f677c2b9be34584dcffa
This commit is contained in:
Brad Hinegardner
2023-08-08 22:40:48 +00:00
parent d786c5eea9
commit acf22fc5d0
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -22,6 +22,42 @@
android:layout_width="match_parent"
android:outlineProvider="none" >
<LinearLayout
android:id="@id/keyguard_indication_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom"
android:layout_gravity="bottom|center_horizontal"
android:orientation="vertical">
<com.android.systemui.statusbar.phone.KeyguardIndicationTextView
android:id="@id/keyguard_indication_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingStart="@dimen/keyguard_indication_text_padding"
android:paddingEnd="@dimen/keyguard_indication_text_padding"
android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
android:accessibilityLiveRegion="polite"/>
<com.android.systemui.statusbar.phone.KeyguardIndicationTextView
android:id="@id/keyguard_indication_text_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="@dimen/keyguard_indication_text_min_height"
android:layout_gravity="center_horizontal"
android:paddingStart="@dimen/keyguard_indication_text_padding"
android:paddingEnd="@dimen/keyguard_indication_text_padding"
android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
android:maxLines="2"
android:ellipsize="end"
android:alpha=".8"
android:accessibilityLiveRegion="polite"
android:visibility="gone"/>
</LinearLayout>
<com.android.systemui.animation.view.LaunchableImageView
android:id="@+id/start_button"
android:layout_height="@dimen/keyguard_affordance_fixed_height"

6
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
View File

@@ -137,6 +137,12 @@ constructor(
fun bindIndicationArea() {
indicationAreaHandle?.dispose()
if (!featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {
keyguardRootView.findViewById<View?>(R.id.keyguard_indication_area)?.let {
keyguardRootView.removeView(it)
}
}
indicationAreaHandle =
KeyguardIndicationAreaBinder.bind(
notificationShadeWindowView,