diff options
Diffstat (limited to 'packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml')
| -rw-r--r-- | packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml index 28c61663bd4d..87a9825af1cb 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml @@ -51,7 +51,7 @@ android:id="@+id/lockscreen_clock_view_large" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/keyguard_status_area" + android:layout_below="@id/keyguard_slice_view" android:visibility="gone"> <com.android.keyguard.AnimatableClockView android:id="@+id/animatable_clock_view_large" @@ -68,19 +68,28 @@ lockScreenWeight="400" /> </FrameLayout> - <include layout="@layout/keyguard_status_area" + + <!-- Not quite optimal but needed to translate these items as a group. The + NotificationIconContainer has its own logic for translation. --> + <LinearLayout android:id="@+id/keyguard_status_area" + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_below="@id/lockscreen_clock_view" /> + android:layout_below="@id/lockscreen_clock_view"> - <com.android.systemui.statusbar.phone.NotificationIconContainer - android:id="@+id/left_aligned_notification_icon_container" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_shelf_height" - android:layout_below="@id/keyguard_status_area" - android:paddingStart="@dimen/below_clock_padding_start_icons" - android:visibility="invisible" - /> + <include layout="@layout/keyguard_slice_view" + android:id="@+id/keyguard_slice_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <com.android.systemui.statusbar.phone.NotificationIconContainer + android:id="@+id/left_aligned_notification_icon_container" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_shelf_height" + android:paddingStart="@dimen/below_clock_padding_start_icons" + android:visibility="invisible" + /> + </LinearLayout> </com.android.keyguard.KeyguardClockSwitch> |