diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 23:40:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 23:40:37 +0000 |
| commit | e0be42a9f915f06dcabfa67f4dd86fb45ff67dbd (patch) | |
| tree | 44553f3d251967fd97007bcf2997dcf65985b9bb /tools | |
| parent | f266873c8059e78410bf43c83fb8f0fd5bfe3362 (diff) | |
| parent | 40bfb60efa0e92259a417a5cbfd6095759c678b7 (diff) | |
| download | frameworks_base-e0be42a9f915f06dcabfa67f4dd86fb45ff67dbd.zip frameworks_base-e0be42a9f915f06dcabfa67f4dd86fb45ff67dbd.tar.gz frameworks_base-e0be42a9f915f06dcabfa67f4dd86fb45ff67dbd.tar.bz2 | |
am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]
* commit '40bfb60efa0e92259a417a5cbfd6095759c678b7':
Fix build due to incorrect merges [DO NOT MERGE]
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java | 20 |
1 files changed, 7 insertions, 13 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 c5f177b..680b43c 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 @@ -49,7 +49,6 @@ import com.android.layoutlib.bridge.android.BridgeContext; import com.android.layoutlib.bridge.android.BridgeLayoutParamsMapAttributes; import com.android.layoutlib.bridge.android.BridgeXmlBlockParser; import com.android.layoutlib.bridge.bars.ActionBarLayout; -import com.android.layoutlib.bridge.bars.CustomBar; import com.android.layoutlib.bridge.bars.NavigationBar; import com.android.layoutlib.bridge.bars.StatusBar; import com.android.layoutlib.bridge.bars.TitleBar; @@ -265,8 +264,8 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { topLayout.setOrientation(LinearLayout.HORIZONTAL); try { - CustomBar navigationBar = createNavigationBar(context, - hardwareConfig.getDensity(), hardwareConfig.getScreenSize()); + NavigationBar navigationBar = createNavigationBar(context, + hardwareConfig.getDensity()); topLayout.addView(navigationBar); } catch (XmlPullParserException ignored) { @@ -360,8 +359,8 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { mNavigationBarSize > 0) { // system bar try { - CustomBar navigationBar = createNavigationBar(context, - hardwareConfig.getDensity(), hardwareConfig.getScreenSize()); + NavigationBar navigationBar = createNavigationBar(context, + hardwareConfig.getDensity()); topLayout.addView(navigationBar); } catch (XmlPullParserException ignored) { @@ -1538,15 +1537,10 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { * @param isRtlSupported true is the project manifest declares that the application * is RTL aware. */ - private CustomBar createNavigationBar(BridgeContext context, Density density, ScreenSize size) + private NavigationBar createNavigationBar(BridgeContext context, Density density) throws XmlPullParserException { - CustomBar navigationBar; - if (size == ScreenSize.XLARGE) { - navigationBar = new TabletSystemBar(context, density); - } else { - navigationBar = new NavigationBar(context, density, - mNavigationBarOrientation); - } + NavigationBar navigationBar = new NavigationBar(context, density, + mNavigationBarOrientation); if (mNavigationBarOrientation == LinearLayout.VERTICAL) { navigationBar.setLayoutParams(new LinearLayout.LayoutParams(mNavigationBarSize, LayoutParams.MATCH_PARENT)); |