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

Commit e096ddee authored by Kenny Root's avatar Kenny Root
Browse files

resolved conflicts for merge of 33ca1f32 to master 

Change-Id: If5344c23c4fd727c0ad684859126337de6ca1d9f
parents 2fd75f35 33ca1f32

core/res/res/layout/keyguard_screen_sim_pin_portrait.xml

+11 −1
Original line number Diff line number Diff line
@@ -33,9 +33,19 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:lines="2"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceLarge"/>



        <!-- Carrier info -->

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

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="9dip"

            android:gravity="center"

            android:singleLine="true"

            android:ellipsize="marquee"

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



        <!-- password entry -->

        <LinearLayout

            android:layout_width="match_parent"

core/res/res/layout/keyguard_screen_tab_unlock.xml

+4 −2
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
        android:layout_alignParentRight="true"

        android:layout_marginTop="10dip"

        android:layout_marginRight="8dip"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        />

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_marginTop="20dip"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            />

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
            android:textSize="17sp"

            android:drawablePadding="4dip"

            android:layout_marginTop="32dip"

            android:singleLine="true"

            android:ellipsize="marquee"

            />

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

            android:layout_width="wrap_content"

core/res/res/layout/keyguard_screen_unlock_portrait.xml

+4 −1
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ 
            android:layout_marginTop="6dip"

            android:layout_alignParentRight="true"

            android:layout_marginRight="8dip"

            android:layout_toRightOf="@+id/time"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            />