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

Commit 7bf211c6 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents 1e81bf58 f904be16

core/java/android/webkit/WebViewCore.java

+3 −1
Original line number Diff line number Diff line
@@ -1646,6 +1646,8 @@ final class WebViewCore { 


    final DrawFilter mZoomFilter =

                    new PaintFlagsDrawFilter(ZOOM_BITS, Paint.LINEAR_TEXT_FLAG);

    final DrawFilter mScrollFilter =

                new PaintFlagsDrawFilter(SCROLL_BITS, 0);



    /* package */ void drawContentPicture(Canvas canvas, int color,

                                          boolean animatingZoom,
@@ -1654,7 +1656,7 @@ final class WebViewCore { 
        if (animatingZoom) {

            df = mZoomFilter;

        } else if (animatingScroll) {

            df = null;

            df = mScrollFilter;

        }

        canvas.setDrawFilter(df);

        boolean tookTooLong = nativeDrawContent(canvas, color);

core/res/res/layout/keyguard_screen_sim_pin_portrait.xml

+14 −4
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:orientation="vertical"

            >

        android:orientation="vertical">



        <!-- header text ('Enter Pin Code') -->

        <TextView android:id="@+id/headerText"
@@ -35,10 +34,21 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="9dip"

            android:gravity="center"

            android:lines="2"

            android:singleLine="true"

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

        />



        <!-- Carrier info -->

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

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="9dip"

            android:gravity="center"

            android:singleLine="true"

            android:ellipsize="marquee"

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

        />



        <RelativeLayout

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

core/res/res/layout/keyguard_screen_tab_unlock.xml

+4 −2
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
        android:layout_alignParentRight="true"

        android:layout_marginTop="10dip"

        android:layout_marginRight="8dip"

        android:singleLine="true"

        android:ellipsize="marquee"

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

        />

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_marginTop="20dip"

            android:singleLine="true"

            android:ellipsize="marquee"

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

            />

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
            android:textSize="17sp"

            android:drawablePadding="4dip"

            android:layout_marginTop="32dip"

            android:singleLine="true"

            android:ellipsize="marquee"

            />

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

            android:layout_width="wrap_content"