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

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

Merge "LockScreen layout, button style, and owner info fixes - enable... 

Merge "LockScreen layout, button style, and owner info fixes - enable OwnerInfo to appear in status1 if dedicated view not present. - force all status lines to be singleline and marquee. - fix justification in landscape layouts. - use buttonBarStyle for buttons on all LockScreens. - reduce the size of the clock to fit in landscape. - no longer show "Draw a pattern to unlock" help message in LockPatternView."
parents 44f8d6bd 7377cd0a

core/res/res/layout/keyguard_screen_password_landscape.xml

+79 −69
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:rowCount="10"

    android:rowCount="11"

    android:id="@+id/root"

    android:clipChildren="false">
@@ -33,7 +33,8 @@ 


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

        android:layout_marginTop="16dip"

        android:layout_marginBottom="8dip">

        android:layout_marginBottom="8dip"

        android:layout_gravity="right">



       <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        top of the other. Hence the redundant layout... -->
@@ -67,60 +68,65 @@ 
        android:id="@+id/date"

        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="left"

        android:layout_gravity="right"

        />



    <TextView

        android:id="@+id/alarm_status"

        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_marginTop="4dip"

        android:layout_gravity="left"

        android:layout_gravity="right"

        />



    <TextView

        android:id="@+id/status1"

        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="left"

        android:layout_gravity="right"

        />



    <TextView

        android:id="@+id/status2"

        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="left"

        android:layout_gravity="right"

        />



    <TextView

        android:id="@+id/screenLocked"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:gravity="center"

        android:layout_marginTop="4dip"

        android:drawablePadding="4dip"

        android:layout_gravity="left"

        android:layout_gravity="right"

        />



    <Space android:height="20dip"/>



    <LinearLayout android:orientation="vertical" >



    <TextView

        android:id="@+id/carrier"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

        android:singleLine="true"

        android:ellipsize="marquee"

            android:layout_gravity="bottom|left"

        android:layout_gravity="right"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:textColor="?android:attr/textColorSecondary"
@@ -129,10 +135,8 @@ 
    <!-- "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:layout_gravity="right"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:text="@string/emergency_calls_only"
@@ -143,31 +147,34 @@ 


    <Button

        android:id="@+id/emergencyCallButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:drawableLeft="@drawable/ic_emergency"

        android:layout_gravity="right"

        android:drawableLeft="@drawable/lockscreen_emergency_button"

        android:text="@string/lockscreen_emergency_call"

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

        style="?android:attr/buttonBarButtonStyle"

        android:drawablePadding="8dip"

            android:layout_marginRight="80dip"

        android:visibility="visible"

    />

    </LinearLayout>



    <Space android:height="20dip"/>



    <!-- Column 1 -->

    <Space android:width="20dip" android:layout_columnWeight="1" android:layout_rowSpan="10" />

    <Space android:layout_columnWeight="1" android:layout_rowSpan="11" />



    <!-- Column 2 - password entry field and PIN keyboard -->

    <LinearLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:orientation="vertical"

        android:layout_gravity="center|fill"

        android:layout_rowSpan="11">



        <EditText android:id="@+id/passwordEntry"

            android:layout_height="wrap_content"

        android:layout_width="match_parent"

            android:layout_width="wrap_content"

            android:singleLine="true"

            android:textStyle="normal"

            android:inputType="textPassword"

        android:gravity="center"

            android:layout_gravity="center"

            android:textSize="24sp"

            android:minEms="8"

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

            android:background="@drawable/lockscreen_password_field_dark"

            android:textColor="?android:attr/textColorPrimary"
@@ -175,12 +182,15 @@ 


        <!-- Numeric keyboard -->

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

        android:layout_width="300dip"

        android:layout_height="300dip"

            android:layout_width="250dip"

            android:layout_height="100dip"

            android:layout_gravity="center"

            android:background="#40000000"

            android:layout_marginTop="5dip"

            android:keyBackground="@drawable/btn_keyboard_key_fulltrans"

            android:visibility="visible"

        />



    </LinearLayout>



</GridLayout>

core/res/res/layout/keyguard_screen_password_portrait.xml

+2 −2
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ 
        android:layout_marginTop="4dip"

        android:layout_marginRight="16dip"

        android:layout_gravity="right"

        android:drawableLeft="@drawable/ic_emergency"

        android:drawableLeft="@drawable/lockscreen_emergency_button"

        android:drawablePadding="8dip"

        android:text="@string/lockscreen_emergency_call"

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

        style="?android:attr/buttonBarButtonStyle"

    />



    <!-- bottom: password -->

core/res/res/layout/keyguard_screen_status_land.xml

+8 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ 
            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"/>
@@ -81,6 +83,8 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="30dip"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"/>
@@ -92,6 +96,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:layout_marginTop="10dip"
@@ -106,6 +112,8 @@ 
        android:layout_height="wrap_content"

        android:layout_marginTop="10dip"

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        />

core/res/res/layout/keyguard_screen_status_port.xml

+8 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 
            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"/>
@@ -78,6 +80,8 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="16dip"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

            android:drawablePadding="4dip"/>
@@ -90,6 +94,8 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="right"

        android:layout_marginTop="4dip"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

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

        />
@@ -101,6 +107,8 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="right"

        android:layout_alignParentTop="true"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:layout_marginTop="4dip"

core/res/res/layout/keyguard_screen_tab_unlock.xml

+14 −3
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ 
            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

            />
@@ -88,6 +90,8 @@ 
            android:id="@+id/alarm_status"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

            android:drawablePadding="4dip"
@@ -105,6 +109,8 @@ 
        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:layout_alignParentRight="true"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:drawablePadding="4dip"
@@ -119,6 +125,8 @@ 
        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:layout_alignParentRight="true"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:drawablePadding="4dip"
@@ -133,6 +141,8 @@ 
        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:layout_alignParentRight="true"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:layout_marginTop="12dip"
@@ -147,14 +157,13 @@ 
        android:layout_height="wrap_content"

        android:layout_marginTop="4dip"

        android:layout_marginRight="16dip"

        android:drawableLeft="@drawable/ic_emergency"

        android:drawableLeft="@drawable/lockscreen_emergency_button"

        android:layout_alignParentRight="true"

        android:layout_below="@id/screenLocked"

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

        style="?android:attr/buttonBarButtonStyle"

        android:drawablePadding="4dip"

        android:text="@string/lockscreen_emergency_call"

        android:visibility="visible"

        android:background="@null"

        />



    <RelativeLayout
@@ -207,6 +216,8 @@ 
            android:layout_marginTop="0dip"

            android:layout_marginRight="8dip"

            android:text="@string/emergency_calls_only"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

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