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

Commit 37635af1 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Lock screen long-press to open wallpaper picker." into tm-qpr-dev am: b74f4255 

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



Change-Id: I083b2e997bef9dd47ad27535802efcece4cd1657
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51976e6d b74f4255

packages/SystemUI/res/drawable/keyguard_settings_popup_menu_background.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~

  -->

<ripple

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

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@android:color/white"/>

            <corners android:radius="28dp" />

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

            <solid android:color="?androidprv:attr/colorSurface" />

            <corners android:radius="28dp" />

        </shape>

    </item>

</ripple>

packages/SystemUI/res/layout/keyguard_settings_popup_menu.xml

0 → 100644
+50 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~

  -->



<LinearLayout

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

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minHeight="52dp"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:background="@drawable/keyguard_settings_popup_menu_background"

    android:paddingStart="16dp"

    android:paddingEnd="24dp"

    android:paddingVertical="16dp">



    <ImageView

        android:id="@+id/icon"

        android:layout_width="20dp"

        android:layout_height="20dp"

        android:layout_marginEnd="16dp"

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

        android:importantForAccessibility="no"

        tools:ignore="UseAppTint" />



    <TextView

        android:id="@+id/text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceMedium"

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

        android:textSize="14sp"

        android:maxLines="1"

        android:ellipsize="end" />



</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ 
    android:layout_height="match_parent"

    android:background="@android:color/transparent">



    <com.android.systemui.common.ui.view.LongPressHandlingView

        android:id="@+id/keyguard_long_press"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <ViewStub

        android:id="@+id/keyguard_qs_user_switch_stub"

        android:layout="@layout/keyguard_qs_user_switch"

packages/SystemUI/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -824,4 +824,8 @@ 
        <item>bottom_end:wallet</item>

    </string-array>



    <!-- Package name for the app that implements the wallpaper picker. -->

    <string name="config_wallpaperPickerPackage" translatable="false">

        com.android.wallpaper

    </string>

</resources>

packages/SystemUI/res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -1648,4 +1648,10 @@ 
    <dimen name="rear_display_animation_height">200dp</dimen>

    <dimen name="rear_display_title_top_padding">24dp</dimen>

    <dimen name="rear_display_title_bottom_padding">16dp</dimen>



    <!--

    Vertical distance between the pointer and the popup menu that shows up on the lock screen when

    it is long-pressed.

    -->

    <dimen name="keyguard_long_press_settings_popup_vertical_offset">96dp</dimen>

</resources>