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

Commit 2573bb94 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update dismiss appearance and add scrim per UX mocks." into rvc-dev am: a65d7258 

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

Change-Id: I8766e4b47c52282ea4af34d243fe169099ab1075
parents 0d01e733 a65d7258

packages/SystemUI/res/drawable/dismiss_circle_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 


    <stroke

        android:width="1dp"

        android:color="#66FFFFFF" />

        android:color="#AAFFFFFF" />



    <solid android:color="#B3000000" />

    <solid android:color="#77000000" />



</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/dismiss_target_x.xml

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

<!--

  ~ Copyright (C) 2020 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.

  -->



<!-- 'X' icon. -->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M19.000000,6.400000l-1.400000,-1.400000 -5.600000,5.600000 -5.600000,-5.600000 -1.400000,1.400000 5.600000,5.600000 -5.600000,5.600000 1.400000,1.400000 5.600000,-5.600000 5.600000,5.600000 1.400000,-1.400000 -5.600000,-5.600000z"

        android:fillColor="#FFFFFFFF"

        android:strokeColor="#FF000000"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/floating_dismiss_gradient.xml

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

<!-- Copyright (C) 2020 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.

-->

<shape

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

    android:shape="rectangle">

    <gradient

        android:angle="270"

        android:startColor="#00000000"

        android:endColor="#77000000"

        android:type="linear" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/floating_dismiss_gradient_transition.xml

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

<!-- Copyright (C) 2020 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.

-->

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

    <item android:drawable="@color/transparent" />

    <item android:drawable="@drawable/floating_dismiss_gradient" />

</transition>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -974,7 +974,9 @@ 
    <dimen name="recents_quick_scrub_onboarding_margin_start">8dp</dimen>



    <!-- The height of the gradient indicating the dismiss edge when moving a PIP. -->

    <dimen name="floating_dismiss_gradient_height">176dp</dimen>

    <dimen name="floating_dismiss_gradient_height">250dp</dimen>



    <dimen name="floating_dismiss_bottom_margin">50dp</dimen>



    <!-- The bottom margin of the PIP drag to dismiss info text shown when moving a PIP. -->

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