diff options
author | sail <sail@google.com> | 2017-09-03 13:57:22 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-09-11 09:09:35 -0700 |
commit | 3bcea98f1e6d63e22a7b5393b31c2195d3db82b4 (patch) | |
tree | 848d8f8b33da563f4a5f7b40c553d7adb227744d /java/com/android/dialershared/bubble/res | |
parent | 2cb0136378f1e2930b81399da1bd606dc478e0b3 (diff) |
Switch Dialer to use new third_party bubble library
This CL switches Dialer to use the new common bubble libary. It also moves the
integration tests into the bubble libary.
Bug: 64797730
Test: BubbleIntegrationTest
PiperOrigin-RevId: 167439680
Change-Id: Ie2e9367cb6a6561efb8abd425b6a12f8c1e78138
Diffstat (limited to 'java/com/android/dialershared/bubble/res')
9 files changed, 0 insertions, 316 deletions
diff --git a/java/com/android/dialershared/bubble/res/color/bubble_checkable_mask.xml b/java/com/android/dialershared/bubble/res/color/bubble_checkable_mask.xml deleted file mode 100644 index f9416ab57..000000000 --- a/java/com/android/dialershared/bubble/res/color/bubble_checkable_mask.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 - --> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="@android:color/white" android:state_checked="true"/> - <item android:color="@android:color/transparent"/> -</selector> diff --git a/java/com/android/dialershared/bubble/res/color/bubble_icon_tint_states.xml b/java/com/android/dialershared/bubble/res/color/bubble_icon_tint_states.xml deleted file mode 100644 index 33ca1fdc5..000000000 --- a/java/com/android/dialershared/bubble/res/color/bubble_icon_tint_states.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 - --> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="#80FFFFFF" android:state_enabled="false"/> - <item android:color="@android:color/white"/> -</selector> diff --git a/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_ltr.xml b/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_ltr.xml deleted file mode 100644 index 77c813a75..000000000 --- a/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_ltr.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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"> - <corners - android:bottomRightRadius="@dimen/bubble_size" - android:topRightRadius="@dimen/bubble_size"/> - <solid android:color="@android:color/white"/> -</shape> diff --git a/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_rtl.xml b/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_rtl.xml deleted file mode 100644 index 9e2542154..000000000 --- a/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_rtl.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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"> - <corners - android:bottomLeftRadius="@dimen/bubble_size" - android:topLeftRadius="@dimen/bubble_size"/> - <solid android:color="@android:color/white"/> -</shape> diff --git a/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_checkable_circle.xml b/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_checkable_circle.xml deleted file mode 100644 index 85e0b24f3..000000000 --- a/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_checkable_circle.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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 - --> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:colorControlHighlight"> - <item> - <shape android:shape="oval"> - <solid android:color="@color/bubble_checkable_mask"/> - </shape> - </item> - <item android:id="@android:id/mask"> - <shape android:shape="oval"> - <solid android:color="@android:color/white"/> - </shape> - </item> -</ripple> diff --git a/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_circle.xml b/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_circle.xml deleted file mode 100644 index 8d5cf0bb5..000000000 --- a/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_circle.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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 - --> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:colorControlHighlight"> - <item> - <shape> - <corners android:radius="@dimen/bubble_size"/> - <solid android:color="@android:color/white"/> - </shape> - </item> -</ripple> diff --git a/java/com/android/dialershared/bubble/res/layout/bubble_base.xml b/java/com/android/dialershared/bubble/res/layout/bubble_base.xml deleted file mode 100644 index 76970f020..000000000 --- a/java/com/android/dialershared/bubble/res/layout/bubble_base.xml +++ /dev/null @@ -1,127 +0,0 @@ -<?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 - --> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clipToPadding="false" - tools:theme="@style/Theme.AppCompat"> - <View - android:id="@+id/bubble_drawer_shadow_provider" - android:layout_width="@dimen/bubble_size" - android:layout_height="@dimen/bubble_size" - android:layout_marginTop="@dimen/bubble_shadow_padding_size" - android:layout_marginBottom="@dimen/bubble_shadow_padding_size" - android:layout_marginStart="@dimen/bubble_shadow_padding_size" - android:background="@drawable/bubble_ripple_circle" - android:backgroundTint="@android:color/transparent" - android:elevation="10dp" - android:visibility="invisible" - /> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="48dp" - android:elevation="10dp" - android:paddingTop="@dimen/bubble_shadow_padding_size" - android:paddingBottom="@dimen/bubble_shadow_padding_size" - android:paddingEnd="@dimen/bubble_shadow_padding_size"> - - <LinearLayout - android:id="@+id/bubble_expanded_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingStart="32dp" - android:paddingEnd="8dp" - android:background="@drawable/bubble_background_pill_ltr" - android:layoutDirection="inherit" - android:orientation="horizontal" - android:visibility="gone" - tools:backgroundTint="#FF0000FF" - tools:visibility="visible"> - <com.android.dialershared.bubble.CheckableImageButton - android:id="@+id/bubble_icon_first" - android:layout_width="@dimen/bubble_size" - android:layout_height="@dimen/bubble_size" - android:layout_marginStart="4dp" - android:padding="@dimen/bubble_icon_padding" - android:tint="@color/bubble_icon_tint_states" - android:tintMode="src_in" - tools:background="@drawable/bubble_ripple_checkable_circle" - tools:src="@android:drawable/ic_lock_idle_lock"/> - <com.android.dialershared.bubble.CheckableImageButton - android:id="@+id/bubble_icon_second" - android:layout_width="@dimen/bubble_size" - android:layout_height="@dimen/bubble_size" - android:layout_marginStart="4dp" - android:padding="@dimen/bubble_icon_padding" - android:tint="@color/bubble_icon_tint_states" - android:tintMode="src_in" - tools:background="@drawable/bubble_ripple_checkable_circle" - tools:src="@android:drawable/ic_input_add"/> - <com.android.dialershared.bubble.CheckableImageButton - android:id="@+id/bubble_icon_third" - android:layout_width="@dimen/bubble_size" - android:layout_height="@dimen/bubble_size" - android:layout_marginStart="4dp" - android:padding="@dimen/bubble_icon_padding" - android:tint="@color/bubble_icon_tint_states" - android:tintMode="src_in" - tools:background="@drawable/bubble_ripple_checkable_circle" - tools:src="@android:drawable/ic_menu_call"/> - </LinearLayout> - </FrameLayout> - <FrameLayout - android:id="@+id/bubble_primary_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="start" - android:animateLayoutChanges="true" - android:clipChildren="false" - android:clipToPadding="false" - android:elevation="12dp"> - <ViewAnimator - android:id="@+id/bubble_button_primary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/bubble_shadow_padding_size" - android:background="@drawable/bubble_ripple_circle" - android:measureAllChildren="false" - tools:backgroundTint="#FF0000AA"> - <ImageView - android:id="@+id/bubble_icon_primary" - android:layout_width="@dimen/bubble_size" - android:layout_height="@dimen/bubble_size" - android:padding="@dimen/bubble_icon_padding" - android:tint="@android:color/white" - android:tintMode="src_in" - tools:src="@android:drawable/ic_btn_speak_now"/> - <TextView - android:id="@+id/bubble_text" - android:layout_width="wrap_content" - android:layout_height="@dimen/bubble_size" - android:paddingStart="@dimen/bubble_icon_padding" - android:paddingEnd="@dimen/bubble_icon_padding" - android:gravity="center" - android:minWidth="@dimen/bubble_size" - android:textAppearance="@style/TextAppearance.AppCompat" - tools:text="Call ended"/> - </ViewAnimator> - </FrameLayout> - -</FrameLayout> diff --git a/java/com/android/dialershared/bubble/res/values/colors.xml b/java/com/android/dialershared/bubble/res/values/colors.xml deleted file mode 100644 index 97545faf3..000000000 --- a/java/com/android/dialershared/bubble/res/values/colors.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?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 - --> - -<resources> - <color name="bubble_primary_background_darken">#33000000</color> -</resources> diff --git a/java/com/android/dialershared/bubble/res/values/values.xml b/java/com/android/dialershared/bubble/res/values/values.xml deleted file mode 100644 index f5816172d..000000000 --- a/java/com/android/dialershared/bubble/res/values/values.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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 - --> - -<resources> - <dimen name="bubble_safe_margin_x">16dp</dimen> - <dimen name="bubble_safe_margin_y">64dp</dimen> - <dimen name="bubble_size">56dp</dimen> - <dimen name="bubble_icon_padding">16dp</dimen> - <dimen name="bubble_move_elevation_change">4dp</dimen> - <dimen name="bubble_shadow_padding_size">16dp</dimen> -</resources> |