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

Commit 7a84dd66 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Parse share-targets defined by non-main activities" into ub-launcher3-master

parents 7a9f1628 d25023b0

src/com/android/launcher3/model/BgDataModel.java

+2 −1
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ public class BgDataModel { 
        // Now add the new shortcuts to the map.

        for (ShortcutInfo shortcut : shortcuts) {

            boolean shouldShowInContainer = shortcut.isEnabled()

                    && (shortcut.isDeclaredInManifest() || shortcut.isDynamic());

                    && (shortcut.isDeclaredInManifest() || shortcut.isDynamic())

                    && shortcut.getActivity() != null;

            if (shouldShowInContainer) {

                ComponentKey targetComponent

                        = new ComponentKey(shortcut.getActivity(), shortcut.getUserHandle());