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

Commit 1800fe98 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents 48bb98b9 9985867a

core/res/res/layout/keyguard_screen_sim_pin_landscape.xml

+22 −10
Original line number Diff line number Diff line
@@ -23,6 +23,28 @@ 
    android:background="@android:color/background_dark"

        >



    <!-- header text ('Enter Pin Code') -->

    <TextView android:id="@+id/headerText"

        android:layout_above="@+id/carrier"

        android:layout_centerHorizontal="true"

        android:layout_marginBottom="30dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="24sp"

            />



    <!-- Carrier info -->

    <TextView android:id="@+id/carrier"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_above="@+id/pinDisplayGroup"

        android:layout_marginTop="9dip"

        android:gravity="left|bottom"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium"

    />



    <!-- displays dots as user enters pin -->

    <LinearLayout android:id="@+id/pinDisplayGroup"

        android:orientation="horizontal"
@@ -60,16 +82,6 @@ 


    </LinearLayout>

        

    <!-- header text ('Enter Pin Code') -->

    <TextView android:id="@+id/headerText"

        android:layout_above="@id/pinDisplayGroup"

        android:layout_centerHorizontal="true"

        android:layout_marginBottom="30dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="24sp"

            />



    <LinearLayout

        android:orientation="horizontal"

        android:layout_alignParentBottom="true"

core/res/res/layout/keyguard_screen_tab_unlock.xml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
        android:layout_marginRight="8dip"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:gravity="right|bottom"

        android:textAppearance="?android:attr/textAppearanceMedium"

        />

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
            android:layout_marginTop="20dip"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:gravity="right|bottom"

            android:textAppearance="?android:attr/textAppearanceMedium"

            />

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
            android:layout_marginTop="32dip"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:gravity="right|bottom"

            />

        <com.android.internal.widget.DigitalClock android:id="@+id/time"

            android:layout_width="wrap_content"

core/res/res/layout/keyguard_screen_unlock_portrait.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
            android:layout_toRightOf="@+id/time"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:gravity="right|bottom"

            android:textAppearance="?android:attr/textAppearanceMedium"

            />