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

Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev

Browse Source 
am: f99ac67bdb

Change-Id: Icf54f81733d19d91913989451a5fc07ff5f1566d
This commit is contained in:
Geoffrey Pitsch
2017-07-17 17:37:45 +00:00
committed by android-build-merger
parent 1f439e4bc7 f99ac67bdb
commit b618e8fe39
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>