diff options
author | yueg <yueg@google.com> | 2018-01-02 16:23:14 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-02 16:47:06 -0800 |
commit | f473e1d0988bb13874a0774db9cbcd66777f9150 (patch) | |
tree | 0bdad6c3221ca608439b5b518d746ccce89cb120 /java/com/android/newbubble/res | |
parent | 31586c7946fdc1a238d64bba07fbab9b0c4ea872 (diff) |
Bubble v2 dismiss.
Drag and drop bubble to bottom to hide or end call. Flinging to bottom does not trigger the actions. Color/text is not final. Navigation bar is not hiden and the change will be in a following CL.
Bug: 67605985
Test: NewBubbleTest
PiperOrigin-RevId: 180608133
Change-Id: Iff4cb32226d8fbf0f8e5319f6876a1d74c336b4a
Diffstat (limited to 'java/com/android/newbubble/res')
3 files changed, 89 insertions, 0 deletions
diff --git a/java/com/android/newbubble/res/drawable/bottom_action_scrim.xml b/java/com/android/newbubble/res/drawable/bottom_action_scrim.xml new file mode 100644 index 000000000..bd13382ec --- /dev/null +++ b/java/com/android/newbubble/res/drawable/bottom_action_scrim.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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="90" + android:endColor="@android:color/transparent" + android:startColor="#AA000000"/> +</shape> diff --git a/java/com/android/newbubble/res/layout/bottom_action_base.xml b/java/com/android/newbubble/res/layout/bottom_action_base.xml new file mode 100644 index 000000000..bf08e1be5 --- /dev/null +++ b/java/com/android/newbubble/res/layout/bottom_action_base.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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 + --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/bubble_bottom_action_view_height" + android:orientation="horizontal" + android:background="@drawable/bottom_action_scrim"> + + <LinearLayout + android:id="@+id/bottom_action_dismiss_layout" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical"> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/bubble_button_icon_padding" + android:src="@drawable/quantum_ic_clear_vd_theme_24" + android:tint="@color/bubble_button_color_white"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAllCaps="true" + android:textColor="@color/bubble_button_color_white" + android:text="Hide"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/bottom_action_end_call_layout" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical"> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/bubble_button_icon_padding" + android:src="@drawable/quantum_ic_call_end_vd_theme_24" + android:tint="@color/bubble_button_color_white"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAllCaps="true" + android:textColor="@color/bubble_button_color_white" + android:text="End call"/> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/java/com/android/newbubble/res/values/values.xml b/java/com/android/newbubble/res/values/values.xml index 71f813ac6..040a5be1c 100644 --- a/java/com/android/newbubble/res/values/values.xml +++ b/java/com/android/newbubble/res/values/values.xml @@ -41,4 +41,6 @@ <dimen name="bubble_expanded_separator_height">8dp</dimen> <dimen name="bubble_small_icon_size">24dp</dimen> <dimen name="bubble_small_icon_padding">4dp</dimen> + + <dimen name="bubble_bottom_action_view_height">180dp</dimen> </resources> |