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

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

Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev

parents b11b9fc9 ff2aa0bc

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

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


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

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

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



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

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

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


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

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

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



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

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

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 
    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center_horizontal"

    android:clipChildren="false">

    android:gravity="center_horizontal">



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

        android:id="@+id/app_widget_container"
@@ -37,6 +36,7 @@ 


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

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

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



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

core/res/res/layout/keyguard_selector_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
        android:visibility="gone">

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

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

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

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



    <RelativeLayout

core/res/res/layout/keyguard_status_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:id="@+id/keyguard_status_view"

    android:gravity="center_horizontal">



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