summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2015-04-16 22:55:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-16 22:55:58 +0000
commitf647832bd4ca9c083aa2748f2a21bc433cb26be3 (patch)
tree242fbea246e57c322c0717b41c7fdcfcd1b0fd46 /tools
parented6b2eb9f44daaa5752021b5f3fdd59368d67215 (diff)
parentd46747a1c64b6ca3282e8841833980ab91829436 (diff)
downloadframeworks_base-f647832bd4ca9c083aa2748f2a21bc433cb26be3.zip
frameworks_base-f647832bd4ca9c083aa2748f2a21bc433cb26be3.tar.gz
frameworks_base-f647832bd4ca9c083aa2748f2a21bc433cb26be3.tar.bz2
Merge "Add support for disabling display scaling for development."
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 818940d..82012c1 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -376,6 +376,10 @@ public class IWindowManagerImpl implements IWindowManager {
}
@Override
+ public void setForcedDisplayScalingMode(int displayId, int mode) {
+ }
+
+ @Override
public void setInTouchMode(boolean arg0) throws RemoteException {
// TODO Auto-generated method stub
}