diff options
Diffstat (limited to 'java/com/android/newbubble/res')
5 files changed, 29 insertions, 32 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 index bd13382ec..1109aa6d2 100644 --- a/java/com/android/newbubble/res/drawable/bottom_action_scrim.xml +++ b/java/com/android/newbubble/res/drawable/bottom_action_scrim.xml @@ -20,5 +20,5 @@ <gradient android:angle="90" android:endColor="@android:color/transparent" - android:startColor="#AA000000"/> + android:startColor="#FF000000"/> </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 index bf08e1be5..af7f7987f 100644 --- a/java/com/android/newbubble/res/layout/bottom_action_base.xml +++ b/java/com/android/newbubble/res/layout/bottom_action_base.xml @@ -18,6 +18,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/bubble_bottom_action_view_height" android:orientation="horizontal" + android:gravity="center" android:background="@drawable/bottom_action_scrim"> <LinearLayout @@ -25,19 +26,19 @@ 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"/> + android:gravity="center"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAllCaps="true" + android:layout_marginTop="@dimen/bubble_bottom_action_text_offset" android:textColor="@color/bubble_button_color_white" - android:text="Hide"/> + 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> <LinearLayout @@ -45,19 +46,19 @@ 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"/> + android:gravity="center"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAllCaps="true" + android:layout_marginTop="@dimen/bubble_bottom_action_text_offset" android:textColor="@color/bubble_button_color_white" - android:text="End call"/> + 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> </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 index f6ce26dd1..2b53b360e 100644 --- a/java/com/android/newbubble/res/layout/new_bubble_base.xml +++ b/java/com/android/newbubble/res/layout/new_bubble_base.xml @@ -66,16 +66,6 @@ tools:backgroundTint="#FF0000AA" tools:src="@android:drawable/ic_btn_speak_now"/> </FrameLayout> - <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> </RelativeLayout> <!-- The RelativeLayout below serves as boundary for @id/bubble_expanded_layout during animation --> diff --git a/java/com/android/newbubble/res/values/strings.xml b/java/com/android/newbubble/res/values/strings.xml index 5b82b181f..ce7d45606 100644 --- a/java/com/android/newbubble/res/values/strings.xml +++ b/java/com/android/newbubble/res/values/strings.xml @@ -24,4 +24,9 @@ <!-- A string to describe available action for accessibility user. It will be read as "Actions: double tap to collapse call action menu". --> <string name="a11y_bubble_primary_button_collapse_action">Collapse call action menu</string> + + <!-- The label of drag-and-drop target for dismissing bubble. [CHAR LIMIT=10]--> + <string name="bubble_bottom_action_hide">Hide</string> + <!-- The label of drag-and-drop target for ending call. [CHAR LIMIT=10]--> + <string name="bubble_bottom_action_end_call">End call</string> </resources>
\ 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 040a5be1c..540f6653e 100644 --- a/java/com/android/newbubble/res/values/values.xml +++ b/java/com/android/newbubble/res/values/values.xml @@ -26,8 +26,8 @@ <dimen name="bubble_button_padding_horizontal">16dp</dimen> <dimen name="bubble_off_screen_size_horizontal">-4dp</dimen> - <!-- 64dp - 16dp(bubble_shadow_padding_size_vertical) --> - <dimen name="bubble_safe_margin_vertical">48dp</dimen> + <!-- 36dp - 16dp(bubble_shadow_padding_size_vertical) --> + <dimen name="bubble_safe_margin_vertical">20dp</dimen> <dimen name="bubble_shadow_padding_size_vertical">16dp</dimen> <dimen name="bubble_shadow_padding_size_vertical_minus">-16dp</dimen> @@ -42,5 +42,6 @@ <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> + <dimen name="bubble_bottom_action_view_height">124dp</dimen> + <dimen name="bubble_bottom_action_text_offset">28dp</dimen> </resources> |