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

Commit 47f8a1c3 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Automerger Merge Worker
Browse files

Merge "App Shortcut menu bug fixes and polish." into sc-dev am: c846245f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14985072

Change-Id: Icba377c0032eee2dacec8a3c4364fa5b958880b7
parents e7cf240e c846245f

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+2 −2
Original line number Diff line number Diff line
@@ -415,8 +415,8 @@ public abstract class BaseQuickstepLauncher extends Launcher 


    @Override

    public Stream<SystemShortcut.Factory> getSupportedShortcuts() {

        return Stream.concat(super.getSupportedShortcuts(),

                Stream.of(WellbeingModel.SHORTCUT_FACTORY));

        return Stream.concat(Stream.of(WellbeingModel.SHORTCUT_FACTORY),

                super.getSupportedShortcuts());

    }



    @Override

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
    @Override

    public Stream<SystemShortcut.Factory> getSupportedShortcuts() {

        return Stream.concat(

                super.getSupportedShortcuts(), Stream.of(mHotseatPredictionController));

                Stream.of(mHotseatPredictionController), super.getSupportedShortcuts());

    }



    /**

res/drawable/ic_drag_handle.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        android:height="@dimen/deep_shortcut_drag_handle_size"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/textColorHint" >

        android:tint="?android:attr/textColorPrimary" >



    <path

        android:pathData="M20,9H4v2h16V9z M4,15h16v-2H4V15z"

res/layout/system_shortcut.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,6 @@ 
        android:layout_height="@dimen/system_shortcut_icon_size"

        android:layout_marginStart="@dimen/system_shortcut_margin_start"

        android:layout_gravity="start|center_vertical"

        android:backgroundTint="?android:attr/textColorTertiary"/>

        android:backgroundTint="?android:attr/textColorPrimary"/>



</com.android.launcher3.shortcuts.DeepShortcutView>

res/layout/widget_shortcut_container.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?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.

-->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/system_shortcut_full"

    android:layout_width="match_parent"

    android:layout_height="@dimen/system_shortcut_header_height"

    android:orientation="horizontal"

    android:gravity="end|center_vertical"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:tag="@string/popup_container_iterate_children"

    android:clipToPadding="true">

</LinearLayout>