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

Commit aa9b5b81 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Missing resources for lock screen. 

The manual integration (kraken change Ide3ad839) of froyo
change I6872c3ad skipped these.

Change-Id: I11102c4ac988cbcd91eb38b7d60e493079dd715e
parent 31a17033

core/res/res/layout/keyguard_screen_tab_unlock.xml

+13 −11
Original line number Diff line number Diff line
@@ -41,20 +41,21 @@ 
        android:ellipsize="marquee"

        android:gravity="right|bottom"

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

        android:textSize="22sp"

        />



    <!-- emergency call button shown when sim is missing or PUKd -->

    <Button

        android:id="@+id/emergencyCallButton"

    <!-- "emergency calls only" shown when sim is missing or PUKd -->

    <TextView

        android:id="@+id/emergencyCallText"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_below="@id/carrier"

        android:layout_alignParentRight="true"

        android:layout_marginTop="10dip"

        android:layout_marginTop="0dip"

        android:layout_marginRight="8dip"

        android:drawableLeft="@drawable/ic_emergency"

        style="@style/Widget.Button.Transparent"

        android:drawablePadding="8dip"

        android:text="@string/emergency_calls_only"

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

        android:textColor="@color/white"

       />



    <!-- time and date -->
@@ -64,6 +65,7 @@ 
        android:layout_below="@id/carrier"

        android:layout_marginTop="52dip"

        android:layout_marginLeft="20dip"

        android:layout_marginBottom="8dip"

        >



        <TextView android:id="@+id/timeDisplay"
@@ -71,7 +73,6 @@ 
            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="none"

            android:gravity="bottom"

            android:textSize="72sp"

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

            android:shadowColor="#C0000000"
@@ -84,8 +85,9 @@ 


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

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:gravity="bottom"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/timeDisplay"

            android:layout_alignBaseline="@id/timeDisplay"

            android:singleLine="true"

            android:ellipsize="none"

            android:textSize="22sp"

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+11 −9
Original line number Diff line number Diff line
@@ -46,18 +46,19 @@ 
            android:ellipsize="marquee"

            android:gravity="right|bottom"

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

            android:textSize="22sp"

            />



        <!-- emergency call button shown when sim is missing or PUKd -->

        <Button

            android:id="@+id/emergencyCallButton"

        <!-- "emergency calls only" shown when sim is missing or PUKd -->

        <TextView

            android:id="@+id/emergencyCallText"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_marginTop="20dip"

            android:drawableLeft="@drawable/ic_emergency"

            style="@style/Widget.Button.Transparent"

            android:drawablePadding="8dip"

            android:text="@string/emergency_calls_only"

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

            android:textColor="@color/white"

           />



        <com.android.internal.widget.DigitalClock android:id="@+id/time"
@@ -65,12 +66,12 @@ 
            android:layout_height="wrap_content"

            android:layout_below="@id/carrier"

            android:layout_marginTop="56dip"

            android:layout_marginBottom="8dip"

            >



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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="bottom"

                android:singleLine="true"

                android:ellipsize="none"

                android:textSize="72sp"
@@ -85,8 +86,9 @@ 


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

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:gravity="bottom"

                android:layout_height="wrap_content"

                android:layout_toRightOf="@id/timeDisplay"

                android:layout_alignBaseline="@id/timeDisplay"

                android:singleLine="true"

                android:ellipsize="none"

                android:textSize="22sp"