Commit 2b9de909 authored by Evan W. Patton's avatar Evan W. Patton

Revert forced ActionBar based on theme

Setting Theme is sufficient and an interaction with default values
breaks some upgraded apps.

Change-Id: Idf36857bcc314b7fba45d730986c5d2d6749d727
parent 8a687c24
...@@ -958,13 +958,7 @@ public final class MockForm extends MockContainer { ...@@ -958,13 +958,7 @@ public final class MockForm extends MockContainer {
} else if (propertyName.equals(PROPERTY_NAME_TUTORIAL_URL)) { } else if (propertyName.equals(PROPERTY_NAME_TUTORIAL_URL)) {
setTutorialURLProperty(newValue); setTutorialURLProperty(newValue);
} else if (propertyName.equals(PROPERTY_NAME_ACTIONBAR)) { } else if (propertyName.equals(PROPERTY_NAME_ACTIONBAR)) {
// ActionBar is now tied to the Theme. This can be removed once Companion 2.47 is the minimum version supported. setActionBarProperty(newValue);
String theme = getProperties().hasProperty(PROPERTY_NAME_THEME) ? getPropertyValue(PROPERTY_NAME_THEME) : null;
if (theme == null || theme.isEmpty() || theme.equals("Classic")) {
setActionBarProperty("False");
} else {
setActionBarProperty("True");
}
} else if (propertyName.equals(PROPERTY_NAME_THEME)) { } else if (propertyName.equals(PROPERTY_NAME_THEME)) {
setTheme(newValue); setTheme(newValue);
if ("Classic".equals(newValue)) { if ("Classic".equals(newValue)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment