diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-25 08:27:12 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-25 08:27:12 +0000 |
| commit | 8d35f02c853cc05310de02d7172edf640c508f2d (patch) | |
| tree | 6986aea2a7853ef3918eb4eda12f8a2cc2afe401 | |
| parent | 96ab7bba7a44d6a4455f2cbc7e2ae89c2b640c72 (diff) | |
| parent | 60e0e9dc3062e5259b7a3df7d3f2d5371c8ec93a (diff) | |
| download | Messenger-8d35f02c853cc05310de02d7172edf640c508f2d.tar.gz | |
Snap for 4620899 from 60e0e9dc3062e5259b7a3df7d3f2d5371c8ec93a to pi-release
Change-Id: I990f23c7eb26b5eabed5e5bc6b5b1518795248b8
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | res/layout/play_message_layout.xml | 8 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
3 files changed, 7 insertions, 6 deletions
@@ -26,6 +26,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_MODULE_TAGS := optional LOCAL_PACKAGE_NAME := CarMessengerApp +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_OVERRIDES_PACKAGES := messaging diff --git a/res/layout/play_message_layout.xml b/res/layout/play_message_layout.xml index 0d324d8..452adb1 100644 --- a/res/layout/play_message_layout.xml +++ b/res/layout/play_message_layout.xml @@ -76,7 +76,7 @@ android:layout_weight="1"/> <TextView android:id="@+id/canned_message" - style="@style/CarBody1.Light" + style="@style/TextAppearance.Car.Body1.Light" android:gravity="center" android:textStyle="italic" android:layout_gravity="center" @@ -94,7 +94,7 @@ <TextView android:id="@+id/reply_notice" - style="@style/CarBody1" + style="@style/TextAppearance.Car.Body1" android:layout_gravity="center" android:gravity="center" android:visibility="gone" @@ -110,7 +110,7 @@ android:layout_height="@dimen/car_single_line_list_item_height"> <TextView android:id="@+id/left_btn" - style="@style/CarBody1" + style="@style/TextAppearance.Car.Body1" android:layout_weight="1" android:gravity="center" android:layout_gravity="center_vertical" @@ -133,7 +133,7 @@ <TextView android:id="@+id/right_btn" - style="@style/CarBody1" + style="@style/TextAppearance.Car.Body1" android:layout_weight="1" android:gravity="center" android:layout_gravity="center_vertical" diff --git a/res/values/styles.xml b/res/values/styles.xml index 3e763a5..05912be 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -26,7 +26,7 @@ <item name="android:windowNoTitle">true</item> </style> - <style name="MessageEmoji" parent="@style/CarBody1"> + <style name="MessageEmoji" parent="@style/TextAppearance.Car.Body1"> <item name="android:background">@drawable/circle_bg</item> <item name="android:textSize">@dimen/car_emoji_size</item> <item name="android:gravity">center</item> @@ -34,4 +34,4 @@ <item name="android:layout_height">@dimen/car_touch_target_size</item> <item name="android:layout_width">@dimen/car_touch_target_size</item> </style> -</resources>
\ No newline at end of file +</resources> |