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

Merge "Keep clock below other UI elements" into tm-qpr-dev

Browse Source
This commit is contained in:
Lucas Dupin
2022-10-24 18:21:50 +00:00
committed by Android (Google) Code Review
parent b24b559ceb 54e353a0ae
commit 6117424fe3
3 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml
View File

@@ -27,6 +27,7 @@
systemui:layout_constraintEnd_toEndOf="parent" systemui:layout_constraintEnd_toEndOf="parent"
systemui:layout_constraintTop_toTopOf="parent" systemui:layout_constraintTop_toTopOf="parent"
android:layout_marginHorizontal="@dimen/status_view_margin_horizontal" android:layout_marginHorizontal="@dimen/status_view_margin_horizontal"
android:clipChildren="false"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout

66
packages/SystemUI/res/layout/status_bar_expanded.xml
View File

@@ -32,41 +32,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" /> android:layout_width="match_parent" />
<include
layout="@layout/keyguard_bottom_area"
android:visibility="gone" />
<ViewStub
android:id="@+id/keyguard_user_switcher_stub"
android:layout="@layout/keyguard_user_switcher"
android:layout_height="match_parent"
android:layout_width="match_parent" />
<include layout="@layout/status_bar_expanded_plugin_frame"/> <include layout="@layout/status_bar_expanded_plugin_frame"/>
<include layout="@layout/dock_info_bottom_area_overlay" />
<com.android.keyguard.LockIconView
android:id="@+id/lock_icon_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<!-- Background protection -->
<ImageView
android:id="@+id/lock_icon_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/fingerprint_bg"
android:visibility="invisible"/>
<ImageView
android:id="@+id/lock_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:scaleType="centerCrop"/>
</com.android.keyguard.LockIconView>
<com.android.systemui.shade.NotificationsQuickSettingsContainer <com.android.systemui.shade.NotificationsQuickSettingsContainer
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -145,6 +112,39 @@
/> />
</com.android.systemui.shade.NotificationsQuickSettingsContainer> </com.android.systemui.shade.NotificationsQuickSettingsContainer>
<include
layout="@layout/keyguard_bottom_area"
android:visibility="gone" />
<ViewStub
android:id="@+id/keyguard_user_switcher_stub"
android:layout="@layout/keyguard_user_switcher"
android:layout_height="match_parent"
android:layout_width="match_parent" />
<include layout="@layout/dock_info_bottom_area_overlay" />
<com.android.keyguard.LockIconView
android:id="@+id/lock_icon_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<!-- Background protection -->
<ImageView
android:id="@+id/lock_icon_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/fingerprint_bg"
android:visibility="invisible"/>
<ImageView
android:id="@+id/lock_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:scaleType="centerCrop"/>
</com.android.keyguard.LockIconView>
<FrameLayout <FrameLayout
android:id="@+id/preview_container" android:id="@+id/preview_container"
android:layout_width="match_parent" android:layout_width="match_parent"

2
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
View File

@@ -127,7 +127,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
if (useLargeClock) { if (useLargeClock) {
out = mSmallClockFrame; out = mSmallClockFrame;
in = mLargeClockFrame; in = mLargeClockFrame;
if (indexOfChild(in) == -1) addView(in); if (indexOfChild(in) == -1) addView(in, 0);
direction = -1; direction = -1;
statusAreaYTranslation = mSmallClockFrame.getTop() - mStatusArea.getTop() statusAreaYTranslation = mSmallClockFrame.getTop() - mStatusArea.getTop()
+ mSmartspaceTopOffset; + mSmartspaceTopOffset;