diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-09-18 18:26:06 +0900 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2014-09-18 18:27:45 +0900 |
| commit | eddfe51b38755e0068e3c322868c5e209f212f6f (patch) | |
| tree | 280fda5e51e269da433b9e3acccfa33025833481 /java/res/values | |
| parent | cdabc71c6da00ea1c2254e13021973c762c79be4 (diff) | |
| parent | 233a2f21c38a27049fa3b03af699593f629d1681 (diff) | |
| download | latinime-eddfe51b38755e0068e3c322868c5e209f212f6f.tar.gz latinime-eddfe51b38755e0068e3c322868c5e209f212f6f.tar.xz latinime-eddfe51b38755e0068e3c322868c5e209f212f6f.zip | |
resolved conflicts for merge of 233a2f21 to master
Change-Id: If391cc622367dfb4448c6a5c32b82111d352d86e
Diffstat (limited to 'java/res/values')
| -rw-r--r-- | java/res/values/donottranslate-text-decorator.xml | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/java/res/values/donottranslate-text-decorator.xml b/java/res/values/donottranslate-text-decorator.xml index 832610b96..269364573 100644 --- a/java/res/values/donottranslate-text-decorator.xml +++ b/java/res/values/donottranslate-text-decorator.xml @@ -19,62 +19,11 @@ --> <resources> - <!-- The delay time in milliseconds from to show the commit indicator --> - <integer name="text_decorator_delay_in_milliseconds_to_show_commit_indicator"> - 500 - </integer> - <!-- The extra margin in dp around the hit area of the commit/add-to-dictionary indicator --> <integer name="text_decorator_hit_area_margin_in_dp"> 4 </integer> - <!-- If true, the commit/add-to-text indicator will be suppressed when the word isn't going to - trigger auto-correction. --> - <bool name="text_decorator_only_for_auto_correction">true</bool> - - <!-- If true, the commit/add-to-text indicator will be suppressed when the word is already in - the dictionary. --> - <bool name="text_decorator_only_for_out_of_vocabulary">false</bool> - - <!-- Background color to be used to highlight the target text when the commit indicator is - visible. --> - <color name="text_decorator_commit_indicator_text_highlight_color"> - #B6E2DE - </color> - - <!-- Background color of the commit indicator. --> - <color name="text_decorator_commit_indicator_background_color"> - #48B6AC - </color> - - <!-- Foreground color of the commit indicator. --> - <color name="text_decorator_commit_indicator_foreground_color"> - #FFFFFF - </color> - - <!-- Viewport size of "text_decorator_commit_indicator_path". --> - <integer name="text_decorator_commit_indicator_path_size"> - 480 - </integer> - - <!-- Coordinates of the closed path to be used to render the commit indicator. - The format is: X[0], Y[0], X[1], Y[1], ..., X[N-1], Y[N-1] --> - <integer-array name="text_decorator_commit_indicator_path"> - <item>180</item> - <item>323</item> - <item>97</item> - <item>240</item> - <item>68</item> - <item>268</item> - <item>180</item> - <item>380</item> - <item>420</item> - <item>140</item> - <item>392</item> - <item>112</item> - </integer-array> - <!-- Background color to be used to highlight the target text when the add-to-dictionary indicator is visible. --> <color name="text_decorator_add_to_dictionary_indicator_text_highlight_color"> |