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

Commit 4d1c1d41 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Disallow rotation button in setup mode" into udc-qpr-dev

parents 72e3e6cf 69a62c45

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ import android.graphics.drawable.Drawable; 
import android.os.Handler;

import android.os.Handler;

import android.os.Looper;

import android.os.Looper;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.provider.Settings;

import android.provider.Settings;

import android.util.Log;

import android.util.Log;

import android.view.HapticFeedbackConstants;

import android.view.HapticFeedbackConstants;
@@ -76,6 +77,8 @@ public class RotationButtonController { 
    private static final String TAG = "RotationButtonController";

    private static final String TAG = "RotationButtonController";

    private static final int BUTTON_FADE_IN_OUT_DURATION_MS = 100;

    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 int NAVBAR_HIDDEN_PENDING_ICON_TIMEOUT_MS = 20000;

    private static final boolean OEM_DISALLOW_ROTATION_IN_SUW =

            SystemProperties.getBoolean("ro.setupwizard.rotation_locked", false);

    private static final Interpolator LINEAR_INTERPOLATOR = new LinearInterpolator();

    private static final Interpolator LINEAR_INTERPOLATOR = new LinearInterpolator();





    private static final int NUM_ACCEPTED_ROTATION_SUGGESTIONS_FOR_INTRODUCTION = 3;

    private static final int NUM_ACCEPTED_ROTATION_SUGGESTIONS_FOR_INTRODUCTION = 3;
@@ -375,6 +378,12 @@ public class RotationButtonController { 
    }

    }





    public void onRotationProposal(int rotation, boolean isValid) {

    public void onRotationProposal(int rotation, boolean isValid) {

        boolean isUserSetupComplete = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.USER_SETUP_COMPLETE, 0) != 0;

        if (!isUserSetupComplete && OEM_DISALLOW_ROTATION_IN_SUW) {

            return;

        }



        int windowRotation = mWindowRotationProvider.get();

        int windowRotation = mWindowRotationProvider.get();





        if (!mRotationButton.acceptRotationProposal()) {

        if (!mRotationButton.acceptRotationProposal()) {