634483c68f
Current dismiss flow - On bubble drag, show gradient with "X Dismiss" - When bubbles get close to the gradient, show X-in-circle This change - Removes gradient and "X Dismiss" - Shows X-in-circle (with 70% scrim inside) on bubble drag - Reduces bubble_dismiss_encircle_size to spec (56dp => 52dp) - Removes duplicate mDismissContainer in BubbleStackView Fixes: 136199542 Test: manual (dismiss target has scrim, shows on bubble drag) Test: manual (dismiss target behaves consistently for consecutive drags) Test: atest SystemUITests Change-Id: I21101ca9f2eb1b3c53b613231557f9f7936fddfa
49 lines
2.0 KiB
XML
49 lines
2.0 KiB
XML
<!--
|
|
~ 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">
|
|
|
|
<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> |