summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2013-05-31 14:39:48 -0700
committerAdam Powell <adamp@google.com>2013-05-31 15:00:24 -0700
commit04fe6ebb9f919f196ec06a19bebc09b8e943f95b (patch)
treec6b80f3a8d5ff34227de7b97395883139787ef38 /tools
parentc1e0ca9fee17cb56a992ae107d3b1aa534290b2d (diff)
downloadframeworks_base-04fe6ebb9f919f196ec06a19bebc09b8e943f95b.zip
frameworks_base-04fe6ebb9f919f196ec06a19bebc09b8e943f95b.tar.gz
frameworks_base-04fe6ebb9f919f196ec06a19bebc09b8e943f95b.tar.bz2
Fix a bug resolving the correct icon/logo in action bars
Remove some abstraction-breaking magic in ActionBarView and replace it with proper resolution of the icon/logo when creating a window. The old implementation relied on the ActionBarView's context being an Activity. Bug 9171554 Change-Id: Idbbb1942622195dcb55e8119f2d64287b07bb509
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 0ca230c..a7b48bb 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -304,7 +304,7 @@ public class IWindowManagerImpl implements IWindowManager {
@Override
public void setAppStartingWindow(IBinder arg0, String arg1, int arg2, CompatibilityInfo arg3,
- CharSequence arg4, int arg5, int arg6, int arg7, IBinder arg8, boolean arg9)
+ CharSequence arg4, int arg5, int arg6, int arg7, int arg8, IBinder arg9, boolean arg10)
throws RemoteException {
// TODO Auto-generated method stub
}