summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-06-05 01:10:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-05 01:10:44 +0000
commitd0ca7b623b873b4159d7d77be1771ab573e22028 (patch)
tree5dfc874917ab5bc001b1d6cfdb0c713c279f4b3e
parent80f576f5a8995a50e90152f0e25a6ca4a759beb1 (diff)
parent58ff7de971a8172e40c09c3a8489eb276441e1b6 (diff)
downloadframeworks_base-d0ca7b623b873b4159d7d77be1771ab573e22028.zip
frameworks_base-d0ca7b623b873b4159d7d77be1771ab573e22028.tar.gz
frameworks_base-d0ca7b623b873b4159d7d77be1771ab573e22028.tar.bz2
am dfc3bc9b: Fix build.
* commit 'dfc3bc9b3cf27a72dfd133ce62f5e791ef74659d': Fix build.
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java4
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
index 8aaaaba..2421f29 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
@@ -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.
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 c4f9136..c715003 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
@@ -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