Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35cdb484 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I6c6c166b into eclair

* changes:
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
parents 7f8e3409 6c6c166b
Loading
Loading
Loading
Loading
+106 −111
Original line number Diff line number Diff line
@@ -21,17 +21,13 @@
  state of the device, as well as instructions on how to get past it
  depending on the state of the device.  It is the same for landscape
  and portrait.-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:id="@+id/root">

    <RelativeLayout
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:background="#70000000"
        android:gravity="center_horizontal">
    android:gravity="center_horizontal"
    android:id="@+id/root">
    
    <TextView
        android:id="@+id/carrier"
@@ -39,8 +35,8 @@
        android:layout_height="wrap_content"
        android:layout_alignParentTop="true"
        android:layout_alignParentRight="true"
            android:layout_marginTop="16dip"
            android:layout_marginRight="16dip"
        android:layout_marginTop="10dip"
        android:layout_marginRight="8dip"
        android:textAppearance="?android:attr/textAppearanceMedium"
        />

@@ -49,9 +45,9 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_below="@id/carrier"
            android:layout_marginBottom="8dip"
            android:layout_marginTop="60dip"
            android:layout_marginLeft="24dip"
        android:layout_marginBottom="10dip"
        android:layout_marginTop="52dip"
        android:layout_marginLeft="20dip"
        >

        <TextView android:id="@+id/timeDisplay"
@@ -98,7 +94,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_below="@id/date"
            android:layout_marginTop="6dip"
        android:layout_marginTop="4dip"
        android:layout_marginLeft="24dip"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:drawablePadding="4dip"
@@ -109,7 +105,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_below="@id/status1"
            android:layout_marginTop="6dip"
        android:layout_marginTop="4dip"
        android:layout_marginLeft="24dip"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:drawablePadding="4dip"
@@ -147,4 +143,3 @@

</RelativeLayout>
</FrameLayout>