Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]

Browse Source 
* commit '40bfb60efa0e92259a417a5cbfd6095759c678b7':
  Fix build due to incorrect merges [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-05-13 23:40:37 +00:00
committed by Android Git Automerger
parent f266873c80 40bfb60efa
commit e0be42a9f9
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
View File

@@ -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));