Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a884aacb authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge "Set hintTextColor and composingSpan style for EditText and extract view" into nyc-mr1-dev

parents ab45c9df 5545e645

core/res/res/layout-watch/input_method_extract_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

core/res/res/values-watch/styles_material.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values-watch/themes_material.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>