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

Fix build due to incorrect merges [DO NOT MERGE]

Browse Source 
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
This commit is contained in:
Deepanshu Gupta
2014-05-13 15:52:39 -07:00
parent 1c55797d0e
commit 40bfb60efa
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.BridgeLayoutParamsMapAttributes;
import com.android.layoutlib.bridge.android.BridgeXmlBlockParser; import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;
import com.android.layoutlib.bridge.bars.ActionBarLayout; 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.NavigationBar;
import com.android.layoutlib.bridge.bars.StatusBar; import com.android.layoutlib.bridge.bars.StatusBar;
import com.android.layoutlib.bridge.bars.TitleBar; import com.android.layoutlib.bridge.bars.TitleBar;
@@ -265,8 +264,8 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
topLayout.setOrientation(LinearLayout.HORIZONTAL); topLayout.setOrientation(LinearLayout.HORIZONTAL);
try { try {
CustomBar navigationBar = createNavigationBar(context, NavigationBar navigationBar = createNavigationBar(context,
hardwareConfig.getDensity(), hardwareConfig.getScreenSize()); hardwareConfig.getDensity());
topLayout.addView(navigationBar); topLayout.addView(navigationBar);
} catch (XmlPullParserException ignored) { } catch (XmlPullParserException ignored) {
@@ -360,8 +359,8 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
mNavigationBarSize > 0) { mNavigationBarSize > 0) {
// system bar // system bar
try { try {
CustomBar navigationBar = createNavigationBar(context, NavigationBar navigationBar = createNavigationBar(context,
hardwareConfig.getDensity(), hardwareConfig.getScreenSize()); hardwareConfig.getDensity());
topLayout.addView(navigationBar); topLayout.addView(navigationBar);
} catch (XmlPullParserException ignored) { } catch (XmlPullParserException ignored) {
@@ -1538,15 +1537,10 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
* @param isRtlSupported true is the project manifest declares that the application * @param isRtlSupported true is the project manifest declares that the application
* is RTL aware. * is RTL aware.
*/ */
private CustomBar createNavigationBar(BridgeContext context, Density density, ScreenSize size) private NavigationBar createNavigationBar(BridgeContext context, Density density)
throws XmlPullParserException { throws XmlPullParserException {
CustomBar navigationBar; NavigationBar navigationBar = new NavigationBar(context, density,
if (size == ScreenSize.XLARGE) { mNavigationBarOrientation);
navigationBar = new TabletSystemBar(context, density);
} else {
navigationBar = new NavigationBar(context, density,
mNavigationBarOrientation);
}
if (mNavigationBarOrientation == LinearLayout.VERTICAL) { if (mNavigationBarOrientation == LinearLayout.VERTICAL) {
navigationBar.setLayoutParams(new LinearLayout.LayoutParams(mNavigationBarSize, navigationBar.setLayoutParams(new LinearLayout.LayoutParams(mNavigationBarSize,
LayoutParams.MATCH_PARENT)); LayoutParams.MATCH_PARENT));