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

Commit 0419a2a9 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5044158: Fix lockscreen layout issues"

parents 06ec6626 c61f8882

core/res/res/layout/keyguard_screen_password_landscape.xml

+10 −3
Original line number Diff line number Diff line
@@ -66,13 +66,15 @@ 


    <TextView

        android:id="@+id/date"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:layout_below="@id/time"

        android:layout_marginTop="6dip"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:layout_gravity="right"

        />



    <TextView
@@ -88,22 +90,26 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:layout_marginTop="4dip"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:drawablePadding="4dip"

        android:layout_gravity="right"

        />



    <Space android:layout_gravity="fill" />



    <TextView

        android:id="@+id/carrier"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:layout_gravity="right"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:textColor="?android:attr/textColorSecondary"
@@ -144,6 +150,7 @@ 
            android:background="@drawable/lockscreen_password_field_dark"

            android:textColor="?android:attr/textColorPrimary"

            android:imeOptions="flagNoFullscreen|actionDone"

            android:suggestionsEnabled="false"

            />



    </LinearLayout>

core/res/res/layout/keyguard_screen_password_portrait.xml

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ 
        android:background="@drawable/lockscreen_password_field_dark"

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

        android:textColor="#ffffffff"

        android:imeOptions="actionDone"/>

        android:imeOptions="actionDone"

        android:suggestionsEnabled="false"/>



    <!-- Numeric keyboard -->

    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+9 −6
Original line number Diff line number Diff line
@@ -64,13 +64,14 @@ 


    <TextView

        android:id="@+id/date"

        android:layout_below="@id/time"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:layout_marginTop="6dip"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:layout_gravity="right"

        />



    <TextView
@@ -86,22 +87,24 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:layout_marginTop="4dip"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:drawablePadding="4dip"

        android:layout_gravity="right"

        />



    <Space android:layout_gravity="fill" />



    <TextView

        android:id="@+id/carrier"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="right"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:singleLine="true"

        android:ellipsize="marquee"

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

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+9 −3
Original line number Diff line number Diff line
@@ -64,11 +64,13 @@ 


    <TextView

        android:id="@+id/date"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:layout_gravity="right"

        />



    <TextView
@@ -83,17 +85,21 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:layout_gravity="right"

        />



    <Space android:layout_gravity="fill" />



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

        android:layout_gravity="right"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:gravity="right"

        android:singleLine="true"

        android:ellipsize="marquee"

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