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

Commit a48f2e72 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move rotate button logging to Westworld" into rvc-dev am: 89fde50c 

Change-Id: Ic7a9876d1ba5b9c5eb9d36b082b715bfe1083bb9
parents 98dbfc41 89fde50c

packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButtonController.java

+21 −5
Original line number Original line Diff line number Diff line
@@ -37,8 +37,9 @@ import android.view.View; 
import android.view.WindowManagerGlobal;

import android.view.WindowManagerGlobal;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityManager;





import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEvent;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.UiEventLoggerImpl;

import com.android.systemui.Dependency;

import com.android.systemui.Dependency;

import com.android.systemui.Interpolators;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.R;
@@ -60,7 +61,7 @@ public class RotationButtonController { 




    private static final int NUM_ACCEPTED_ROTATION_SUGGESTIONS_FOR_INTRODUCTION = 3;

    private static final int NUM_ACCEPTED_ROTATION_SUGGESTIONS_FOR_INTRODUCTION = 3;





    private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);

    private final UiEventLogger mUiEventLogger = new UiEventLoggerImpl();

    private final ViewRippler mViewRippler = new ViewRippler();

    private final ViewRippler mViewRippler = new ViewRippler();





    private @StyleRes int mStyleRes;

    private @StyleRes int mStyleRes;
@@ -323,7 +324,7 @@ public class RotationButtonController { 
    }

    }





    private void onRotateSuggestionClick(View v) {

    private void onRotateSuggestionClick(View v) {

        mMetricsLogger.action(MetricsEvent.ACTION_ROTATION_SUGGESTION_ACCEPTED);

        mUiEventLogger.log(RotationButtonEvent.ROTATION_SUGGESTION_ACCEPTED);

        incrementNumAcceptedRotationSuggestionsIfNeeded();

        incrementNumAcceptedRotationSuggestionsIfNeeded();

        setRotationLockedAtAngle(mLastRotationSuggestion);

        setRotationLockedAtAngle(mLastRotationSuggestion);

    }

    }
@@ -345,7 +346,7 @@ public class RotationButtonController { 
    private void showAndLogRotationSuggestion() {

    private void showAndLogRotationSuggestion() {

        setRotateSuggestionButtonState(true /* visible */);

        setRotateSuggestionButtonState(true /* visible */);

        rescheduleRotationTimeout(false /* reasonHover */);

        rescheduleRotationTimeout(false /* reasonHover */);

        mMetricsLogger.visible(MetricsEvent.ROTATION_SUGGESTION_SHOWN);

        mUiEventLogger.log(RotationButtonEvent.ROTATION_SUGGESTION_SHOWN);

    }

    }





    private boolean shouldOverrideUserLockPrefs(final int rotation) {

    private boolean shouldOverrideUserLockPrefs(final int rotation) {
@@ -474,4 +475,19 @@ public class RotationButtonController { 
            }

            }

        };

        };

    }

    }



    enum RotationButtonEvent implements UiEventLogger.UiEventEnum {

        @UiEvent(doc = "The rotation button was shown")

        ROTATION_SUGGESTION_SHOWN(206),

        @UiEvent(doc = "The rotation button was clicked")

        ROTATION_SUGGESTION_ACCEPTED(207);



        private final int mId;

        RotationButtonEvent(int id) {

            mId = id;

        }

        @Override public int getId() {

            return mId;

        }

    }

}
 
}