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

Commit 35568ecf authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "Long-press lock screen popup support for large font size." into udc-dev

parents fd64019f 8d67255b

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+4 −7
Original line number Diff line number Diff line
@@ -64,20 +64,20 @@ 
        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="bottom|start"

            android:scaleType="fitCenter"

            android:padding="@dimen/keyguard_affordance_fixed_padding"

            android:tint="?android:attr/textColorPrimary"

            android:background="@drawable/keyguard_bottom_affordance_bg"

            android:foreground="@drawable/keyguard_bottom_affordance_selected_border"

            android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset"

            android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

            android:visibility="invisible" />



        <FrameLayout
@@ -90,7 +90,7 @@ 
                android:id="@+id/keyguard_settings_button"

                layout="@layout/keyguard_settings_popup_menu"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/keyguard_affordance_fixed_height"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:visibility="gone"

                />
@@ -100,14 +100,11 @@ 
            android:id="@+id/end_button"

            android:layout_height="@dimen/keyguard_affordance_fixed_height"

            android:layout_width="@dimen/keyguard_affordance_fixed_width"

            android:layout_gravity="bottom|end"

            android:scaleType="fitCenter"

            android:padding="@dimen/keyguard_affordance_fixed_padding"

            android:tint="?android:attr/textColorPrimary"

            android:background="@drawable/keyguard_bottom_affordance_bg"

            android:foreground="@drawable/keyguard_bottom_affordance_selected_border"

            android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset"

            android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

            android:visibility="invisible" />



    </LinearLayout>

packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="wrap_content"

    android:layout_height="48dp"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/keyguard_affordance_fixed_height"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:background="@drawable/keyguard_settings_popup_menu_background"