diff options
author | Tony Wickham <twickham@google.com> | 2017-02-27 16:30:47 -0800 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2017-03-01 10:16:16 -0800 |
commit | 51889b0be83dc34c9752fc066d0d6e75ab4f5e26 (patch) | |
tree | b3c466ce4742e561fc19dce1a1a028a65f28801b /res/layout/shortcuts_item.xml | |
parent | 7f3526a1a4d5d3578d4648abb1422646d23c6080 (diff) | |
download | android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.tar.gz android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.tar.bz2 android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.zip |
Merge deep shortcuts in rounded rect
- DeepShortcutViews are added to ShortcutsItemView, which
is in PopupContainerWithArrow
- Moved some shortcut-specific logic to ShortcutsItemView
(namely, touch/long-click handling for draggin shortcuts)
- Moved round-rect clipping to PopupItemView
- Removed collapseToIcon() logic, including
PillWidthRevealOutlineProvider, which was only used for
that purpose. It isn't necessary now that the deep
shortcuts have no background themselves.
- Replaced focus pill drawable with ripple effect on
shortcuts and notification view.
Bug: 35766387
Change-Id: I6bc09f1851cfbb806df4bf75a6e435b0f1900c9c
Diffstat (limited to 'res/layout/shortcuts_item.xml')
-rw-r--r-- | res/layout/shortcuts_item.xml | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/res/layout/shortcuts_item.xml b/res/layout/shortcuts_item.xml new file mode 100644 index 000000000..8b20bcbdc --- /dev/null +++ b/res/layout/shortcuts_item.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 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. +--> + +<com.android.launcher3.shortcuts.ShortcutsItemView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/shortcuts_view" + android:layout_width="@dimen/bg_popup_item_width" + android:layout_height="wrap_content" + android:elevation="@dimen/deep_shortcuts_elevation" + android:background="@drawable/bg_white_round_rect"> + + <LinearLayout + android:id="@+id/deep_shortcuts" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + </LinearLayout> + +</com.android.launcher3.shortcuts.ShortcutsItemView> |