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

Commit 0c0d5049 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge changes I60d63d65,Id41e82b9 into udc-dev am: 731b5700 

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



Change-Id: I477f6596ac0a7b94f1dadaf8bc642db59069b5b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49a5911f 731b5700

packages/SystemUI/res-keyguard/drawable/ic_palette.xml

0 → 100644
+25 −0
Original line number Original line 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.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,395 112,322Q144,249 199.5,195Q255,141 329.5,110.5Q404,80 489,80Q568,80 639,106.5Q710,133 763.5,180Q817,227 848.5,291.5Q880,356 880,433Q880,541 817,603.5Q754,666 650,666L575,666Q557,666 544,680Q531,694 531,711Q531,738 545.5,757Q560,776 560,801Q560,839 539,859.5Q518,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM247,506Q267,506 282,491Q297,476 297,456Q297,436 282,421Q267,406 247,406Q227,406 212,421Q197,436 197,456Q197,476 212,491Q227,506 247,506ZM373,336Q393,336 408,321Q423,306 423,286Q423,266 408,251Q393,236 373,236Q353,236 338,251Q323,266 323,286Q323,306 338,321Q353,336 373,336ZM587,336Q607,336 622,321Q637,306 637,286Q637,266 622,251Q607,236 587,236Q567,236 552,251Q537,266 537,286Q537,306 552,321Q567,336 587,336ZM718,506Q738,506 753,491Q768,476 768,456Q768,436 753,421Q738,406 718,406Q698,406 683,421Q668,436 668,456Q668,476 683,491Q698,506 718,506ZM480,820Q491,820 495.5,815.5Q500,811 500,801Q500,787 485.5,775Q471,763 471,722Q471,676 501,641Q531,606 577,606L650,606Q726,606 773,561.5Q820,517 820,433Q820,301 720,220.5Q620,140 489,140Q343,140 241.5,238.5Q140,337 140,480Q140,621 239.5,720.5Q339,820 480,820Z"/>

</vector>

packages/SystemUI/res/anim/keyguard_settings_popup_ease_out_interpolator.xml

0 → 100644
+22 −0
Original line number Original line 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.

  -->



<pathInterpolator

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

    android:controlX1="0.30"

    android:controlY1="0.00"

    android:controlX2="0.33"

    android:controlY2="1.00" />

packages/SystemUI/res/anim/long_press_lock_screen_popup_enter.xml

0 → 100644
+49 −0
Original line number Original line 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.

  -->



<set

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

    android:shareInterpolator="false">



    <scale

        android:interpolator="@android:anim/accelerate_decelerate_interpolator"

        android:duration="200"

        android:fromXScale="0.5"

        android:fromYScale="0.5"

        android:toXScale="1.02"

        android:toYScale="1.02"

        android:pivotX="50%"

        android:pivotY="50%" />



    <scale

        android:interpolator="@anim/keyguard_settings_popup_ease_out_interpolator"

        android:startOffset="200"

        android:duration="200"

        android:fromXScale="1"

        android:fromYScale="1"

        android:toXScale="0.98"

        android:toYScale="0.98"

        android:pivotX="50%"

        android:pivotY="50%" />



    <alpha

        android:interpolator="@android:anim/linear_interpolator"

        android:duration="83"

        android:fromAlpha="0"

        android:toAlpha="1" />



</set>

packages/SystemUI/res/anim/long_press_lock_screen_popup_exit.xml

0 → 100644
+39 −0
Original line number Original line 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.

  -->



<set

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

    android:shareInterpolator="false">



    <scale

        android:interpolator="@android:anim/accelerate_interpolator"

        android:duration="233"

        android:fromXScale="1"

        android:fromYScale="1"

        android:toXScale="0.5"

        android:toYScale="0.5"

        android:pivotX="50%"

        android:pivotY="50%" />



    <alpha

        android:interpolator="@android:anim/linear_interpolator"

        android:delay="150"

        android:duration="83"

        android:fromAlpha="1"

        android:toAlpha="0" />



</set>

packages/SystemUI/res/drawable/keyguard_settings_popup_menu_background.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -17,17 +17,17 @@ 
<ripple

<ripple

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

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

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

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

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

    android:color="#4d000000">

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

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

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

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

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

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

            <corners android:radius="@dimen/keyguard_affordance_fixed_radius" />

        </shape>

        </shape>

    </item>

    </item>

    <item>

    <item>

        <shape android:shape="rectangle">

        <shape android:shape="rectangle">

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

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

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

            <corners android:radius="@dimen/keyguard_affordance_fixed_radius" />

        </shape>

        </shape>

    </item>

    </item>

</ripple>
 
</ripple>