Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 285c76dd authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Add outline to shortcuts when focused." into ub-launcher3-calgary-polish

parents 621ae5c2 8dd5168b
Loading
Loading
Loading
Loading
+25 −0
Original line number Diff line number Diff line
<?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
+2 −1
Original line number Diff line number Diff line
@@ -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"
+3 −1
Original line number Diff line number Diff line
@@ -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