diff options
| author | Tony Wickham <twickham@google.com> | 2016-07-20 15:21:04 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2016-07-20 17:28:34 -0700 |
| commit | 377ed3f63ec517ed1ec1957dc1122f96f616fe65 (patch) | |
| tree | 2af2069e1660868fcfcae7ee1835e13a252eb358 /res | |
| parent | 2eeae10e984993af563b4d207deac855ca7d8620 (diff) | |
| download | android_packages_apps_Trebuchet-377ed3f63ec517ed1ec1957dc1122f96f616fe65.tar.gz android_packages_apps_Trebuchet-377ed3f63ec517ed1ec1957dc1122f96f616fe65.tar.bz2 android_packages_apps_Trebuchet-377ed3f63ec517ed1ec1957dc1122f96f616fe65.zip | |
Add drag handle to shortcuts.
Also use short text if long text is ellipsized.
Bug: 30212144
Bug: 28980830
Change-Id: I213766bca0561d284d1da883ca37b0a42d886129
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/deep_shortcuts_drag_handle.xml | 26 | ||||
| -rw-r--r-- | res/layout/deep_shortcut.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/res/drawable/deep_shortcuts_drag_handle.xml b/res/drawable/deep_shortcuts_drag_handle.xml new file mode 100644 index 000000000..d5fca2ecf --- /dev/null +++ b/res/drawable/deep_shortcuts_drag_handle.xml @@ -0,0 +1,26 @@ +<?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:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + + <path + android:pathData="M20 9H4v2h16V9zM4 15h16v-2H4v2z" + android:fillColor="#757575"/> +</vector>
\ No newline at end of file diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml index 089546033..4fcbbd206 100644 --- a/res/layout/deep_shortcut.xml +++ b/res/layout/deep_shortcut.xml @@ -21,7 +21,7 @@ android:elevation="@dimen/deep_shortcuts_elevation" android:background="@drawable/bg_white_pill"> - <com.android.launcher3.BubbleTextView + <com.android.launcher3.shortcuts.DeepShortcutTextView android:id="@+id/deep_shortcut" style="@style/Icon.DeepShortcut" android:focusable="true"/> diff --git a/res/values/styles.xml b/res/values/styles.xml index 532b701d0..627c433e5 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -81,7 +81,8 @@ <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:drawablePadding">12dp</item> + <item name="android:paddingRight">12dp</item> + <item name="android:drawablePadding">9dp</item> <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:shadowRadius">0</item> <item name="customShadows">false</item> |