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

Commit 7ec926da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable hyphenation by default on watches."

parents 1941814f 02737a23

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

+3 −0
Original line number Diff line number Diff line
@@ -70,4 +70,7 @@ 


     <!-- Default Gravity setting for the system Toast view. Equivalent to: Gravity.CENTER -->

     <integer name="config_toastDefaultGravity">0x00000011</integer>



    <!-- Default hyphenation frequency setting (0=NONE, 1=NORMAL, 2=FULL). -->

    <item name="config_preferredHyphenationFrequency" format="integer" type="dimen">1</item>

</resources>

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -3510,6 +3510,9 @@ 
        <item>"wifi"</item>

    </string-array>



    <!-- Default hyphenation frequency setting (0=NONE, 1=NORMAL, 2=FULL). -->

    <item name="config_preferredHyphenationFrequency" format="integer" type="dimen">0</item>



    <!-- Package name for ManagedProvisioning which is responsible for provisioning work profiles. -->

    <string name="config_managed_provisioning_package" translatable="false">com.android.managedprovisioning</string>

core/res/res/values/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -506,13 +506,13 @@ please see styles_device_defaults.xml. 
        <item name="textEditSuggestionHighlightStyle">?attr/textEditSuggestionHighlightStyle</item>

        <item name="textCursorDrawable">?attr/textCursorDrawable</item>

        <item name="breakStrategy">high_quality</item>

        <item name="hyphenationFrequency">none</item>

        <item name="hyphenationFrequency">@dimen/config_preferredHyphenationFrequency</item>

    </style>



    <style name="Widget.CheckedTextView">

        <item name="textAlignment">viewStart</item>

        <item name="breakStrategy">high_quality</item>

        <item name="hyphenationFrequency">none</item>

        <item name="hyphenationFrequency">@dimen/config_preferredHyphenationFrequency</item>

    </style>



    <style name="Widget.TextView.ListSeparator">
@@ -540,7 +540,7 @@ please see styles_device_defaults.xml. 
        <item name="textColor">?attr/editTextColor</item>

        <item name="gravity">center_vertical</item>

        <item name="breakStrategy">simple</item>

        <item name="hyphenationFrequency">none</item>

        <item name="hyphenationFrequency">@dimen/config_preferredHyphenationFrequency</item>

        <item name="defaultFocusHighlightEnabled">false</item>

    </style>