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

Commit 9d38a3fd authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

Add logging to work mode switch 

Add logging to the work button on work profile, logging when button
is extended and collapsed

bug: 263817965
test: presubmit
Change-Id: I3194d0a1567a9ee995497391350ed5be4b08c3db
parent eef0b164

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

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte 


        mWorkManager = new WorkProfileManager(

                mActivityContext.getSystemService(UserManager.class),

                this, LauncherPrefs.getPrefs(mActivityContext));

                this, LauncherPrefs.getPrefs(mActivityContext),

                mActivityContext.getStatsLogManager());

        mAH = Arrays.asList(null, null, null);

        mNavBarScrimPaint = new Paint();

        mNavBarScrimPaint.setColor(Themes.getAttrColor(context, R.attr.allAppsNavBarScrimColor));

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

+8 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.launcher3.allapps;



import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORK_FAB_BUTTON_COLLAPSE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORK_FAB_BUTTON_EXTEND;

import static com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.getTabWidth;



import android.animation.LayoutTransition;
@@ -37,6 +39,7 @@ import com.android.launcher3.R; 
import com.android.launcher3.Utilities;

import com.android.launcher3.anim.KeyboardInsetAnimationCallback;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.logging.StatsLogManager;

import com.android.launcher3.model.StringCache;

import com.android.launcher3.views.ActivityContext;

/**
@@ -59,6 +62,8 @@ public class WorkModeSwitch extends LinearLayout implements Insettable, 
    private final int mScrollThreshold;

    private ImageView mIcon;

    private TextView mTextView;

    private final StatsLogManager mStatsLogManager;





    public WorkModeSwitch(@NonNull Context context) {

        this(context, null, 0);
@@ -72,6 +77,7 @@ public class WorkModeSwitch extends LinearLayout implements Insettable, 
        super(context, attrs, defStyleAttr);

        mScrollThreshold = Utilities.dpToPx(SCROLL_THRESHOLD_DP);

        mActivityContext = ActivityContext.lookupContext(getContext());

        mStatsLogManager = mActivityContext.getStatsLogManager();

    }



    @Override
@@ -197,10 +203,12 @@ public class WorkModeSwitch extends LinearLayout implements Insettable, 


    public void extend() {

        mTextView.setVisibility(VISIBLE);

        mStatsLogManager.logger().log(LAUNCHER_WORK_FAB_BUTTON_EXTEND);

    }



    public void shrink(){

        mTextView.setVisibility(GONE);

        mStatsLogManager.logger().log(LAUNCHER_WORK_FAB_BUTTON_COLLAPSE);

    }



    public int getScrollThreshold() {

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

+6 −5
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ import androidx.recyclerview.widget.RecyclerView; 
import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.BaseAllAppsAdapter.AdapterItem;

import com.android.launcher3.logging.StatsLogManager;

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

import com.android.launcher3.views.ActivityContext;

import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip;



import java.lang.annotation.Retention;
@@ -80,6 +80,7 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP 
    private final UserManager mUserManager;

    private final BaseAllAppsContainerView<?> mAllApps;

    private final Predicate<ItemInfo> mMatcher;

    private final StatsLogManager mStatsLogManager;



    private WorkModeSwitch mWorkModeSwitch;
@@ -88,11 +89,13 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP 
    private SharedPreferences mPreferences;



    public WorkProfileManager(

            UserManager userManager, BaseAllAppsContainerView<?> allApps, SharedPreferences prefs) {

            UserManager userManager, BaseAllAppsContainerView<?> allApps, SharedPreferences prefs,

            StatsLogManager statsLogManager) {

        mUserManager = userManager;

        mAllApps = allApps;

        mPreferences = prefs;

        mMatcher = mAllApps.mPersonalMatcher.negate();

        mStatsLogManager = statsLogManager;

    }



    /**
@@ -227,9 +230,7 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP 


    private void onWorkFabClicked(View view) {

        if (Utilities.ATLEAST_P && mCurrentState == STATE_ENABLED && mWorkModeSwitch.isEnabled()) {

            ActivityContext activityContext = ActivityContext.lookupContext(

                    mWorkModeSwitch.getContext());

            activityContext.getStatsLogManager().logger().log(LAUNCHER_TURN_OFF_WORK_APPS_TAP);

            mStatsLogManager.logger().log(LAUNCHER_TURN_OFF_WORK_APPS_TAP);

            setWorkProfileEnabled(false);

        }

    }

src/com/android/launcher3/logging/StatsLogManager.java

+7 −1
Original line number Diff line number Diff line
@@ -624,7 +624,13 @@ public class StatsLogManager implements ResourceBasedOverride { 
        LAUNCHER_KEYBOARD_SHORTCUT_SPLIT_RIGHT_BOTTOM(1232),



        @UiEvent(doc = "User has invoked split to left half with a keyboard shortcut.")

        LAUNCHER_KEYBOARD_SHORTCUT_SPLIT_LEFT_TOP(1233)

        LAUNCHER_KEYBOARD_SHORTCUT_SPLIT_LEFT_TOP(1233),



        @UiEvent(doc = "User has collapsed the work FAB button by swiping down")

        LAUNCHER_WORK_FAB_BUTTON_COLLAPSE(1276),



        @UiEvent(doc = "User has collapsed the work FAB button by swiping up")

        LAUNCHER_WORK_FAB_BUTTON_EXTEND(1277),

        ;



        // ADD MORE