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

Commit 8469dc98 authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge changes I097134c4,Icfe39c30 into sc-v2-dev 

* changes:
  [Work profile][Test] Remove tracing logs for testWorkeduFlow
  [Work Profile] Enable work profile tests
parents 273aa1c7 9f0981dc

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

+0 −5
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import com.android.launcher3.allapps.search.SearchAdapterProvider; 
import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.keyboard.FocusedItemDecorator;

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

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.ItemInfoMatcher;

import com.android.launcher3.util.Themes;

import com.android.launcher3.views.RecyclerViewFastScroller;
@@ -482,10 +481,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 
        int layout = showTabs ? R.layout.all_apps_tabs : R.layout.all_apps_rv_layout;

        View newView = getLayoutInflater().inflate(layout, this, false);

        addView(newView, index);

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "should show tabs:" + showTabs,

                    new Exception());

        }

        if (showTabs) {

            mViewPager = (AllAppsPagedView) newView;

            mViewPager.initParentViews(this);

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

+4 −0
Original line number Diff line number Diff line
@@ -172,4 +172,8 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP 
    private AllAppsContainerView.AdapterHolder getAH() {

        return mAllApps.mAH[AllAppsContainerView.AdapterHolder.WORK];

    }



    public int getCurrentState() {

        return mCurrentState;

    }

}

src/com/android/launcher3/pm/UserCache.java

+0 −5
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ import android.content.Intent; 
import android.os.UserHandle;

import android.os.UserManager;

import android.util.ArrayMap;

import android.util.Log;

import android.util.LongSparseArray;



import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.launcher3.util.SafeCloseable;

import com.android.launcher3.util.SimpleBroadcastReceiver;
@@ -60,9 +58,6 @@ public class UserCache { 
    private void onUsersChanged(Intent intent) {

        enableAndResetCache();

        mUserChangeListeners.forEach(Runnable::run);

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "profile changed", new Exception());

        }

    }



    /**

src/com/android/launcher3/testing/TestProtocol.java

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ public final class TestProtocol { 
    public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";



    public static final String PERMANENT_DIAG_TAG = "TaplTarget";

    public static final String WORK_PROFILE_REMOVED = "b/159671700";

    public static final String TASK_VIEW_ID_CRASH = "b/195430732";

    public static final String NO_DROP_TARGET = "b/195031154";

    public static final String NULL_INT_SET = "b/200572078";

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

+0 −2
Original line number Diff line number Diff line
@@ -262,8 +262,6 @@ public abstract class AbstractLauncherUiTest { 
        if (userManager != null) {

            for (UserHandle userHandle : userManager.getUserProfiles()) {

                if (!userHandle.isSystem()) {

                    Log.d(TestProtocol.WORK_PROFILE_REMOVED,

                            "removing user " + userHandle.getIdentifier());

                    mDevice.executeShellCommand("pm remove-user " + userHandle.getIdentifier());

                }

            }