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

Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983

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

Change-Id: I0405b1730a4591b0626b5f36ff833c88d00ac142
This commit is contained in:
Vinit Nayak
2020-06-05 19:10:33 +00:00
committed by Automerger Merge Worker
parent 11e31f8621 2983b70983
commit 7309578767
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ITaskStackListener.aidl
View File

@@ -224,6 +224,8 @@ oneway interface ITaskStackListener {
* * forced rotation
* * rotation settings set through adb command line
* * rotation that occurs when rotation tile is toggled in quick settings
*
* @param displayId id of the display where activity will rotate
*/
void onActivityRotation();
void onActivityRotation(int displayId);
}

2
core/java/android/app/TaskStackListener.java
View File

@@ -201,6 +201,6 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub {
}
@Override
public void onActivityRotation() {
public void onActivityRotation(int displayId) {
}
}

4
packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java
View File

@@ -115,6 +115,6 @@ public abstract class TaskStackChangeListener {
/** @see ITaskStackListener#onRecentTaskListFrozenChanged(boolean) */
public void onRecentTaskListFrozenChanged(boolean frozen) { }
/** @see ITaskStackListener#onActivityRotation()*/
public void onActivityRotation() { }
/** @see ITaskStackListener#onActivityRotation(int)*/
public void onActivityRotation(int displayId) { }
}

7
packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java
View File

@@ -238,8 +238,9 @@ public class TaskStackChangeListeners extends TaskStackListener {
}
@Override
public void onActivityRotation() {
mHandler.obtainMessage(H.ON_ACTIVITY_ROTATION).sendToTarget();
public void onActivityRotation(int displayId) {
mHandler.obtainMessage(H.ON_ACTIVITY_ROTATION, displayId, 0 /* unused */)
.sendToTarget();
}
private final class H extends Handler {
@@ -435,7 +436,7 @@ public class TaskStackChangeListeners extends TaskStackListener {
}
case ON_ACTIVITY_ROTATION: {
for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) {
mTaskStackListeners.get(i).onActivityRotation();
mTaskStackListeners.get(i).onActivityRotation(msg.arg1);
}
break;
}

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

@@ -185,7 +185,7 @@ class TaskChangeNotificationController {
};
private final TaskStackConsumer mNotifyOnActivityRotation = (l, m) -> {
l.onActivityRotation();
l.onActivityRotation(m.arg1);
};
@FunctionalInterface
@@ -583,9 +583,10 @@ class TaskChangeNotificationController {
msg.sendToTarget();
}
/** @see android.app.ITaskStackListener#onActivityRotation() */
void notifyOnActivityRotation() {
final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_ROTATED_MSG);
/** @see android.app.ITaskStackListener#onActivityRotation(int) */
void notifyOnActivityRotation(int displayId) {
final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_ROTATED_MSG,
displayId, 0 /* unused */);
forAllLocalListeners(mNotifyOnActivityRotation, msg);
msg.sendToTarget();
}

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

@@ -3850,7 +3850,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (rotationChanged) {
mAtmService.getTaskChangeNotificationController()
.notifyOnActivityRotation();
.notifyOnActivityRotation(displayContent.mDisplayId);
}
if (!rotationChanged || forceRelayout) {