diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-26 00:11:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-26 00:11:47 +0000 |
| commit | b9596e65467d9ad33efdfebb5ebc098207fda991 (patch) | |
| tree | 22437ddadb9b8016f14c74333364f96f5cea6998 /java/com/android/newbubble/res | |
| parent | a0cfd3965218696493c5ed06c2ef69e2b61368e8 (diff) | |
| parent | 334c0e1b40e4967e254d9e6ccd0bef447767867a (diff) | |
Merge changes I607c6af4,I452b3f2b
* changes:
Explicitly disable strict mode during the assisted dialing action.
Set avatar as background instead of src.
Diffstat (limited to 'java/com/android/newbubble/res')
| -rw-r--r-- | java/com/android/newbubble/res/layout/new_bubble_base.xml | 10 | ||||
| -rw-r--r-- | java/com/android/newbubble/res/values/values.xml | 1 |
2 files changed, 6 insertions, 5 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 c86d3bbcc..9b8250d6b 100644 --- a/java/com/android/newbubble/res/layout/new_bubble_base.xml +++ b/java/com/android/newbubble/res/layout/new_bubble_base.xml @@ -40,14 +40,13 @@ 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:background="@drawable/bubble_shape_circle" - android:measureAllChildren="false" - android:elevation="@dimen/bubble_elevation"> + android:measureAllChildren="false"> <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"/> + 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" @@ -59,7 +58,8 @@ android:background="@drawable/bubble_shape_circle_small" android:measureAllChildren="false" tools:backgroundTint="#FF0000AA" - tools:src="@android:drawable/ic_btn_speak_now"/> + 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 --> diff --git a/java/com/android/newbubble/res/values/values.xml b/java/com/android/newbubble/res/values/values.xml index 2e72c5e5e..f449c9bed 100644 --- a/java/com/android/newbubble/res/values/values.xml +++ b/java/com/android/newbubble/res/values/values.xml @@ -19,6 +19,7 @@ <dimen name="bubble_size">56dp</dimen> <dimen name="bubble_icon_padding">16dp</dimen> <dimen name="bubble_dragging_elevation_change">6dp</dimen> + <dimen name="bubble_dragging_elevation">12dp</dimen> <dimen name="bubble_button_height">36dp</dimen> <dimen name="bubble_button_icon_padding">16dp</dimen> |