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

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

View File

@@ -28,6 +28,10 @@
androidprv:layout_maxWidth="@dimen/keyguard_security_width" androidprv:layout_maxWidth="@dimen/keyguard_security_width"
androidprv:layout_maxHeight="@dimen/keyguard_security_height" androidprv:layout_maxHeight="@dimen/keyguard_security_height"
android:gravity="center_horizontal|top"> android:gravity="center_horizontal|top">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/keyguard_clock_container" android:id="@+id/keyguard_clock_container"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -63,6 +67,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/clock_view" /> android:layout_below="@id/clock_view" />
</RelativeLayout>
<TextView <TextView
android:id="@+id/owner_info" android:id="@+id/owner_info"
@@ -72,12 +77,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/date_owner_info_margin" android:layout_marginTop="@dimen/date_owner_info_margin"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_below="@id/keyguard_status_area"
android:textColor="?attr/bgProtectSecondaryTextColor" android:textColor="?attr/bgProtectSecondaryTextColor"
android:textSize="@dimen/widget_label_font_size" android:textSize="@dimen/widget_label_font_size"
android:letterSpacing="0.05" android:letterSpacing="0.05"
android:ellipsize="marquee" android:ellipsize="marquee"
android:singleLine="true" /> android:singleLine="true" />
</RelativeLayout> </LinearLayout>
</com.android.keyguard.KeyguardStatusView> </com.android.keyguard.KeyguardStatusView>