summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-10-05 14:45:52 -0700
committerCraig Mautner <cmautner@google.com>2012-10-06 13:09:58 -0700
commit5962b12bedc4a1d0354816c1cd6b06ba04f6d807 (patch)
treeb9918fad07cf0e0ff84d510b6e17b31cf48394f9 /tools
parent88400d3a31139c40c4014faf86c243647087ef6c (diff)
downloadframeworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.zip
frameworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.tar.gz
frameworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.tar.bz2
Adds showWhenLocked attribute to Activities.
The new attribute allows an Activity such as the alarm to appear on all users screens. Bug: 7213805 fixed. Change-Id: If7866b13d88c04af07debc69e0e875d0adc6050a
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
index b8d21f3..ddb0665 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
@@ -78,7 +78,8 @@ public class BridgeWindowManager implements IWindowManager {
}
@Override
- public void addAppToken(int arg0, IApplicationToken arg1, int arg2, int arg3, boolean arg4)
+ public void addAppToken(int arg0, IApplicationToken arg1, int arg2, int arg3, boolean arg4,
+ boolean arg5)
throws RemoteException {
// TODO Auto-generated method stub