diff options
-rw-r--r-- | res/drawable/bg_pill_focused.xml | 25 | ||||
-rw-r--r-- | res/layout/deep_shortcut.xml | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 4 |
3 files changed, 30 insertions, 2 deletions
diff --git a/res/drawable/bg_pill_focused.xml b/res/drawable/bg_pill_focused.xml new file mode 100644 index 000000000..37afad037 --- /dev/null +++ b/res/drawable/bg_pill_focused.xml @@ -0,0 +1,25 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_focused="true"> + <shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <stroke android:color="#616161" android:width="2dp"/> + <corners android:radius="@dimen/bg_pill_radius" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml index 2d66d728f..7b42ec70e 100644 --- a/res/layout/deep_shortcut.xml +++ b/res/layout/deep_shortcut.xml @@ -26,7 +26,8 @@ style="@style/Icon.DeepShortcut" android:layout_width="match_parent" android:layout_height="match_parent" - android:focusable="true" /> + android:focusable="true" + android:background="@drawable/bg_pill_focused" /> <View android:id="@+id/deep_shortcut_icon" diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index e5ec6ba9f..58638288e 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -506,7 +506,9 @@ public class DragLayer extends InsettableFrameLayout { @Override public boolean dispatchUnhandledMove(View focused, int direction) { - return mDragController.dispatchUnhandledMove(focused, direction); + // Consume the unhandled move if a container is open, to avoid switching pages underneath. + boolean isContainerOpen = mLauncher.getTopFloatingView() != null; + return isContainerOpen || mDragController.dispatchUnhandledMove(focused, direction); } @Override |