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

Commit 1540a21f authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can... 

am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev

* commit '29f16178':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
parents bd8c736b 29f16178

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

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ 
            android:id="@+id/keyguard_widget_pager_delete_target"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="top|center_horizontal" />

            android:layout_gravity="top|center_horizontal"

            androidprv:layout_childType="pageDeleteDropTarget" />



        <include layout="@layout/keyguard_widget_pager"

            android:id="@+id/app_widget_container"

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

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 


        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content">

            android:layout_height="wrap_content"

            androidprv:layout_childType="pageDeleteDropTarget">

            <include layout="@layout/keyguard_widget_remove_drop_target"

                android:id="@+id/keyguard_widget_pager_delete_target"

                android:layout_width="wrap_content"

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

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ 
            android:id="@+id/keyguard_widget_pager_delete_target"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="top|center_horizontal" />

            android:layout_gravity="top|center_horizontal"

            androidprv:layout_childType="pageDeleteDropTarget" />



        <include layout="@layout/keyguard_widget_pager"

            android:id="@+id/app_widget_container"

core/res/res/layout/keyguard_widget_remove_drop_target.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
<TextView

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

    android:gravity="center"

    android:padding="20dp"

    android:paddingLeft="40dp"

    android:paddingRight="40dp"

    android:padding="30dp"

    android:paddingLeft="60dp"

    android:paddingRight="60dp"

    android:drawableLeft="@drawable/kg_widget_delete_drop_target"

    android:drawablePadding="4dp"

    android:text="@string/kg_reordering_delete_drop_target_text"

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -5820,6 +5820,8 @@ 
        <!-- This is a handle that is used for expanding the

             security challenge container when it is collapsed. -->

        <enum name="expandChallengeHandle" value="6" />

        <!-- Delete drop target.  This will be the drop target to delete pages. -->

        <enum name="pageDeleteDropTarget" value="7" />

    </attr>



    <declare-styleable name="SlidingChallengeLayout_Layout">