diff options
author | Tony <twickham@google.com> | 2016-07-25 17:17:11 -0700 |
---|---|---|
committer | Tony <twickham@google.com> | 2016-07-26 17:54:02 -0700 |
commit | 780c926db5094de5f80bdd3dfedf3e97777cc4f4 (patch) | |
tree | 4d3516c8164ebb050f981307a9eb355dc8ce495d /res | |
parent | eec1f9a839e8c58a96f16f61e998891433e0eb6b (diff) | |
download | android_packages_apps_Trebuchet-780c926db5094de5f80bdd3dfedf3e97777cc4f4.tar.gz android_packages_apps_Trebuchet-780c926db5094de5f80bdd3dfedf3e97777cc4f4.tar.bz2 android_packages_apps_Trebuchet-780c926db5094de5f80bdd3dfedf3e97777cc4f4.zip |
Match updated redlines for shortcuts.
- Align shortcut icons with original icon.
- Drag handle is lighter and smaller.
- Shortcut pills are slightly wider to accommodate long text.
Bug: 28980830
Change-Id: I8e9709e3cbdb9df86a805a4b63a696975c61df5a
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/deep_shortcuts_drag_handle.xml | 6 | ||||
-rw-r--r-- | res/values/dimens.xml | 11 | ||||
-rw-r--r-- | res/values/styles.xml | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/res/drawable/deep_shortcuts_drag_handle.xml b/res/drawable/deep_shortcuts_drag_handle.xml index d5fca2ecf..99d2b07a5 100644 --- a/res/drawable/deep_shortcuts_drag_handle.xml +++ b/res/drawable/deep_shortcuts_drag_handle.xml @@ -15,12 +15,12 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" + android:width="@dimen/deep_shortcut_drag_handle_size" + android:height="@dimen/deep_shortcut_drag_handle_size" android:viewportWidth="24.0" android:viewportHeight="24.0"> <path android:pathData="M20 9H4v2h16V9zM4 15h16v-2H4v2z" - android:fillColor="#757575"/> + android:fillColor="#4D000000"/> </vector>
\ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 6bfd0692b..7436478f9 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -155,7 +155,7 @@ <!-- Deep shortcuts --> <dimen name="deep_shortcuts_elevation">9dp</dimen> - <dimen name="bg_pill_width">180dp</dimen> + <dimen name="bg_pill_width">208dp</dimen> <dimen name="bg_pill_height">48dp</dimen> <dimen name="bg_pill_radius">24dp</dimen> <dimen name="deep_shortcuts_spacing">4dp</dimen> @@ -164,9 +164,18 @@ of the shortcut container before the container is removed. --> <dimen name="deep_shortcuts_start_drag_threshold">35dp</dimen> <dimen name="deep_shortcut_icon_size">36dp</dimen> + <dimen name="deep_shortcut_padding_start">6dp</dimen> + <dimen name="deep_shortcut_padding_end">16dp</dimen> + <dimen name="deep_shortcut_drawable_padding">8dp</dimen> <dimen name="deep_shortcut_anim_translation_y">5dp</dimen> + <dimen name="deep_shortcut_drag_handle_size">16dp</dimen> <dimen name="deep_shortcuts_arrow_width">10dp</dimen> <dimen name="deep_shortcuts_arrow_height">8dp</dimen> <dimen name="deep_shortcuts_arrow_vertical_offset">-2dp</dimen> + <!-- deep_shortcut_padding_start + deep_shortcut_icon_size / 2 - deep_shortcuts_arrow_width / 2--> + <!-- Note that this works for right-aligned shortcuts, too, because + deep_shortcut_padding_end + deep_shortcut_drag_handle_size / 2 - deep_shortcuts_arrow_width / 2 + also happens to equal 19dp--> + <dimen name="deep_shortcuts_arrow_horizontal_offset">19dp</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 627c433e5..a647cf259 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -80,9 +80,9 @@ <style name="Icon.DeepShortcut"> <item name="android:gravity">start|center_vertical</item> <item name="android:elevation">@dimen/deep_shortcuts_elevation</item> - <item name="android:paddingLeft">7dp</item> - <item name="android:paddingRight">12dp</item> - <item name="android:drawablePadding">9dp</item> + <item name="android:paddingStart">@dimen/deep_shortcut_padding_start</item> + <item name="android:paddingEnd">@dimen/deep_shortcut_padding_end</item> + <item name="android:drawablePadding">@dimen/deep_shortcut_drawable_padding</item> <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:shadowRadius">0</item> <item name="customShadows">false</item> |