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

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

Merge "Add tracing to track every allApps rebind" into sc-dev

parents 565975ad a18abf55

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

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.Process; 
import android.text.Selection;

import android.text.SpannableStringBuilder;

import android.util.AttributeSet;

import android.util.Log;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.MotionEvent;
@@ -63,6 +64,7 @@ import com.android.launcher3.config.FeatureFlags; 
import com.android.launcher3.keyboard.FocusedItemDecorator;

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

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

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.ItemInfoMatcher;

import com.android.launcher3.util.MultiValueAlpha;

import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
@@ -493,6 +495,10 @@ 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);

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

+6 −3
Original line number Diff line number Diff line
@@ -154,9 +154,12 @@ public class WorkTabTest extends AbstractLauncherUiTest { 
                Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work tab not setup. Skipping test");

                return false;

            }

            return ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage()

                    == WORK_PAGE && ((TextView) workEduView.findViewById(

                    R.id.content_text)).getText().equals(

            if (((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage()

                    != WORK_PAGE) {

                Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work page not highlighted");

                return false;

            }

            return ((TextView) workEduView.findViewById(R.id.content_text)).getText().equals(

                    l.getResources().getString(R.string.work_profile_edu_work_apps));

        }, 60000);

    }

src/com/android/launcher3/views/WorkEduView.java

+2 −2

File changed.

Contains only whitespace changes.