diff options
author | yueg <yueg@google.com> | 2018-01-31 12:02:19 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-31 14:03:04 -0800 |
commit | b6e16f578629eee53457a3fc17778f2252102891 (patch) | |
tree | 2b662fecbe22614571a9055c264717b0820ec3d0 /java/com/android/newbubble/res/layout | |
parent | a50c9bd73cd75a3bc049a81f2d51b874663b5b21 (diff) |
Remove bubble from AOSP.
Bug: 67605985
Test: NewBubbleImplTest, NewBubbleImplIntegrationTest, NewReturnToCallControllerTest
PiperOrigin-RevId: 184026033
Change-Id: Ie141ce9a0265ce3a08c01943cdeb94e2cd962e9f
Diffstat (limited to 'java/com/android/newbubble/res/layout')
-rw-r--r-- | java/com/android/newbubble/res/layout/bottom_action_base.xml | 88 | ||||
-rw-r--r-- | java/com/android/newbubble/res/layout/new_bubble_base.xml | 139 |
2 files changed, 0 insertions, 227 deletions
diff --git a/java/com/android/newbubble/res/layout/bottom_action_base.xml b/java/com/android/newbubble/res/layout/bottom_action_base.xml deleted file mode 100644 index b4d7c891e..000000000 --- a/java/com/android/newbubble/res/layout/bottom_action_base.xml +++ /dev/null @@ -1,88 +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 - --> -<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:weightSum="2" - android:orientation="horizontal" - android:gravity="center" - android:background="@drawable/bottom_action_scrim" - android:contentDescription="@string/a11y_bubble_bottom_action_description"> - - <!-- Add space to make sure text is not off screen when scaled. (1 - 1/1.3) / 2 ~= 0.11 --> - <View - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.11"/> - - <LinearLayout - android:id="@+id/bottom_action_dismiss_layout" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.78" - android:gravity="center" - android:contentDescription="@string/bubble_bottom_action_hide"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/bubble_bottom_action_text_offset" - android:maxLines="2" - android:ellipsize="end" - android:textColor="@color/bubble_button_color_white" - android:textSize="16sp" - android:fontFamily="roboto-medium" - android:text="@string/bubble_bottom_action_hide" - android:drawableStart="@drawable/quantum_ic_clear_vd_theme_24" - android:drawableTint="@color/bubble_button_color_white" - android:drawablePadding="10dp" - android:elevation="2dp"/> - </LinearLayout> - - <View - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.22"/> - - <LinearLayout - android:id="@+id/bottom_action_end_call_layout" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.78" - android:gravity="center" - android:contentDescription="@string/bubble_bottom_action_end_call"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/bubble_bottom_action_text_offset" - android:maxLines="2" - android:ellipsize="end" - android:textColor="@color/bubble_button_color_white" - android:textSize="16sp" - android:fontFamily="roboto-medium" - android:text="@string/bubble_bottom_action_end_call" - android:drawableStart="@drawable/quantum_ic_call_end_vd_theme_24" - android:drawableTint="@color/bubble_button_color_white" - android:drawablePadding="10dp" - android:elevation="2dp"/> - </LinearLayout> - - <View - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.11"/> - -</LinearLayout>
\ No newline at end of file diff --git a/java/com/android/newbubble/res/layout/new_bubble_base.xml b/java/com/android/newbubble/res/layout/new_bubble_base.xml deleted file mode 100644 index 9b8250d6b..000000000 --- a/java/com/android/newbubble/res/layout/new_bubble_base.xml +++ /dev/null @@ -1,139 +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 - --> - -<RelativeLayout 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:clipChildren="true" - android:clipToPadding="false" - android:layoutDirection="ltr" - tools:theme="@style/Theme.AppCompat"> - <RelativeLayout - android:id="@+id/bubble_primary_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:animateLayoutChanges="true" - android:clipChildren="false" - android:clipToPadding="false"> - <FrameLayout - android:id="@+id/bubble_button_primary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/bubble_shadow_padding_size_horizontal" - android:layout_marginEnd="@dimen/bubble_shadow_padding_size_horizontal" - android:layout_marginTop="@dimen/bubble_shadow_padding_size_vertical" - android:layout_marginBottom="@dimen/bubble_shadow_padding_size_vertical" - android:contentDescription="@string/a11y_bubble_description" - android:measureAllChildren="false"> - <ImageView - android:id="@+id/bubble_icon_avatar" - android:layout_width="@dimen/bubble_size" - android:layout_height="@dimen/bubble_size" - android:background="@android:drawable/ic_btn_speak_now" - android:elevation="@dimen/bubble_elevation"/> - <ImageView - android:id="@+id/bubble_icon_primary" - android:layout_width="@dimen/bubble_small_icon_size" - android:layout_height="@dimen/bubble_small_icon_size" - android:layout_gravity="bottom|right" - android:padding="@dimen/bubble_small_icon_padding" - android:tint="@android:color/white" - android:tintMode="src_in" - android:background="@drawable/bubble_shape_circle_small" - android:measureAllChildren="false" - tools:backgroundTint="#FF0000AA" - tools:src="@android:drawable/ic_btn_speak_now" - android:elevation="@dimen/bubble_dragging_elevation"/> - </FrameLayout> - </RelativeLayout> - <!-- The RelativeLayout below serves as boundary for @id/bubble_expanded_layout during animation --> - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/bubble_shadow_padding_size_vertical_minus" - android:clipChildren="true" - android:clipToPadding="false" - android:layout_below="@id/bubble_primary_container"> - <RelativeLayout - android:id="@+id/bubble_expanded_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingStart="@dimen/bubble_shadow_padding_size_horizontal_double" - android:paddingEnd="@dimen/bubble_shadow_padding_size_horizontal_double" - android:paddingBottom="@dimen/bubble_shadow_padding_size_vertical" - android:clipChildren="false" - android:clipToPadding="false" - android:visibility="gone" - tools:visibility="visible"> - <RelativeLayout - android:id="@+id/bubble_triangle" - android:layout_width="12dp" - android:layout_height="12dp" - android:layout_marginTop="7dp" - android:layout_marginBottom="-6dp" - android:layout_centerHorizontal="true" - android:background="@color/background_dialer_white" - android:elevation="@dimen/bubble_expanded_elevation" - android:rotation="45"> - </RelativeLayout> - <RelativeLayout - android:id="@+id/bubble_expanded_menu" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/bubble_triangle" - android:background="@drawable/bubble_background_with_radius" - android:elevation="@dimen/bubble_expanded_elevation" - android:clipChildren="false" - android:clipToPadding="false" - android:layoutDirection="inherit"> - <com.android.newbubble.NewCheckableButton - android:id="@+id/bubble_button_full_screen" - android:layout_marginTop="8dp" - android:textColor="@color/bubble_button_color_grey" - android:background="@drawable/bubble_ripple_pill_up" - android:drawableTint="@color/bubble_button_color_grey" - style="@style/CheckableButton"/> - <com.android.newbubble.NewCheckableButton - android:id="@+id/bubble_button_mute" - android:layout_below="@id/bubble_button_full_screen" - android:textColor="@color/bubble_button_color_grey" - android:background="@color/background_dialer_white" - android:drawableTint="@color/bubble_button_color_grey" - style="@style/CheckableButtonWithSelectableItemBackground"/> - <com.android.newbubble.NewCheckableButton - android:id="@+id/bubble_button_audio_route" - android:layout_below="@id/bubble_button_mute" - android:textColor="@color/bubble_button_color_grey" - android:background="@color/background_dialer_white" - android:drawableTint="@color/bubble_button_color_grey" - style="@style/CheckableButtonWithSelectableItemBackground"/> - <com.android.newbubble.NewCheckableButton - android:id="@+id/bubble_button_end_call" - android:layout_below="@id/bubble_button_audio_route" - android:layout_marginTop="@dimen/bubble_expanded_separator_height" - android:textColor="@color/bubble_button_color_white" - android:background="@drawable/bubble_pill_down" - android:backgroundTint="@color/dialer_end_call_button_color" - android:foreground="?attr/selectableItemBackground" - android:drawableTint="@color/bubble_button_color_white" - style="@style/CheckableButton"/> - </RelativeLayout> - </RelativeLayout> - </RelativeLayout> -</RelativeLayout> |