diff options
| author | yueg <yueg@google.com> | 2018-01-19 11:39:03 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-01-19 13:16:20 -0800 |
| commit | 7e421825670b090d2fe035575769af751e908015 (patch) | |
| tree | fe7464bf4c4a40df2d56c4a163b3965e65e4e5c4 /java/com/android/newbubble/res/layout/new_bubble_base.xml | |
| parent | 61f30b6c0e2f01c0a7f85346e9ac1f7735f01567 (diff) | |
Bubble v2 layout changes.
To display expanded view properly with display size and font size set to
largest, we made the following changes:
- increase expanded view width
- use fixed expanded view button height
- remove blue background behind avatar
Test: manual
PiperOrigin-RevId: 182565152
Change-Id: Ie4cea2c42b66320767e283144ddd5d7c5ff40e1c
Diffstat (limited to 'java/com/android/newbubble/res/layout/new_bubble_base.xml')
| -rw-r--r-- | java/com/android/newbubble/res/layout/new_bubble_base.xml | 46 |
1 files changed, 20 insertions, 26 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 2b53b360e..c86d3bbcc 100644 --- a/java/com/android/newbubble/res/layout/new_bubble_base.xml +++ b/java/com/android/newbubble/res/layout/new_bubble_base.xml @@ -31,7 +31,7 @@ android:animateLayoutChanges="true" android:clipChildren="false" android:clipToPadding="false"> - <ViewAnimator + <FrameLayout android:id="@+id/bubble_button_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -42,31 +42,25 @@ android:contentDescription="@string/a11y_bubble_description" android:background="@drawable/bubble_shape_circle" android:measureAllChildren="false" - android:elevation="@dimen/bubble_elevation" - tools:backgroundTint="#FF0000AA"> - <FrameLayout - android:id="@+id/bubble_icon_container" - 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_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"/> - </FrameLayout> - </ViewAnimator> + android:elevation="@dimen/bubble_elevation"> + <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_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"/> + </FrameLayout> </RelativeLayout> <!-- The RelativeLayout below serves as boundary for @id/bubble_expanded_layout during animation --> <RelativeLayout |