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

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

Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1

parents deb15704 5750b1ff

core/res/res/layout/keyguard_screen_unlock_portrait.xml

+2 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


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

        android:layout_marginTop="@dimen/keyguard_lockscreen_status_line_clockfont_top_margin"

        android:layout_marginBottom="12dip"

        android:layout_marginBottom="@dimen/keyguard_lockscreen_status_line_clockfont_bottom_margin"

        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"

        android:layout_gravity="right">
@@ -42,7 +42,6 @@ 
            android:ellipsize="none"

            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"

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

            android:layout_marginBottom="6dip"

            android:textColor="@color/lockscreen_clock_background"

            />
@@ -53,7 +52,6 @@ 
            android:ellipsize="none"

            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"

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

            android:layout_marginBottom="6dip"

            android:textColor="@color/lockscreen_clock_foreground"

            />
@@ -110,11 +108,10 @@ 
        android:id="@+id/lockPattern"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="8dip"

        android:layout_marginRight="8dip"

        android:layout_marginBottom="4dip"

        android:layout_marginLeft="8dip"

        android:layout_gravity="center|bottom"

        android:layout_gravity="center_horizontal"

     />



    <TextView

core/res/res/values/dimens.xml

+6 −3
Original line number Diff line number Diff line
@@ -152,16 +152,19 @@ 
    <dimen name="action_bar_subtitle_bottom_margin">5dip</dimen>



    <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->

    <dimen name="keyguard_lockscreen_clock_font_size">80sp</dimen>

    <dimen name="keyguard_lockscreen_clock_font_size">80dip</dimen>



    <!-- Size of status line font on Unsecure unlock LockScreen. -->

    <dimen name="keyguard_lockscreen_status_line_font_size">14sp</dimen>

    <dimen name="keyguard_lockscreen_status_line_font_size">14dip</dimen>



    <!-- Size of right margin on Unsecure unlock LockScreen -->

    <dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen>



    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->

    <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">24dip</dimen>

    <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">22dip</dimen>



    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->

    <dimen name="keyguard_lockscreen_status_line_clockfont_bottom_margin">12dip</dimen>



    <!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. -->

    <dimen name="activity_chooser_popup_min_width">200dip</dimen>