diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-23 00:47:24 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-23 00:47:24 +0000 |
commit | 6c773cbf112e5bef6074776d8cd91139d810f0ec (patch) | |
tree | 864af958509967249c92a2c0196a51ed66482574 /java/com/android/newbubble | |
parent | ecbcc5c8cce01c70480e73284a9e5e1115fc6649 (diff) | |
parent | 572a77ed339b5a511f9dc20680939dbb7bf5e085 (diff) |
Merge changes I50da0d2d,Id00debe2,I2807510e,I3f7836d8,I2e31cd11, ...
* changes:
Automated rollback of changelist 176587256
Check Contacts support for preferred SIM
Add SpamJobType for all spam job IDs.
Bubble v2 UI changes.
Allow deleting a call log entry in the call log UI and the call details UI.
Fix showing CallingAccountSelector in lock screen
Diffstat (limited to 'java/com/android/newbubble')
-rw-r--r-- | java/com/android/newbubble/res/drawable/bubble_pill_up.xml | 23 | ||||
-rw-r--r-- | java/com/android/newbubble/res/drawable/bubble_ripple_pill_up.xml (renamed from java/com/android/newbubble/res/drawable/bubble_ripple_circle_small.xml) | 9 | ||||
-rw-r--r-- | java/com/android/newbubble/res/layout/new_bubble_base.xml | 14 | ||||
-rw-r--r-- | java/com/android/newbubble/res/values/colors.xml | 3 | ||||
-rw-r--r-- | java/com/android/newbubble/res/values/styles.xml | 2 | ||||
-rw-r--r-- | java/com/android/newbubble/res/values/values.xml | 4 |
6 files changed, 36 insertions, 19 deletions
diff --git a/java/com/android/newbubble/res/drawable/bubble_pill_up.xml b/java/com/android/newbubble/res/drawable/bubble_pill_up.xml new file mode 100644 index 000000000..9dc0395f4 --- /dev/null +++ b/java/com/android/newbubble/res/drawable/bubble_pill_up.xml @@ -0,0 +1,23 @@ +<?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 + --> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <corners + android:topRightRadius="8dp" + android:topLeftRadius="8dp"/> + <solid android:color="@android:color/white"/> +</shape> diff --git a/java/com/android/newbubble/res/drawable/bubble_ripple_circle_small.xml b/java/com/android/newbubble/res/drawable/bubble_ripple_pill_up.xml index 109d1cec1..77147f828 100644 --- a/java/com/android/newbubble/res/drawable/bubble_ripple_circle_small.xml +++ b/java/com/android/newbubble/res/drawable/bubble_ripple_pill_up.xml @@ -16,11 +16,6 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:colorControlHighlight"> - <item> - <shape> - <corners android:radius="@dimen/bubble_small_icon_size"/> - <solid android:color="@android:color/white"/> - </shape> - </item> + android:color="@color/bubble_ripple_color"> + <item android:drawable="@drawable/bubble_pill_up"/> </ripple> 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 c90cabdf2..8cac982f4 100644 --- a/java/com/android/newbubble/res/layout/new_bubble_base.xml +++ b/java/com/android/newbubble/res/layout/new_bubble_base.xml @@ -88,10 +88,10 @@ tools:visibility="visible"> <RelativeLayout android:id="@+id/bubble_triangle" - android:layout_width="20dp" - android:layout_height="20dp" + android:layout_width="12dp" + android:layout_height="12dp" android:layout_marginTop="7dp" - android:layout_marginBottom="-10dp" + android:layout_marginBottom="-6dp" android:layout_centerHorizontal="true" android:background="@color/background_dialer_white" android:elevation="@dimen/bubble_expanded_elevation" @@ -107,15 +107,14 @@ android:layoutDirection="inherit"> <com.android.newbubble.NewCheckableButton android:id="@+id/bubble_button_full_screen" - android:layout_marginTop="@dimen/bubble_radius" + android:layout_marginTop="8dp" android:textColor="@color/bubble_button_color_grey" - android:background="@color/background_dialer_white" + android:background="@drawable/bubble_ripple_pill_up" android:drawableTint="@color/bubble_button_color_grey" - style="@style/CheckableButtonWithSelectableItemBackground"/> + style="@style/CheckableButton"/> <com.android.newbubble.NewCheckableButton android:id="@+id/bubble_button_mute" android:layout_below="@id/bubble_button_full_screen" - android:layout_marginTop="@dimen/bubble_expanded_separator_height" android:textColor="@color/bubble_button_color_grey" android:background="@color/background_dialer_white" android:drawableTint="@color/bubble_button_color_grey" @@ -123,7 +122,6 @@ <com.android.newbubble.NewCheckableButton android:id="@+id/bubble_button_audio_route" android:layout_below="@id/bubble_button_mute" - android:layout_marginTop="@dimen/bubble_expanded_separator_height" android:textColor="@color/bubble_button_color_grey" android:background="@color/background_dialer_white" android:drawableTint="@color/bubble_button_color_grey" diff --git a/java/com/android/newbubble/res/values/colors.xml b/java/com/android/newbubble/res/values/colors.xml index 8b1294fc6..74ad85cea 100644 --- a/java/com/android/newbubble/res/values/colors.xml +++ b/java/com/android/newbubble/res/values/colors.xml @@ -18,7 +18,8 @@ <resources> <color name="bubble_primary_background_darken">#33000000</color> - <color name="bubble_button_color_grey">@color/dialer_secondary_text_color</color> + <color name="bubble_ripple_color">@color/bubble_primary_background_darken</color> + <color name="bubble_button_color_grey">@color/icon_color_grey</color> <color name="bubble_button_color_white">@color/dialer_primary_text_color_white</color> <color name="bubble_button_color_blue">@color/dialer_theme_color</color> </resources> diff --git a/java/com/android/newbubble/res/values/styles.xml b/java/com/android/newbubble/res/values/styles.xml index 274bd8704..6c138d645 100644 --- a/java/com/android/newbubble/res/values/styles.xml +++ b/java/com/android/newbubble/res/values/styles.xml @@ -28,7 +28,7 @@ </style> <style name="SelectableItemTheme"> - <item name="colorControlHighlight">@color/dialer_secondary_text_color_hiden</item> + <item name="colorControlHighlight">@color/bubble_ripple_color</item> </style> <style name="CheckableButtonWithSelectableItemBackground" parent="CheckableButton"> <item name="android:theme">@style/SelectableItemTheme</item> diff --git a/java/com/android/newbubble/res/values/values.xml b/java/com/android/newbubble/res/values/values.xml index a028254c7..6dda61d6c 100644 --- a/java/com/android/newbubble/res/values/values.xml +++ b/java/com/android/newbubble/res/values/values.xml @@ -34,8 +34,8 @@ <dimen name="bubble_elevation">6dp</dimen> <dimen name="bubble_expanded_elevation">8dp</dimen> <dimen name="bubble_expanded_width">160dp</dimen> - <dimen name="bubble_radius">12dp</dimen> - <dimen name="bubble_expanded_separator_height">4dp</dimen> + <dimen name="bubble_radius">16dp</dimen> + <dimen name="bubble_expanded_separator_height">8dp</dimen> <dimen name="bubble_small_icon_size">24dp</dimen> <dimen name="bubble_small_icon_padding">4dp</dimen> </resources> |