summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-09-19 12:29:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-09-19 12:29:56 -0700
commitb7b083090f7312f83453e3f3c2e40a91644a3059 (patch)
tree3b8dbe781aa0ef2aaa5c4b7a718995047abab612 /tools
parent480a353f589035b62a81e2981cfba325ad1264f2 (diff)
parenta382cb81187437aa389dc131687e181ceaefa8ba (diff)
downloadframeworks_base-b7b083090f7312f83453e3f3c2e40a91644a3059.zip
frameworks_base-b7b083090f7312f83453e3f3c2e40a91644a3059.tar.gz
frameworks_base-b7b083090f7312f83453e3f3c2e40a91644a3059.tar.bz2
am a382cb81: Merge change 25929 into eclair
Merge commit 'a382cb81187437aa389dc131687e181ceaefa8ba' into eclair-plus-aosp * commit 'a382cb81187437aa389dc131687e181ceaefa8ba': Add API to send an ordered sticky broadcast.
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
index 4e7e925..1e9f573 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
@@ -1099,6 +1099,13 @@ public final class BridgeContext extends Context {
}
@Override
+ public void sendStickyOrderedBroadcast(Intent intent,
+ BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData,
+ Bundle initialExtras) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
public void setTheme(int arg0) {
// TODO Auto-generated method stub