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

Commit b07e89f6 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Integrate overscroll into KeyguardWidgetView." into jb-mr1-dev

parents 694121c4 f2dfc351

core/res/res/drawable-nodpi/kg_widget_overscroll_layer_left.9.png

0 → 100644
+2.16 KiB
Loading image diff...

core/res/res/drawable-nodpi/kg_widget_overscroll_layer_right.9.png

0 → 100644
+1.42 KiB
Loading image diff...

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

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    android:layout_height="match_parent"

    android:orientation="horizontal">



    <com.android.internal.policy.impl.keyguard.KeyguardWidgetView

    <com.android.internal.policy.impl.keyguard.KeyguardWidgetPager

        android:id="@+id/app_widget_container"

        android:layout_width="0dip"

        android:layout_height="match_parent"
@@ -35,8 +35,8 @@ 


        <!-- TODO: Remove this once supported as a widget -->

        <include layout="@layout/keyguard_status_view"/>

    </com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>



    </com.android.internal.policy.impl.keyguard.KeyguardWidgetView>



    <ViewFlipper

        android:id="@+id/view_flipper"

core/res/res/layout/keyguard_selector_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <com.android.internal.policy.impl.keyguard.KeyguardWidgetView

    <com.android.internal.policy.impl.keyguard.KeyguardWidgetPager

        android:id="@+id/app_widget_container"

        android:layout_width="match_parent"

        android:layout_height="0dip"
@@ -34,7 +34,7 @@ 
        android:visibility="gone">

            <!-- TODO: Remove this once supported as a widget -->

            <include layout="@layout/keyguard_status_view"/>

    </com.android.internal.policy.impl.keyguard.KeyguardWidgetView>

    </com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>



    <RelativeLayout

        android:layout_width="wrap_content"

core/res/res/layout/keyguard_status_view.xml

+75 −70
Original line number Diff line number Diff line
@@ -18,13 +18,18 @@ 
-->



<!-- This is a view that shows general status information in Keyguard. -->

<com.android.internal.policy.impl.keyguard.KeyguardStatusView

<com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center_horizontal">



    <com.android.internal.policy.impl.keyguard.KeyguardStatusView

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center_horizontal">



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

            android:layout_marginTop="@*android:dimen/keyguard_lockscreen_status_line_clockfont_top_margin"

            android:layout_marginBottom="12dip"
@@ -111,4 +116,4 @@ 
            />



    </com.android.internal.policy.impl.keyguard.KeyguardStatusView>

</com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame>
 
 No newline at end of file