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

Commit d3b87ef1 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Adding quiet mode support for shortcuts 

> LauncherApps returns empty list when the user is locked. Not relying on
LauncherApps in this case
> When the user is locked, removing all dynamic shortcuts
> Loading shortcuts from DB when the user is locked
> Verifying the shortcuts again when the user is available

Bug: 30411561
Change-Id: Ib6eb372c5b009cadb86a8f6e781f3f3cbf787ceb
parent c42087e5

src/com/android/launcher3/Launcher.java

+41 −15
Original line number Diff line number Diff line
@@ -117,8 +117,10 @@ import com.android.launcher3.model.WidgetsModel; 
import com.android.launcher3.pageindicators.PageIndicator;

import com.android.launcher3.shortcuts.DeepShortcutManager;

import com.android.launcher3.shortcuts.DeepShortcutsContainer;

import com.android.launcher3.shortcuts.ShortcutKey;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.ItemInfoMatcher;

import com.android.launcher3.util.MultiHashMap;

import com.android.launcher3.util.PackageManagerHelper;

import com.android.launcher3.util.TestingUtils;
@@ -2655,14 +2657,17 @@ public class Launcher extends Activity 
        final ShortcutInfo shortcut = (ShortcutInfo) tag;



        if (shortcut.isDisabled != 0) {

            if ((shortcut.isDisabled & ShortcutInfo.FLAG_DISABLED_SUSPENDED) != 0

                || (shortcut.isDisabled & ShortcutInfo.FLAG_DISABLED_QUIET_USER) != 0) {

                // Launch activity anyway, framework will tell the user why the app is suspended.

            if ((shortcut.isDisabled &

                    ~ShortcutInfo.FLAG_DISABLED_SUSPENDED &

                    ~ShortcutInfo.FLAG_DISABLED_QUIET_USER) == 0) {

                // If the app is only disabled because of the above flags, launch activity anyway.

                // Framework will tell the user why the app is suspended.

            } else {

                int error = R.string.activity_not_available;

                if ((shortcut.isDisabled & ShortcutInfo.FLAG_DISABLED_SAFEMODE) != 0) {

                    error = R.string.safemode_shortcut_error;

                } else if ((shortcut.isDisabled & ShortcutInfo.FLAG_DISABLED_BY_PUBLISHER) != 0) {

                } else if ((shortcut.isDisabled & ShortcutInfo.FLAG_DISABLED_BY_PUBLISHER) != 0 ||

                        (shortcut.isDisabled & ShortcutInfo.FLAG_DISABLED_LOCKED_USER) != 0) {

                    error = R.string.shortcut_not_available;

                }

                Toast.makeText(this, error, Toast.LENGTH_SHORT).show();
@@ -4208,8 +4213,12 @@ public class Launcher extends Activity 


    /**

     * Some shortcuts were updated in the background.

     *

     * Implementation of the method from LauncherModel.Callbacks.

     *

     * @param updated list of shortcuts which have changed.

     * @param removed list of shortcuts which were deleted in the background. This can happen when

     *                an app gets removed from the system or some of its components are no longer

     *                available.

     */

    @Override

    public void bindShortcutsChanged(final ArrayList<ShortcutInfo> updated,
@@ -4228,13 +4237,28 @@ public class Launcher extends Activity 
        }



        if (!removed.isEmpty()) {

            HashSet<ComponentName> removedComponents = new HashSet<ComponentName>();

            HashSet<ComponentName> removedComponents = new HashSet<>();

            HashSet<ShortcutKey> removedDeepShortcuts = new HashSet<>();



            for (ShortcutInfo si : removed) {

                if (si.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) {

                    removedDeepShortcuts.add(ShortcutKey.fromItemInfo(si));

                } else {

                    removedComponents.add(si.getTargetComponent());

                }

            mWorkspace.removeItemsByComponentName(removedComponents, user);

            // Notify the drag controller

            mDragController.onAppsRemoved(new HashSet<String>(), removedComponents);

            }



            if (!removedComponents.isEmpty()) {

                ItemInfoMatcher matcher = ItemInfoMatcher.ofComponents(removedComponents, user);

                mWorkspace.removeItemsByMatcher(matcher);

                mDragController.onAppsRemoved(matcher);

            }



            if (!removedDeepShortcuts.isEmpty()) {

                ItemInfoMatcher matcher = ItemInfoMatcher.ofShortcutKeys(removedDeepShortcuts);

                mWorkspace.removeItemsByMatcher(matcher);

                mDragController.onAppsRemoved(matcher);

            }

        }

    }
@@ -4277,14 +4301,16 @@ public class Launcher extends Activity 
            return;

        }

        if (!packageNames.isEmpty()) {

            mWorkspace.removeItemsByPackageName(packageNames, user);

            ItemInfoMatcher matcher = ItemInfoMatcher.ofPackages(packageNames, user);

            mWorkspace.removeItemsByMatcher(matcher);

            mDragController.onAppsRemoved(matcher);



        }

        if (!components.isEmpty()) {

            mWorkspace.removeItemsByComponentName(components, user);

            ItemInfoMatcher matcher = ItemInfoMatcher.ofComponents(components, user);

            mWorkspace.removeItemsByMatcher(matcher);

            mDragController.onAppsRemoved(matcher);

        }

        // Notify the drag controller

        mDragController.onAppsRemoved(packageNames, components);



    }



    @Override

src/com/android/launcher3/LauncherAppState.java

+5 −4
Original line number Diff line number Diff line
@@ -109,10 +109,11 @@ public class LauncherAppState { 
        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_LOCALE_CHANGED);

        // For handling managed profiles

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_AVAILABLE);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_UNAVAILABLE);

        filter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED);

        filter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);

        filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);

        filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);

        filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNLOCKED);

        // For extracting colors from the wallpaper

        if (Utilities.isNycOrAbove()) {

            // TODO: add a broadcast entry to the manifest for pre-N.