diff options
| author | 2016-06-13 22:12:28 +0000 | |
|---|---|---|
| committer | 2016-06-13 22:12:28 +0000 | |
| commit | 3dc75a85f8b3ee73b0ad201f91056bd64f5d48a6 (patch) | |
| tree | bab026f23008d57c20fc5222a5c66e336069d483 | |
| parent | 2bf337e8cf8255beb7f3979e8dfb4df7afcd19b1 (diff) | |
| parent | a884aacb47224b73c707e38bd49964b7994ad18d (diff) | |
Merge \"Set hintTextColor and composingSpan style for EditText and extract view\" into nyc-mr1-dev
am: a884aacb47
Change-Id: I3352e1fc4ce0d603ba66eae71aad8e5c88191941
| -rw-r--r-- | core/res/res/layout-watch/input_method_extract_view.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values-watch/styles_material.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values-watch/themes_material.xml | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/core/res/res/layout-watch/input_method_extract_view.xml b/core/res/res/layout-watch/input_method_extract_view.xml index de4ca69f42b6..038b766c749b 100644 --- a/core/res/res/layout-watch/input_method_extract_view.xml +++ b/core/res/res/layout-watch/input_method_extract_view.xml @@ -31,7 +31,8 @@ android:inputType="text" android:layout_weight="1" android:fontFamily="sans-serif-condensed-light" - android:textColor="@color/primary_text_default_material_dark" + android:textColor="@color/primary_text_material_dark" + android:textColorHint="@color/secondary_text_material_dark" android:textColorHighlight="@color/accent_material_dark" android:textSize="18dp" android:gravity="bottom|right" diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml index c98f63d5a71e..c19cc72a8bff 100644 --- a/core/res/res/values-watch/styles_material.xml +++ b/core/res/res/values-watch/styles_material.xml @@ -75,4 +75,9 @@ please see styles_device_defaults.xml. <item name="virtualButtonPressedDrawable">?selectableItemBackground</item> <item name="descendantFocusability">blocksDescendants</item> </style> + + <!-- DO NOTE TRANSLATE Spans within this text are applied to style composing regions + within an EditText widget. The text content is ignored and not used. + Note: This is @color/material_deep_teal_200, cannot use @color references here. --> + <string name="candidates_style"><font color="#80cbc4">candidates</font></string> </resources> diff --git a/core/res/res/values-watch/themes_material.xml b/core/res/res/values-watch/themes_material.xml index e2dae42f2d63..d92a9477808f 100644 --- a/core/res/res/values-watch/themes_material.xml +++ b/core/res/res/values-watch/themes_material.xml @@ -37,6 +37,5 @@ please see styles_device_defaults.xml. <item name="windowAnimationStyle">@style/Animation.InputMethod</item> <item name="imeFullscreenBackground">?colorBackground</item> <item name="imeExtractEnterAnimation">@anim/input_method_extract_enter</item> - <item name="imeExtractExitAnimation">@anim/input_method_extract_exit</item> </style> </resources> |