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

Commit f05c79fd authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Add logging for floating rotation button" into tm-qpr-dev am: c8948754 am: 48b500d5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20742492



Change-Id: I445f9a3fae7ad7d52d907d2fe98d2052b9615746
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cec0764 48b500d5

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java

+3 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ import java.util.function.Supplier; 
 */

public class RotationButtonController {



    private static final String TAG = "StatusBar/RotationButtonController";

    private static final String TAG = "RotationButtonController";

    private static final int BUTTON_FADE_IN_OUT_DURATION_MS = 100;

    private static final int NAVBAR_HIDDEN_PENDING_ICON_TIMEOUT_MS = 20000;

    private static final Interpolator LINEAR_INTERPOLATOR = new LinearInterpolator();
@@ -377,6 +377,7 @@ public class RotationButtonController { 
        }



        // Prepare to show the navbar icon by updating the icon style to change anim params

        Log.i(TAG, "onRotationProposal(rotation=" + rotation + ")");

        mLastRotationSuggestion = rotation; // Remember rotation for click

        final boolean rotationCCW = Utilities.isRotationAnimationCCW(windowRotation, rotation);

        if (windowRotation == Surface.ROTATION_0 || windowRotation == Surface.ROTATION_180) {
@@ -499,6 +500,7 @@ public class RotationButtonController { 
        mUiEventLogger.log(RotationButtonEvent.ROTATION_SUGGESTION_ACCEPTED);

        incrementNumAcceptedRotationSuggestionsIfNeeded();

        setRotationLockedAtAngle(mLastRotationSuggestion);

        Log.i(TAG, "onRotateSuggestionClick() mLastRotationSuggestion=" + mLastRotationSuggestion);

        v.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);

    }

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+2 −0
Original line number Diff line number Diff line
@@ -464,6 +464,8 @@ public class NavigationBarController implements 


    @Override

    public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {

        pw.println("mIsTablet=" + mIsTablet);

        pw.println("mNavMode=" + mNavMode);

        for (int i = 0; i < mNavigationBars.size(); i++) {

            if (i > 0) {

                pw.println();