diff options
author | yueg <yueg@google.com> | 2017-10-31 14:11:53 -0700 |
---|---|---|
committer | zachh <zachh@google.com> | 2017-11-03 00:21:12 +0000 |
commit | a5a08d8890b08ac1fde8ccaf333fe33c69333ae5 (patch) | |
tree | ab82401c5c33c58ecf534fc73962405f8af94122 /java/com/android/newbubble/res/layout | |
parent | 9ebcbef57c9c694f2ab1c357b6b6356d0aa0d143 (diff) |
Add avatar and small icon in bubble primary button.
Bug: 67605985
Test: NewBubbleIntegrationTest, NewReturnToCallControllerTest
PiperOrigin-RevId: 174089572
Change-Id: Icaeb41482cffe522e09ee1ec068b5d47f476b146
Diffstat (limited to 'java/com/android/newbubble/res/layout')
-rw-r--r-- | java/com/android/newbubble/res/layout/new_bubble_base.xml | 30 |
1 files changed, 22 insertions, 8 deletions
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 ef35d7426..9174f3fdb 100644 --- a/java/com/android/newbubble/res/layout/new_bubble_base.xml +++ b/java/com/android/newbubble/res/layout/new_bubble_base.xml @@ -36,14 +36,28 @@ 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"/> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <ImageView + android:id="@+id/bubble_icon_avatar" + android:layout_width="@dimen/bubble_size" + android:layout_height="@dimen/bubble_size" + tools:src="@android:drawable/ic_btn_speak_now"/> + <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_alignBottom="@id/bubble_icon_avatar" + android:layout_alignEnd="@id/bubble_icon_avatar" + android:padding="@dimen/bubble_small_icon_padding" + android:tint="@android:color/white" + android:tintMode="src_in" + android:background="@drawable/bubble_ripple_circle_small" + android:measureAllChildren="false" + tools:backgroundTint="#FF0000AA" + tools:src="@android:drawable/ic_btn_speak_now"/> + </RelativeLayout> <TextView android:id="@+id/bubble_text" android:layout_width="wrap_content" |