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

Commit c8af851e authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

Fix gray work apps when WorkPausedCard shoul've shown 

The reason is because WorkManager doesn't reset when user searches (which is why the apps gray out when you go to toast, turn off work profile then back gesture to all apps)

Added test for ActivityAllAppsContainerView that test onAppsUpdated() and check for if there are work apps.
From the test environment, onAppsUpdated() needs to be public because the method is outside the package. However, I've wrapped onAppsUpdated package private so I can test it with a boolean parameter.

bug: 298492729
test: video:
before: https://drive.google.com/file/d/1D0VlGeJEI5lGbYgP5Tnu5UO_Dv61X8Dv/view?usp=sharing
after: https://drive.google.com/file/d/1D0qsq7sX_kAp2t92xser7YI4ADBhQfHY/view?usp=sharing
Change-Id: I4eb7cf21e273e29171fcd62a4762e8bb1778e720
parent 9dfbb0ac

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

+12 −6
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
    protected final List<AdapterHolder> mAH;

    protected final Predicate<ItemInfo> mPersonalMatcher = ItemInfoMatcher.ofUser(

            Process.myUserHandle());

    protected final WorkProfileManager mWorkManager;

    protected WorkProfileManager mWorkManager;

    protected final Point mFastScrollerOffset = new Point();

    protected final int mScrimColor;

    protected final float mHeaderThreshold;
@@ -966,14 +966,15 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
        mBottomSheetAlpha = mActivityContext.getDeviceProfile().isTablet ? 1f : alpha;

    }



    private void onAppsUpdated() {

        mHasWorkApps = Stream.of(mAllAppsStore.getApps()).anyMatch(mWorkManager.getMatcher());

    @VisibleForTesting

    public void onAppsUpdated() {

        mHasWorkApps = mWorkManager.hasWorkApps();

        if (!isSearching()) {

            rebindAdapters();

        }

        if (mHasWorkApps) {

            mWorkManager.reset();

        }

        }



        mActivityContext.getStatsLogManager().logger()

                .withCardinality(mAllAppsStore.getApps().length)
@@ -1216,6 +1217,11 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
        }

    }



    @VisibleForTesting

    public void setWorkManager(WorkProfileManager workManager) {

        mWorkManager = workManager;

    }



    @VisibleForTesting

    public boolean isPersonalTabVisible() {

        return isDescendantViewVisible(R.id.tab_personal);

src/com/android/launcher3/allapps/WorkProfileManager.java

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.function.Predicate;

import java.util.stream.Stream;



/**

 * Companion class for {@link ActivityAllAppsContainerView} to manage work tab and personal tab
@@ -215,6 +216,10 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP 
        return mCurrentState != WorkProfileManager.STATE_DISABLED;

    }



    public boolean hasWorkApps() {

        return Stream.of(mAllApps.getAppsStore().getApps()).anyMatch(mMatcher);

    }



    /**

     * Adds work profile specific adapter items to adapterItems and returns number of items added

     */

tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java

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

 * Copyright (C) 2023 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.ui;



import static androidx.test.core.app.ApplicationProvider.getApplicationContext;



import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;



import static com.google.common.truth.Truth.assertThat;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.os.UserHandle;

import android.os.UserManager;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.allapps.ActivityAllAppsContainerView;

import com.android.launcher3.allapps.WorkProfileManager;

import com.android.launcher3.logging.StatsLogManager;

import com.android.launcher3.model.data.AppInfo;

import com.android.launcher3.util.ActivityContextWrapper;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class ActivityAllAppsContainerViewTest {



    private static final UserHandle WORK_HANDLE = new UserHandle(13);

    @Mock

    private StatsLogManager mStatsLogManager;

    private AppInfo[] mWorkAppInfo;

    private ActivityAllAppsContainerView<?> mActivityAllAppsContainerView;

    private WorkProfileManager mWorkManager;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        Context context = new ActivityContextWrapper(getApplicationContext());

        mActivityAllAppsContainerView = new ActivityAllAppsContainerView(context);

        mWorkManager = new WorkProfileManager(context.getSystemService(UserManager.class),

                mActivityAllAppsContainerView, mStatsLogManager);

        mActivityAllAppsContainerView.setWorkManager(mWorkManager);

        ComponentName componentName = new ComponentName(context,

                "com.android.launcher3.tests.Activity" + "Gmail");

        AppInfo gmailWorkAppInfo = new AppInfo(componentName, "Gmail", WORK_HANDLE, new Intent());

        mWorkAppInfo = new AppInfo[]{gmailWorkAppInfo};

    }



    @Test

    public void testOnAppsUpdatedWithoutWorkApps_shouldShowTabsIsFalse() {

        mActivityAllAppsContainerView.getAppsStore().setApps(EMPTY_ARRAY, 0, null);



        mActivityAllAppsContainerView.onAppsUpdated();



        assertThat(mActivityAllAppsContainerView.shouldShowTabs()).isEqualTo(false);

    }



    @Test

    public void testOnAppsUpdatedWithWorkApps_shouldShowTabsIsTrue() {

        mActivityAllAppsContainerView.getAppsStore().setApps(mWorkAppInfo, 0, null);



        mActivityAllAppsContainerView.onAppsUpdated();



        assertThat(mActivityAllAppsContainerView.shouldShowTabs()).isEqualTo(true);

    }

}