diff options
| -rw-r--r-- | packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml | 70 |
1 files changed, 37 insertions, 33 deletions
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml index 44fae86531b3..ee14f3df5273 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml @@ -28,41 +28,46 @@ androidprv:layout_maxWidth="@dimen/keyguard_security_width" androidprv:layout_maxHeight="@dimen/keyguard_security_height" android:gravity="center_horizontal|top"> - <RelativeLayout - android:id="@+id/keyguard_clock_container" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|top"> - <TextClock - android:id="@+id/clock_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_centerHorizontal="true" - android:layout_alignParentTop="true" - android:textColor="?attr/bgProtectTextColor" - android:singleLine="true" - style="@style/widget_big_thin" - android:format12Hour="@string/keyguard_widget_12_hours_format" - android:format24Hour="@string/keyguard_widget_24_hours_format" - android:layout_marginBottom="@dimen/bottom_text_spacing_digital" /> - <com.android.systemui.ChargingView - android:id="@+id/battery_doze" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignTop="@id/clock_view" - android:layout_alignBottom="@id/clock_view" - android:layout_toEndOf="@id/clock_view" - android:visibility="invisible" - android:src="@drawable/ic_aod_charging_24dp" - android:contentDescription="@string/accessibility_ambient_display_charging" - /> - - <include layout="@layout/keyguard_status_area" - android:id="@+id/keyguard_status_area" + android:orientation="vertical"> + <RelativeLayout + android:id="@+id/keyguard_clock_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/clock_view" /> + android:layout_gravity="center_horizontal|top"> + <TextClock + android:id="@+id/clock_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_centerHorizontal="true" + android:layout_alignParentTop="true" + android:textColor="?attr/bgProtectTextColor" + android:singleLine="true" + style="@style/widget_big_thin" + android:format12Hour="@string/keyguard_widget_12_hours_format" + android:format24Hour="@string/keyguard_widget_24_hours_format" + android:layout_marginBottom="@dimen/bottom_text_spacing_digital" /> + <com.android.systemui.ChargingView + android:id="@+id/battery_doze" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@id/clock_view" + android:layout_alignBottom="@id/clock_view" + android:layout_toEndOf="@id/clock_view" + android:visibility="invisible" + android:src="@drawable/ic_aod_charging_24dp" + android:contentDescription="@string/accessibility_ambient_display_charging" + /> + + <include layout="@layout/keyguard_status_area" + android:id="@+id/keyguard_status_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/clock_view" /> + </RelativeLayout> <TextView android:id="@+id/owner_info" @@ -72,12 +77,11 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/date_owner_info_margin" android:layout_centerHorizontal="true" - android:layout_below="@id/keyguard_status_area" android:textColor="?attr/bgProtectSecondaryTextColor" android:textSize="@dimen/widget_label_font_size" android:letterSpacing="0.05" android:ellipsize="marquee" android:singleLine="true" /> - </RelativeLayout> + </LinearLayout> </com.android.keyguard.KeyguardStatusView> |