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

Commit dec26f20 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-dev

parents 0e082155 42b0c70a

core/res/res/layout-land/keyguard_status_area.xml

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 


    <TextView

        android:id="@+id/alarm_status"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginTop="28dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
@@ -53,6 +55,8 @@ 


    <TextView

        android:id="@+id/owner_info"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
@@ -64,6 +68,8 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
@@ -75,6 +81,8 @@ 


    <TextView

        android:id="@+id/status_security_message"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="right"

        android:layout_marginTop="12dp"

core/res/res/layout-port/keyguard_status_area.xml

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 


    <TextView

        android:id="@+id/owner_info"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="right"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
@@ -67,6 +69,8 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="right"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
@@ -78,6 +82,8 @@ 


    <TextView

        android:id="@+id/status_security_message"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="right"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

core/res/res/layout-sw600dp-port/keyguard_status_area.xml

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 


    <TextView

        android:id="@+id/alarm_status"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginTop="28dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
@@ -53,6 +55,8 @@ 


    <TextView

        android:id="@+id/owner_info"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
@@ -64,6 +68,8 @@ 


    <TextView

        android:id="@+id/status1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"