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

Commit 36e39535 authored by Jon Miranda's avatar Jon Miranda Committed by Jonathan Miranda
Browse files

[DO NOT MERGE] Merge commit '735d1fe1' into... 

[DO NOT MERGE] Merge commit '735d1fe1' into manual_merge_735d1fe124812fd11feabc644c9a4f8482039f57

The ub-launcher3-qt-future-dev branch cut missed the CLs that went into
ub-launcher3-master, so the merge failed

Change-Id: I4f6f5ca8323350af3bc84c72d61d935b36f8064f
parents 478414a7 735d1fe1

src/com/android/launcher3/Launcher.java

+5 −3
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ import java.util.HashSet; 
import java.util.List;

import java.util.function.Predicate;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;



/**

 * Default launcher application.

 */
@@ -209,10 +212,9 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 
    private static final int ON_ACTIVITY_RESULT_ANIMATION_DELAY = 500;



    // How long to wait before the new-shortcut animation automatically pans the workspace

    private static final int NEW_APPS_PAGE_MOVE_DELAY = 500;

    @VisibleForTesting public static final int NEW_APPS_PAGE_MOVE_DELAY = 500;

    private static final int NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS = 5;

    @Thunk

    static final int NEW_APPS_ANIMATION_DELAY = 500;

    @Thunk @VisibleForTesting public static final int NEW_APPS_ANIMATION_DELAY = 500;



    private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 1;

    private static final int SCRIM_VIEW_ALPHA_CHANNEL_INDEX = 0;

src/com/android/launcher3/compat/PackageInstallerCompatVL.java

+3 −2
Original line number Diff line number Diff line
@@ -139,14 +139,15 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat { 
     * Add a promise app icon to the workspace iff:

     * - The settings for it are enabled

     * - The user installed the app

     * - There is a provided app icon (For apps with no launching activity, no icon is provided).

     * - There is an app icon and label (For apps with no launching activity, no icon is provided).

     */

    private void tryQueuePromiseAppIcon(SessionInfo sessionInfo) {

        if (Utilities.ATLEAST_OREO && FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()

                && SessionCommitReceiver.isEnabled(mAppContext)

                && sessionInfo != null

                && verify(sessionInfo) != null

                && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER

                && sessionInfo.getAppIcon() != null

                && !TextUtils.isEmpty(sessionInfo.getAppLabel())

                && !mPromiseIconIds.contains(sessionInfo.getSessionId())) {

            SessionCommitReceiver.queuePromiseAppIconAddition(mAppContext, sessionInfo);

            mPromiseIconIds.add(sessionInfo.getSessionId());

tests/src/com/android/launcher3/compat/PromiseIconUiTest.java

0 → 100644
+113 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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.

 */

package com.android.launcher3.compat;



import android.content.pm.PackageInstaller.SessionParams;

import android.content.pm.PackageManager;

import android.graphics.Bitmap;

import android.text.TextUtils;



import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.Workspace;

import com.android.launcher3.ui.AbstractLauncherUiTest;



import org.junit.After;

import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.UUID;





/**

 * Test to verify promise icon flow.

 */

@LargeTest

@RunWith(AndroidJUnit4.class)

public class PromiseIconUiTest extends AbstractLauncherUiTest {



    private int mSessionId = -1;



    @Override

    public void setUp() throws Exception {

        super.setUp();

        mDevice.pressHome();

        waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null);

        waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);

        mSessionId = -1;

    }



    @After

    public void tearDown() {

        if (mSessionId > -1) {

            mTargetContext.getPackageManager().getPackageInstaller().abandonSession(mSessionId);

        }

    }



    /**

     * Create a session and return the id.

     */

    private int createSession(String label, Bitmap icon) throws Throwable {

        SessionParams params = new SessionParams(SessionParams.MODE_FULL_INSTALL);

        params.setAppPackageName("test.promise.app");

        params.setAppLabel(label);

        params.setAppIcon(icon);

        params.setInstallReason(PackageManager.INSTALL_REASON_USER);

        return mTargetContext.getPackageManager().getPackageInstaller().createSession(params);

    }



    @Test

    public void testPromiseIcon_addedFromEligibleSession() throws Throwable {

        final String appLabel = "Test Promise App " + UUID.randomUUID().toString();

        final Workspace.ItemOperator findPromiseApp = (info, view) ->

                info != null && TextUtils.equals(info.title, appLabel);



        // Create and add test session

        mSessionId = createSession(appLabel, Bitmap.createBitmap(100, 100, Bitmap.Config.ALPHA_8));



        // Verify promise icon is added

        waitForLauncherCondition("Test Promise App not found on workspace", launcher ->

                launcher.getWorkspace().getFirstMatch(findPromiseApp) != null);



        // Remove session

        mTargetContext.getPackageManager().getPackageInstaller().abandonSession(mSessionId);

        mSessionId = -1;



        // Verify promise icon is removed

        waitForLauncherCondition("Test Promise App not removed from workspace", launcher ->

                launcher.getWorkspace().getFirstMatch(findPromiseApp) == null);

    }



    @Test

    public void testPromiseIcon_notAddedFromIneligibleSession() throws Throwable {

        final String appLabel = "Test Promise App " + UUID.randomUUID().toString();

        final Workspace.ItemOperator findPromiseApp = (info, view) ->

                info != null && TextUtils.equals(info.title, appLabel);



        // Create and add test session without icon or label

        mSessionId = createSession(null, null);



        // Sleep for duration of animation if a view was to be added + some buffer time.

        Thread.sleep(Launcher.NEW_APPS_PAGE_MOVE_DELAY + Launcher.NEW_APPS_ANIMATION_DELAY + 500);



        // Verify promise icon is not added

        waitForLauncherCondition("Test Promise App not found on workspace", launcher ->

                launcher.getWorkspace().getFirstMatch(findPromiseApp) == null);

    }

}