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

am dfc3bc9b: Fix build.

Browse Source 
* commit 'dfc3bc9b3cf27a72dfd133ce62f5e791ef74659d':
  Fix build.
This commit is contained in:
Deepanshu Gupta
2014-06-05 01:10:44 +00:00
committed by Android Git Automerger
parent 80f576f5a8 58ff7de971
commit d0ca7b623b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
View File

@@ -32,13 +32,13 @@ import android.widget.TextView;
public class StatusBar extends CustomBar {
public StatusBar(Context context, Density density, int direction, boolean RtlEnabled,
int simulatePlatformVersion) throws XmlPullParserException {
int simulatedPlatformVersion) throws XmlPullParserException {
// FIXME: if direction is RTL but it's not enabled in application manifest, mirror this bar.
super(context, density, LinearLayout.HORIZONTAL, "/bars/status_bar.xml", "status_bar.xml");
// FIXME: use FILL_H?
setGravity(Gravity.START | Gravity.TOP | Gravity.RIGHT);
setBackgroundColor(Config.getStatusBarColor(simulatePlatformVersion));
setBackgroundColor(Config.getStatusBarColor(simulatedPlatformVersion));
// Cannot access the inside items through id because no R.id values have been
// created for them.

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

@@ -271,7 +271,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
mViewRoot = topLayout;
topLayout.setOrientation(LinearLayout.HORIZONTAL);
if (Config.showOnScreenNavBar(params.getSimulatePlatformVersion())) {
if (Config.showOnScreenNavBar(params.getSimulatedPlatformVersion())) {
try {
NavigationBar navigationBar = createNavigationBar(context,
hardwareConfig.getDensity(), isRtl, params.isRtlSupported());
@@ -331,7 +331,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
try {
StatusBar statusBar = createStatusBar(context, hardwareConfig.getDensity(),
layoutDirection, params.isRtlSupported(),
params.getSimulatePlatformVersion());
params.getSimulatedPlatformVersion());
topLayout.addView(statusBar);
} catch (XmlPullParserException ignored) {
@@ -374,7 +374,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
backgroundLayout.addView(mContentRoot);
}
if (Config.showOnScreenNavBar(params.getSimulatePlatformVersion()) &&
if (Config.showOnScreenNavBar(params.getSimulatedPlatformVersion()) &&
mNavigationBarOrientation == LinearLayout.HORIZONTAL &&
mNavigationBarSize > 0) {
// system bar