Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename getIgnoreOrientationRequest() to shouldIgnoreOrientationRequest()" into tm-qpr-dev

Browse Source
This commit is contained in:
Eghosa Ewansiha-Vlachavas
2023-04-05 16:36:45 +00:00
committed by Android (Google) Code Review
parent 5351ad5ba4 2ab8dedf6d
commit 66232edfae
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/DisplayArea.java
View File

@@ -147,7 +147,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
@ScreenOrientation @ScreenOrientation
int getOrientation(int candidate) { int getOrientation(int candidate) {
final int orientation = super.getOrientation(candidate); final int orientation = super.getOrientation(candidate);
if (getIgnoreOrientationRequest(orientation)) { if (shouldIgnoreOrientationRequest(orientation)) {
// In all the other case, mLastOrientationSource will be reassigned to a new value // In all the other case, mLastOrientationSource will be reassigned to a new value
mLastOrientationSource = null; mLastOrientationSource = null;
return SCREEN_ORIENTATION_UNSET; return SCREEN_ORIENTATION_UNSET;
@@ -157,7 +157,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
@Override @Override
boolean handlesOrientationChangeFromDescendant(@ScreenOrientation int orientation) { boolean handlesOrientationChangeFromDescendant(@ScreenOrientation int orientation) {
return !getIgnoreOrientationRequest(orientation) return !shouldIgnoreOrientationRequest(orientation)
&& super.handlesOrientationChangeFromDescendant(orientation); && super.handlesOrientationChangeFromDescendant(orientation);
} }
@@ -168,7 +168,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
final int orientation = requestingContainer != null final int orientation = requestingContainer != null
? requestingContainer.getOverrideOrientation() ? requestingContainer.getOverrideOrientation()
: SCREEN_ORIENTATION_UNSET; : SCREEN_ORIENTATION_UNSET;
return !getIgnoreOrientationRequest(orientation) return !shouldIgnoreOrientationRequest(orientation)
&& super.onDescendantOrientationChanged(requestingContainer); && super.onDescendantOrientationChanged(requestingContainer);
} }
@@ -235,8 +235,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
/** /**
* @return {@value true} if we need to ignore the orientation in input. * @return {@value true} if we need to ignore the orientation in input.
*/ */
// TODO(b/262366204): Rename getIgnoreOrientationRequest to shouldIgnoreOrientationRequest boolean shouldIgnoreOrientationRequest(@ScreenOrientation int orientation) {
boolean getIgnoreOrientationRequest(@ScreenOrientation int orientation) {
// We always respect orientation request for ActivityInfo.SCREEN_ORIENTATION_LOCKED // We always respect orientation request for ActivityInfo.SCREEN_ORIENTATION_LOCKED
// ActivityInfo.SCREEN_ORIENTATION_NOSENSOR. // ActivityInfo.SCREEN_ORIENTATION_NOSENSOR.
// Main use case why this is important is Camera apps that rely on those // Main use case why this is important is Camera apps that rely on those

6
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -1604,7 +1604,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
@Override @Override
boolean handlesOrientationChangeFromDescendant(@ScreenOrientation int orientation) { boolean handlesOrientationChangeFromDescendant(@ScreenOrientation int orientation) {
return !getIgnoreOrientationRequest(orientation) return !shouldIgnoreOrientationRequest(orientation)
&& !getDisplayRotation().isFixedToUserRotation(); && !getDisplayRotation().isFixedToUserRotation();
} }
@@ -1706,7 +1706,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
} }
final int activityOrientation = r.getOverrideOrientation(); final int activityOrientation = r.getOverrideOrientation();
if (!WindowManagerService.ENABLE_FIXED_ROTATION_TRANSFORM if (!WindowManagerService.ENABLE_FIXED_ROTATION_TRANSFORM
|| getIgnoreOrientationRequest(activityOrientation)) { || shouldIgnoreOrientationRequest(activityOrientation)) {
return ROTATION_UNDEFINED; return ROTATION_UNDEFINED;
} }
if (activityOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) { if (activityOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) {
@@ -5122,7 +5122,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
@ScreenOrientation @ScreenOrientation
int getOrientation(@ScreenOrientation int candidate) { int getOrientation(@ScreenOrientation int candidate) {
// IME does not participate in orientation. // IME does not participate in orientation.
return getIgnoreOrientationRequest(candidate) ? SCREEN_ORIENTATION_UNSET : candidate; return shouldIgnoreOrientationRequest(candidate) ? SCREEN_ORIENTATION_UNSET : candidate;
} }
@Override @Override

2
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -1877,7 +1877,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
// Only allow to specify orientation if this TDA is the last focused one on this logical // Only allow to specify orientation if this TDA is the last focused one on this logical
// display that can request orientation request. // display that can request orientation request.
return mDisplayContent.getOrientationRequestingTaskDisplayArea() == this return mDisplayContent.getOrientationRequestingTaskDisplayArea() == this
&& !getIgnoreOrientationRequest(orientation); && !shouldIgnoreOrientationRequest(orientation);
} }
void clearPreferredTopFocusableRootTask() { void clearPreferredTopFocusableRootTask() {