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

Commit 7dfe49d7 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

Merge "Allow long-press lockscreen popup to be wider." into udc-dev am: 9b100794 am: 6ff4d82d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23219489



Change-Id: I9746a7eaa893c2e92f239c4de5056cadcdc83756
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c851e892 6ff4d82d

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+35 −46
Original line number Diff line number Diff line
@@ -59,20 +59,13 @@ 


    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:layout_gravity="bottom"

        android:layout_marginHorizontal="@dimen/keyguard_affordance_horizontal_offset"

        android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

        android:gravity="bottom"

        >



    <com.android.systemui.animation.view.LaunchableImageView

        android:id="@+id/start_button"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_width="@dimen/keyguard_affordance_fixed_width"

        android:layout_gravity="start|bottom"

        android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset"

        android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

        android:scaleType="fitCenter"

        android:padding="@dimen/keyguard_affordance_fixed_padding"

        android:tint="?android:attr/textColorPrimary"
@@ -80,26 +73,13 @@ 
        android:foreground="@drawable/keyguard_bottom_affordance_selected_border"

        android:visibility="invisible" />



        <FrameLayout

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:paddingHorizontal="24dp"

            >

            <include

                android:id="@+id/keyguard_settings_button"

                layout="@layout/keyguard_settings_popup_menu"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:visibility="gone"

                />

        </FrameLayout>



    <com.android.systemui.animation.view.LaunchableImageView

        android:id="@+id/end_button"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_width="@dimen/keyguard_affordance_fixed_width"

        android:layout_gravity="end|bottom"

        android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset"

        android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

        android:scaleType="fitCenter"

        android:padding="@dimen/keyguard_affordance_fixed_padding"

        android:tint="?android:attr/textColorPrimary"
@@ -107,7 +87,16 @@ 
        android:foreground="@drawable/keyguard_bottom_affordance_selected_border"

        android:visibility="invisible" />



    </LinearLayout>

    <include

        android:id="@+id/keyguard_settings_button"

        layout="@layout/keyguard_settings_popup_menu"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center"

        android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

        android:layout_marginHorizontal="@dimen/keyguard_affordance_horizontal_offset"

        android:visibility="gone"

        />



    <FrameLayout

        android:id="@+id/overlay_container"