diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/ic_allapps_caret.xml | 26 | ||||
| -rw-r--r-- | res/interpolator/caret_animation_interpolator.xml | 4 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/config.xml | 3 | ||||
| -rw-r--r-- | res/values/dimens.xml | 6 |
5 files changed, 12 insertions, 28 deletions
diff --git a/res/drawable/ic_allapps_caret.xml b/res/drawable/ic_allapps_caret.xml deleted file mode 100644 index 34d1882dc..000000000 --- a/res/drawable/ic_allapps_caret.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2016 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 - - 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 - limitations under the License. ---> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" - android:height="24dp" - android:viewportHeight="48.0" - android:viewportWidth="48.0" - android:width="24dp" > - <path - android:fillColor="#FFFFFF" - android:pathData="M14.83,30.83L24,21.66l9.17,9.17L36,28 24,16 12,28z"/> -</vector> diff --git a/res/interpolator/caret_animation_interpolator.xml b/res/interpolator/caret_animation_interpolator.xml new file mode 100644 index 000000000..25af4bc0f --- /dev/null +++ b/res/interpolator/caret_animation_interpolator.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<pathInterpolator + xmlns:android="http://schemas.android.com/apk/res/android" + android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index 937b2f05a..dccc53ef9 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -36,6 +36,7 @@ <color name="outline_color">#FFFFFFFF</color> <color name="all_apps_divider_color">#1E000000</color> + <color name="all_apps_caret_color">#FFFFFFFF</color> <color name="spring_loaded_panel_color">#40FFFFFF</color> <color name="spring_loaded_highlighted_panel_border_color">#FFF</color> diff --git a/res/values/config.xml b/res/values/config.xml index 47bfa30e1..a678958bb 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -57,6 +57,9 @@ <!-- The distance at which the animation should take the max duration --> <integer name="config_dropAnimMaxDist">800</integer> + <!-- The duration of the caret animation --> + <integer name="config_caretAnimationDuration">200</integer> + <!-- Hotseat --> <bool name="hotseat_transpose_layout_with_orientation">true</bool> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 1775d098f..38775f14f 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -58,7 +58,7 @@ <dimen name="container_min_margin">8dp</dimen> <dimen name="container_max_width">0dp</dimen> - <!-- All Apps --> +<!-- All Apps --> <dimen name="all_apps_button_scale_down">0dp</dimen> <dimen name="all_apps_grid_view_start_margin">0dp</dimen> <dimen name="all_apps_grid_section_y_offset">8dp</dimen> @@ -74,8 +74,10 @@ <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen> <dimen name="all_apps_background_canvas_width">700dp</dimen> <dimen name="all_apps_background_canvas_height">475dp</dimen> + <dimen name="all_apps_caret_stroke_width">2dp</dimen> + <dimen name="all_apps_caret_inset">8dp</dimen> - <!-- Search bar in All Apps --> +<!-- Search bar in All Apps --> <dimen name="all_apps_header_max_elevation">3dp</dimen> <dimen name="all_apps_header_scroll_to_elevation">16dp</dimen> <dimen name="all_apps_header_shadow_height">6dp</dimen> |