diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 10:36:07 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 10:36:07 +0100 |
| commit | 813d4309fb2144b96ffcd644c71a30aadc50fd1e (patch) | |
| tree | 532609cc34968f682701176114c484f5278b8349 /tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java | |
| parent | 8bc386657e4bd582ea0897410523e27230a8e157 (diff) | |
| parent | df301d4a64fe0dfc812b39e3f7e2c2ca4b93c305 (diff) | |
| download | frameworks_base-05a982aafebd19fe2d23c65cd6cf3f7e2f11ea27.zip frameworks_base-05a982aafebd19fe2d23c65cd6cf3f7e2f11ea27.tar.gz frameworks_base-05a982aafebd19fe2d23c65cd6cf3f7e2f11ea27.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0replicant-6.0-alpha-0004
Diffstat (limited to 'tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java index ac7c409..0ffa357 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java @@ -1051,11 +1051,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { } if (scrollPos != 0) { view.scrollBy(0, scrollPos); - } else { - view.scrollBy(0, scrollPos); } - } else { - view.scrollBy(0, scrollPos); } if (!(view instanceof ViewGroup)) { |