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

Remove experimental immersive mode support. DO NOT MERGE

Browse Source 
Bug: 2949215

Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d
This commit is contained in:
Daniel Sandler
2010-08-26 10:28:46 -04:00
parent 7046bd924f
commit d02bdaab49
12 changed files with 12 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -5687,35 +5687,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
}
}
public void setImmersive(IBinder token, boolean immersive) {
synchronized(this) {
int index = (token != null) ? mMainStack.indexOfTokenLocked(token) : -1;
if (index < 0) {
throw new IllegalArgumentException();
}
ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(index);
r.immersive = immersive;
}
}
public boolean isImmersive(IBinder token) {
synchronized (this) {
int index = (token != null) ? mMainStack.indexOfTokenLocked(token) : -1;
if (index < 0) {
throw new IllegalArgumentException();
}
ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(index);
return r.immersive;
}
}
public boolean isTopActivityImmersive() {
synchronized (this) {
ActivityRecord r = mMainStack.topRunningActivityLocked(null);
return (r != null) ? r.immersive : false;
}
}
public final void enterSafeMode() {
synchronized(this) {
// It only makes sense to do this before the system is ready

5
services/java/com/android/server/am/ActivityRecord.java
View File

@@ -103,7 +103,6 @@ class ActivityRecord extends IApplicationToken.Stub {
boolean idle; // has the activity gone idle?
boolean hasBeenLaunched;// has this activity ever been launched?
boolean frozenBeforeDestroy;// has been frozen but not yet destroyed.
boolean immersive; // immersive mode (don't interrupt if possible)
String stringName; // for caching of toString().
@@ -160,7 +159,6 @@ class ActivityRecord extends IApplicationToken.Stub {
pw.print(prefix); pw.print("keysPaused="); pw.print(keysPaused);
pw.print(" inHistory="); pw.print(inHistory);
pw.print(" persistent="); pw.print(persistent);
pw.print(" immersive="); pw.print(immersive);
pw.print(" launchMode="); pw.println(launchMode);
pw.print(prefix); pw.print("fullscreen="); pw.print(fullscreen);
pw.print(" visible="); pw.print(visible);
@@ -287,8 +285,6 @@ class ActivityRecord extends IApplicationToken.Stub {
} else {
isHomeActivity = false;
}
immersive = (aInfo.flags & ActivityInfo.FLAG_IMMERSIVE) != 0;
} else {
realActivity = null;
taskAffinity = null;
@@ -300,7 +296,6 @@ class ActivityRecord extends IApplicationToken.Stub {
packageName = null;
fullscreen = true;
isHomeActivity = false;
immersive = false;
}
}