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

Commit 704ec966 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "Force Kids app to use sensorLandscape when in reverseLandscape" into tm-qpr-dev

parents 8975d9a0 9da476b3

libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java

+6 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; 
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;

import static android.view.Display.DEFAULT_DISPLAY;



import android.app.ActivityManager;
@@ -290,8 +291,11 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer { 
        // TODO(229961548): Remove ignoreOrientationRequest exception for Kids Mode once possible.

        if (mReverseDefaultRotationEnabled) {

            setOrientationRequestPolicy(/* isIgnoreOrientationRequestDisabled */ true,

                    /* fromOrientations */ new int[]{SCREEN_ORIENTATION_REVERSE_LANDSCAPE},

                    /* toOrientations */ new int[]{SCREEN_ORIENTATION_LANDSCAPE});

                    /* fromOrientations */

                    new int[]{SCREEN_ORIENTATION_LANDSCAPE, SCREEN_ORIENTATION_REVERSE_LANDSCAPE},

                    /* toOrientations */

                    new int[]{SCREEN_ORIENTATION_SENSOR_LANDSCAPE,

                            SCREEN_ORIENTATION_SENSOR_LANDSCAPE});

        } else {

            setOrientationRequestPolicy(/* isIgnoreOrientationRequestDisabled */ true,

                    /* fromOrientations */ null, /* toOrientations */ null);