diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/values-cs/bools.xml | 20 | ||||
-rw-r--r-- | java/res/values-de/bools.xml | 20 | ||||
-rw-r--r-- | java/res/values-en/bools.xml | 20 | ||||
-rw-r--r-- | java/res/values-es/bools.xml | 20 | ||||
-rw-r--r-- | java/res/values-fr/bools.xml | 20 | ||||
-rw-r--r-- | java/res/values-land/dimens.xml | 6 | ||||
-rw-r--r-- | java/res/values-nl/bools.xml | 20 | ||||
-rw-r--r-- | java/res/values-pl/bools.xml | 20 | ||||
-rw-r--r-- | java/res/values-sw600dp-land/dimens.xml | 6 | ||||
-rw-r--r-- | java/res/values-sw600dp/dimens.xml | 9 | ||||
-rw-r--r-- | java/res/values-sw768dp-land/dimens.xml | 6 | ||||
-rw-r--r-- | java/res/values-sw768dp/dimens.xml | 9 | ||||
-rw-r--r-- | java/res/values/attrs.xml | 13 | ||||
-rw-r--r-- | java/res/values/bools.xml | 18 | ||||
-rw-r--r-- | java/res/values/dimens.xml | 16 | ||||
-rw-r--r-- | java/res/values/styles.xml | 15 |
16 files changed, 137 insertions, 101 deletions
diff --git a/java/res/values-cs/bools.xml b/java/res/values-cs/bools.xml index 897f4b3db..dabfff8ba 100644 --- a/java/res/values-cs/bools.xml +++ b/java/res/values-cs/bools.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <resources> - <bool name="im_is_default">true</bool> + <bool name="im_is_default">true</bool> </resources> diff --git a/java/res/values-de/bools.xml b/java/res/values-de/bools.xml index 897f4b3db..dabfff8ba 100644 --- a/java/res/values-de/bools.xml +++ b/java/res/values-de/bools.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <resources> - <bool name="im_is_default">true</bool> + <bool name="im_is_default">true</bool> </resources> diff --git a/java/res/values-en/bools.xml b/java/res/values-en/bools.xml index 897f4b3db..dabfff8ba 100644 --- a/java/res/values-en/bools.xml +++ b/java/res/values-en/bools.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <resources> - <bool name="im_is_default">true</bool> + <bool name="im_is_default">true</bool> </resources> diff --git a/java/res/values-es/bools.xml b/java/res/values-es/bools.xml index 897f4b3db..dabfff8ba 100644 --- a/java/res/values-es/bools.xml +++ b/java/res/values-es/bools.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <resources> - <bool name="im_is_default">true</bool> + <bool name="im_is_default">true</bool> </resources> diff --git a/java/res/values-fr/bools.xml b/java/res/values-fr/bools.xml index 897f4b3db..dabfff8ba 100644 --- a/java/res/values-fr/bools.xml +++ b/java/res/values-fr/bools.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <resources> - <bool name="im_is_default">true</bool> + <bool name="im_is_default">true</bool> </resources> diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index a1546f11d..fdd94347d 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -73,4 +73,10 @@ <dimen name="more_keys_keyboard_slide_allowance">53.76dp</dimen> <!-- popup_key_height x -1.0 --> <dimen name="more_keys_keyboard_vertical_correction">-44.8dp</dimen> + + <!-- Gesture floating preview text parameters --> + <dimen name="gesture_floating_preview_text_size">23dp</dimen> + <dimen name="gesture_floating_preview_text_offset">54dp</dimen> + <dimen name="gesture_floating_preview_horizontal_padding">23dp</dimen> + <dimen name="gesture_floating_preview_vertical_padding">15dp</dimen> </resources> diff --git a/java/res/values-nl/bools.xml b/java/res/values-nl/bools.xml index 897f4b3db..dabfff8ba 100644 --- a/java/res/values-nl/bools.xml +++ b/java/res/values-nl/bools.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <resources> - <bool name="im_is_default">true</bool> + <bool name="im_is_default">true</bool> </resources> diff --git a/java/res/values-pl/bools.xml b/java/res/values-pl/bools.xml index 897f4b3db..dabfff8ba 100644 --- a/java/res/values-pl/bools.xml +++ b/java/res/values-pl/bools.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <resources> - <bool name="im_is_default">true</bool> + <bool name="im_is_default">true</bool> </resources> diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 9664bf9ed..51c710fa4 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -61,4 +61,10 @@ <dimen name="suggestions_strip_padding">252.0dp</dimen> <integer name="max_more_suggestions_row">5</integer> <fraction name="min_more_suggestions_width">50%</fraction> + + <!-- Gesture floating preview text parameters --> + <dimen name="gesture_floating_preview_text_size">26dp</dimen> + <dimen name="gesture_floating_preview_text_offset">76dp</dimen> + <dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen> + <dimen name="gesture_floating_preview_vertical_padding">17dp</dimen> </resources> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index e608f7d7b..586fbe6da 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -84,4 +84,13 @@ <dimen name="suggestion_padding">12dp</dimen> <dimen name="suggestion_text_size">22dp</dimen> <dimen name="more_suggestions_hint_text_size">33dp</dimen> + + <!-- Gesture preview trail parameters --> + <dimen name="gesture_preview_trail_width">2.5dp</dimen> + <!-- Gesture floating preview text parameters --> + <dimen name="gesture_floating_preview_text_size">28dp</dimen> + <dimen name="gesture_floating_preview_text_offset">87dp</dimen> + <dimen name="gesture_floating_preview_horizontal_padding">28dp</dimen> + <dimen name="gesture_floating_preview_vertical_padding">19dp</dimen> + <dimen name="gesture_floating_preview_round_radius">3dp</dimen> </resources> diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index 511217068..f4a57ffb0 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -64,4 +64,10 @@ <dimen name="suggestions_strip_padding">252.0dp</dimen> <fraction name="min_more_suggestions_width">50%</fraction> + + <!-- Gesture floating preview text parameters --> + <dimen name="gesture_floating_preview_text_size">32dp</dimen> + <dimen name="gesture_floating_preview_text_offset">100dp</dimen> + <dimen name="gesture_floating_preview_horizontal_padding">32dp</dimen> + <dimen name="gesture_floating_preview_vertical_padding">21dp</dimen> </resources> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index ec9d75988..2fd732293 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -85,4 +85,13 @@ <dimen name="suggestion_padding">8dp</dimen> <dimen name="suggestion_text_size">22dp</dimen> <dimen name="more_suggestions_hint_text_size">33dp</dimen> + + <!-- Gesture preview trail parameters --> + <dimen name="gesture_preview_trail_width">2.5dp</dimen> + <!-- Gesture floating preview text parameters --> + <dimen name="gesture_floating_preview_text_size">26dp</dimen> + <dimen name="gesture_floating_preview_text_offset">86dp</dimen> + <dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen> + <dimen name="gesture_floating_preview_vertical_padding">17dp</dimen> + <dimen name="gesture_floating_preview_round_radius">3dp</dimen> </resources> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 05c53a40e..7e8c77e13 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -77,12 +77,10 @@ <attr name="gestureFloatingPreviewTextSize" format="dimension" /> <attr name="gestureFloatingPreviewTextColor" format="color" /> <attr name="gestureFloatingPreviewTextOffset" format="dimension" /> - <attr name="gestureFloatingPreviewTextShadingColor" format="color" /> - <attr name="gestureFloatingPreviewTextShadingBorder" format="dimension" /> - <attr name="gestureFloatingPreviewTextShadowColor" format="color" /> - <attr name="gestureFloatingPreviewTextShadowBorder" format="dimension" /> - <attr name="gestureFloatingPreviewTextConnectorColor" format="color" /> - <attr name="gestureFloatingPreviewTextConnectorWidth" format="dimension" /> + <attr name="gestureFloatingPreviewColor" format="color" /> + <attr name="gestureFloatingPreviewHorizontalPadding" format="dimension" /> + <attr name="gestureFloatingPreviewVerticalPadding" format="dimension" /> + <attr name="gestureFloatingPreviewRoundRadius" format="dimension" /> <!-- Delay after gesture input and gesture floating preview text dismissing in millisecond --> <attr name="gestureFloatingPreviewTextLingerTimeout" format="integer" /> <!-- Delay after gesture trail starts fading out in millisecond. --> @@ -92,7 +90,8 @@ <!-- Interval of updating gesture preview trail in millisecond. --> <attr name="gesturePreviewTrailUpdateInterval" format="integer" /> <attr name="gesturePreviewTrailColor" format="color" /> - <attr name="gesturePreviewTrailWidth" format="dimension" /> + <attr name="gesturePreviewTrailStartWidth" format="dimension" /> + <attr name="gesturePreviewTrailEndWidth" format="dimension" /> </declare-styleable> <declare-styleable name="MainKeyboardView"> diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml index 889d8f784..006959600 100644 --- a/java/res/values/bools.xml +++ b/java/res/values/bools.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index aa16c7770..d92a71560 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -99,13 +99,15 @@ <integer name="suggestions_count_in_strip">3</integer> <fraction name="center_suggestion_percentile">36%</fraction> - <!-- Gesture preview parameters --> - <dimen name="gesture_preview_trail_width">2.5dp</dimen> - <dimen name="gesture_floating_preview_text_size">35dp</dimen> - <dimen name="gesture_floating_preview_text_offset">75dp</dimen> - <dimen name="gesture_floating_preview_text_shadow_border">17.5dp</dimen> - <dimen name="gesture_floating_preview_text_shading_border">7.5dp</dimen> - <dimen name="gesture_floating_preview_text_connector_width">1.0dp</dimen> + <!-- Gesture preview trail parameters --> + <dimen name="gesture_preview_trail_start_width">18.0dp</dimen> + <dimen name="gesture_preview_trail_end_width">2.5dp</dimen> + <!-- Gesture floating preview text parameters --> + <dimen name="gesture_floating_preview_text_size">24dp</dimen> + <dimen name="gesture_floating_preview_text_offset">73dp</dimen> + <dimen name="gesture_floating_preview_horizontal_padding">24dp</dimen> + <dimen name="gesture_floating_preview_vertical_padding">16dp</dimen> + <dimen name="gesture_floating_preview_round_radius">3dp</dimen> <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. --> <dimen name="accessibility_edge_slop">8dp</dimen> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 40f1ff3f4..ed92440ef 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -66,20 +66,19 @@ <item name="backgroundDimAlpha">128</item> <!-- android:color/holo_blue_light=#FF33B5E5 --> <item name="gestureFloatingPreviewTextSize">@dimen/gesture_floating_preview_text_size</item> - <item name="gestureFloatingPreviewTextColor">@android:color/white</item> + <item name="gestureFloatingPreviewTextColor">@android:color/holo_blue_light</item> <item name="gestureFloatingPreviewTextOffset">@dimen/gesture_floating_preview_text_offset</item> - <item name="gestureFloatingPreviewTextShadingColor">@android:color/holo_blue_light</item> - <item name="gestureFloatingPreviewTextShadingBorder">@dimen/gesture_floating_preview_text_shading_border</item> - <item name="gestureFloatingPreviewTextShadowColor">#FF252525</item> - <item name="gestureFloatingPreviewTextShadowBorder">@dimen/gesture_floating_preview_text_shadow_border</item> - <item name="gestureFloatingPreviewTextConnectorColor">@android:color/white</item> - <item name="gestureFloatingPreviewTextConnectorWidth">@dimen/gesture_floating_preview_text_connector_width</item> + <item name="gestureFloatingPreviewColor">#C0000000</item> + <item name="gestureFloatingPreviewHorizontalPadding">@dimen/gesture_floating_preview_horizontal_padding</item> + <item name="gestureFloatingPreviewVerticalPadding">@dimen/gesture_floating_preview_vertical_padding</item> + <item name="gestureFloatingPreviewRoundRadius">@dimen/gesture_floating_preview_round_radius</item> <item name="gestureFloatingPreviewTextLingerTimeout">@integer/config_gesture_floating_preview_text_linger_timeout</item> <item name="gesturePreviewTrailFadeoutStartDelay">@integer/config_gesture_preview_trail_fadeout_start_delay</item> <item name="gesturePreviewTrailFadeoutDuration">@integer/config_gesture_preview_trail_fadeout_duration</item> <item name="gesturePreviewTrailUpdateInterval">@integer/config_gesture_preview_trail_update_interval</item> <item name="gesturePreviewTrailColor">@android:color/holo_blue_light</item> - <item name="gesturePreviewTrailWidth">@dimen/gesture_preview_trail_width</item> + <item name="gesturePreviewTrailStartWidth">@dimen/gesture_preview_trail_start_width</item> + <item name="gesturePreviewTrailEndWidth">@dimen/gesture_preview_trail_end_width</item> <!-- Common attributes of MainKeyboardView --> <item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</item> <item name="touchNoiseThresholdTime">@integer/config_touch_noise_threshold_time</item> |