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

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

Merge "Keyguard bug fixes" into jb-mr1-dev

parents d2a8df95 d36ebe03

core/res/res/layout-sw600dp/keyguard_screen_status_land.xml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
        />



    <TextView

        android:id="@+id/propertyOf"

        android:id="@+id/owner_info"

        android:lineSpacingExtra="8dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

core/res/res/layout-sw600dp/keyguard_screen_status_port.xml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
        />



    <TextView

        android:id="@+id/propertyOf"

        android:id="@+id/owner_info"

        android:lineSpacingExtra="8dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

core/res/res/layout/keyguard_navigation.xml

+6 −5
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ 
        android:padding="10dip"

        android:clickable="true">



        <TextView

            android:layout_width="20dip"

            android:layout_height="wrap_content"

            android:textSize="28dp"

            android:text="@string/kg_temp_back_string" />

        <ImageView

               android:src="?android:attr/homeAsUpIndicator"

               android:layout_gravity="center_vertical|start"

               android:layout_width="wrap_content"

               android:layout_height="wrap_content"/>



        <!-- message area for security screen -->

        <TextView
@@ -43,6 +43,7 @@ 
            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_gravity="end"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:layout_marginEnd="6dip"

core/res/res/layout/keyguard_status_view.xml

+13 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
        </LinearLayout>



        <TextView

            android:id="@*android:id/status1"

            android:id="@+id/status1"

            android:layout_gravity="end"

            android:layout_marginEnd="@*android:dimen/keyguard_lockscreen_status_line_font_right_margin"

            android:singleLine="true"
@@ -105,7 +105,18 @@ 
            />



        <TextView

            android:id="@*android:id/carrier"

            android:id="@+id/owner_info"

            android:layout_gravity="end"

            android:layout_marginEnd="@*android:dimen/keyguard_lockscreen_status_line_font_right_margin"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            android:textSize="@*android:dimen/keyguard_lockscreen_status_line_font_size"

            android:drawablePadding="4dip"

            />



        <TextView

            android:id="@+id/carrier"

            android:layout_gravity="end"

            android:layout_marginEnd="@*android:dimen/keyguard_lockscreen_status_line_font_right_margin"

            android:singleLine="true"

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ 
  <java-symbol type="id" name="passwordEntry" />

  <java-symbol type="id" name="pinDel" />

  <java-symbol type="id" name="pinDisplay" />

  <java-symbol type="id" name="propertyOf" />

  <java-symbol type="id" name="owner_info" />

  <java-symbol type="id" name="pukDel" />

  <java-symbol type="id" name="pukDisplay" />

  <java-symbol type="id" name="right_icon" />