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

Commit 7fd57716 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge changes I5c096c2b,If0d0d86b into sc-dev am: 73eb2771 

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

Change-Id: If88a10a31385457beb0f995d739149aebe381b6e
parents 8fdd1933 73eb2771

libs/WindowManager/Shell/res/drawable/bubble_dismiss_circle.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

<!--

    The transparent circle outline that encircles the bubbles when they're in the dismiss target.

-->

<shape

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

    android:shape="oval">



    <stroke

        android:width="1dp"

        android:color="#66FFFFFF" />



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

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/bubble_dismiss_icon.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

<!-- The 'X' bubble dismiss icon. This is just ic_close with a stroke. -->

<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>

libs/WindowManager/Shell/res/drawable/dismiss_circle_background.xml

+3 −4
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
    android:shape="oval">



    <stroke

        android:width="1dp"

        android:color="#AAFFFFFF" />



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

        android:width="2dp"

        android:color="@android:color/system_accent1_600" />



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

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/pip_ic_close_white.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
        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:fillColor="@android:color/system_neutral1_50"/>

</vector>

libs/WindowManager/Shell/res/layout/bubble_dismiss_target.xml

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
<!--

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

  -->

<!-- Bubble dismiss target consisting of an X icon and the text 'Dismiss'. -->

<FrameLayout

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

    android:layout_width="wrap_content"

    android:layout_height="@dimen/floating_dismiss_gradient_height"

    android:layout_gravity="bottom|center_horizontal">



    <FrameLayout

        android:id="@+id/bubble_dismiss_circle"

        android:layout_width="@dimen/bubble_dismiss_encircle_size"

        android:layout_height="@dimen/bubble_dismiss_encircle_size"

        android:layout_gravity="center"

        android:background="@drawable/bubble_dismiss_circle" />



    <LinearLayout

        android:id="@+id/bubble_dismiss_icon_container"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="center"

        android:paddingBottom="@dimen/bubble_dismiss_target_padding_y"

        android:paddingTop="@dimen/bubble_dismiss_target_padding_y"

        android:paddingLeft="@dimen/bubble_dismiss_target_padding_x"

        android:paddingRight="@dimen/bubble_dismiss_target_padding_x"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="horizontal">



        <ImageView

            android:id="@+id/bubble_dismiss_close_icon"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:src="@drawable/bubble_dismiss_icon" />

    </LinearLayout>

</FrameLayout>
 
 No newline at end of file