diff options
Diffstat (limited to 'java/com/android')
| -rw-r--r-- | java/com/android/bubble/res/layout/bubble_base.xml | 12 | ||||
| -rw-r--r-- | java/com/android/bubble/res/values-car/values.xml | 27 | ||||
| -rw-r--r-- | java/com/android/bubble/res/values/values.xml | 5 |
3 files changed, 38 insertions, 6 deletions
diff --git a/java/com/android/bubble/res/layout/bubble_base.xml b/java/com/android/bubble/res/layout/bubble_base.xml index 0712db603..9f88e7083 100644 --- a/java/com/android/bubble/res/layout/bubble_base.xml +++ b/java/com/android/bubble/res/layout/bubble_base.xml @@ -49,7 +49,7 @@ <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="48dp" + android:layout_marginStart="@dimen/bubble_drawer_margin" android:elevation="10dp" android:paddingTop="@dimen/bubble_shadow_padding_size" android:paddingBottom="@dimen/bubble_shadow_padding_size" @@ -59,8 +59,8 @@ android:id="@+id/bubble_expanded_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="32dp" - android:paddingEnd="8dp" + android:paddingStart="@dimen/bubble_drawer_padding_start" + android:paddingEnd="@dimen/bubble_drawer_padding_end" android:background="@drawable/bubble_background_pill_ltr" android:layoutDirection="ltr" android:orientation="horizontal" @@ -102,7 +102,7 @@ <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="48dp" + android:layout_marginRight="@dimen/bubble_drawer_margin" android:elevation="10dp" android:paddingTop="@dimen/bubble_shadow_padding_size" android:paddingBottom="@dimen/bubble_shadow_padding_size" @@ -111,8 +111,8 @@ android:id="@+id/bubble_expanded_layout_rtl" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingRight="32dp" - android:paddingLeft="8dp" + android:paddingRight="@dimen/bubble_drawer_padding_start" + android:paddingLeft="@dimen/bubble_drawer_padding_end" android:background="@drawable/bubble_background_pill_rtl" android:layoutDirection="rtl" android:orientation="horizontal" diff --git a/java/com/android/bubble/res/values-car/values.xml b/java/com/android/bubble/res/values-car/values.xml new file mode 100644 index 000000000..cf8839a84 --- /dev/null +++ b/java/com/android/bubble/res/values-car/values.xml @@ -0,0 +1,27 @@ +<?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 + --> + + +<resources> + <dimen name="bubble_size">64dp</dimen> + <dimen name="bubble_drawer_margin">54dp</dimen> + <dimen name="bubble_drawer_padding_start">38dp</dimen> + <dimen name="bubble_drawer_padding_end">10dp</dimen> + <dimen name="bubble_icon_padding">18dp</dimen> + <dimen name="bubble_shadow_padding_size">18dp</dimen> +</resources> + diff --git a/java/com/android/bubble/res/values/values.xml b/java/com/android/bubble/res/values/values.xml index f5816172d..6066e18c3 100644 --- a/java/com/android/bubble/res/values/values.xml +++ b/java/com/android/bubble/res/values/values.xml @@ -15,11 +15,16 @@ ~ limitations under the License --> + <resources> <dimen name="bubble_safe_margin_x">16dp</dimen> <dimen name="bubble_safe_margin_y">64dp</dimen> <dimen name="bubble_size">56dp</dimen> + <dimen name="bubble_drawer_margin">48dp</dimen> + <dimen name="bubble_drawer_padding_start">32dp</dimen> + <dimen name="bubble_drawer_padding_end">8dp</dimen> <dimen name="bubble_icon_padding">16dp</dimen> <dimen name="bubble_move_elevation_change">4dp</dimen> <dimen name="bubble_shadow_padding_size">16dp</dimen> </resources> + |