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

Commit 216f26f1 authored by Josh Tsuji's avatar Josh Tsuji Committed by android-build-merger
Browse files

Merge "Adds the new dismiss target, with fling/magnet to dismiss." into qt-dev am: f4a8e08f 

am: faf3d2cc

Change-Id: I515cadc9f2a716b21874d16cafcab0f2a07b105c
parents 4e13a0f3 faf3d2cc

packages/SystemUI/res/drawable/bubble_dismiss_circle.xml

0 → 100644
+27 −0
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.

-->

<!--

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



</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/bubble_dismiss_icon.xml

0 → 100644
+26 −0
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.

-->

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

packages/SystemUI/res/layout/bubble_dismiss_target.xml

0 → 100644
+66 −0
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/pip_dismiss_gradient_height"

    android:layout_gravity="bottom|center_horizontal">



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



        <TextView

            android:id="@+id/bubble_dismiss_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="9dp"

            android:layout_marginBottom="9dp"

            android:layout_marginLeft="8dp"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"

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

            android:shadowColor="@android:color/black"

            android:shadowDx="-1"

            android:shadowDy="1"

            android:shadowRadius="0.01"

            android:text="@string/bubble_dismiss_text" />



    </LinearLayout>



    <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:alpha="0"

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

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+8 −1
Original line number Diff line number Diff line
@@ -1095,6 +1095,8 @@ 
    <dimen name="bubble_padding">8dp</dimen>

    <!-- Size of individual bubbles. -->

    <dimen name="individual_bubble_size">52dp</dimen>

    <!-- Size of the circle around the bubbles when they're in the dismiss target. -->

    <dimen name="bubble_dismiss_encircle_size">56dp</dimen>

    <!-- How much to inset the icon in the circle -->

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

    <!-- Padding around the view displayed when the bubble is expanded -->
@@ -1131,7 +1133,12 @@ 
    <dimen name="bubble_header_icon_size">48dp</dimen>

    <!-- Space between the pointer triangle and the bubble expanded view -->

    <dimen name="bubble_pointer_margin">8dp</dimen>



    <!-- Height of the permission prompt shown with bubbles -->

    <dimen name="bubble_permission_height">120dp</dimen>

    <!-- Padding applied to the bubble dismiss target. Touches in this padding cause the bubbles to

         snap to the dismiss target. -->

    <dimen name="bubble_dismiss_target_padding_x">40dp</dimen>

    <dimen name="bubble_dismiss_target_padding_y">20dp</dimen>

    <!-- Size of the RAT type for CellularTile -->

    <dimen name="celltile_rat_type_size">10sp</dimen>

</resources>

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2442,4 +2442,6 @@ 
    <string name="bubble_accessibility_action_move_bottom_left">Move bottom left</string>

    <!-- Action in accessibility menu to move the stack of bubbles to the bottom right of the screen. [CHAR LIMIT=30]-->

    <string name="bubble_accessibility_action_move_bottom_right">Move bottom right</string>

    <!-- Text used for the bubble dismiss area. Bubbles dragged to, or flung towards, this area will go away. [CHAR LIMIT=20] -->

    <string name="bubble_dismiss_text">Dismiss</string>

</resources>