Commit cba736dc authored by Ryan Bis's avatar Ryan Bis

Orientation settings between Designer page, and in blocks editor now consistent.

Change-Id: I5351cbe8142e10c5264b66e65f81aee38c66d9fa
parent 183dcb18
...@@ -508,6 +508,14 @@ public interface OdeMessages extends Messages { ...@@ -508,6 +508,14 @@ public interface OdeMessages extends Messages {
@Description("Text for screen orientation choice 'Landscape '") @Description("Text for screen orientation choice 'Landscape '")
String landscapeScreenOrientation(); String landscapeScreenOrientation();
@DefaultMessage("Sensor")
@Description("Text for screen orientation choice 'Sensor '")
String sensorScreenOrientation();
@DefaultMessage("User")
@Description("Text for screen orientation choice 'User '")
String userScreenOrientation();
// Used in explorer/SourceStructureExplorer.java // Used in explorer/SourceStructureExplorer.java
@DefaultMessage("Rename") @DefaultMessage("Rename")
......
...@@ -18,6 +18,8 @@ public class YoungAndroidScreenOrientationChoicePropertyEditor extends ChoicePro ...@@ -18,6 +18,8 @@ public class YoungAndroidScreenOrientationChoicePropertyEditor extends ChoicePro
new Choice(MESSAGES.unspecifiedScreenOrientation(), "unspecified"), new Choice(MESSAGES.unspecifiedScreenOrientation(), "unspecified"),
new Choice(MESSAGES.portraitScreenOrientation(), "portrait"), new Choice(MESSAGES.portraitScreenOrientation(), "portrait"),
new Choice(MESSAGES.landscapeScreenOrientation(), "landscape"), new Choice(MESSAGES.landscapeScreenOrientation(), "landscape"),
new Choice(MESSAGES.sensorScreenOrientation(), "sensor"),
new Choice(MESSAGES.userScreenOrientation(), "user"),
}; };
public YoungAndroidScreenOrientationChoicePropertyEditor() { public YoungAndroidScreenOrientationChoicePropertyEditor() {
......
...@@ -599,7 +599,7 @@ public class Form extends Activity ...@@ -599,7 +599,7 @@ public class Form extends Activity
*/ */
@SimpleProperty(category = PropertyCategory.APPEARANCE, @SimpleProperty(category = PropertyCategory.APPEARANCE,
description = "The requested screen orientation. Commonly used values are" + description = "The requested screen orientation. Commonly used values are" +
" \"unspecified\", \"landscape\", \"portrait\", \"sensor\", and \"behind\".") " \"unspecified\", \"landscape\", \"portrait\", \"sensor\", and \"user\".")
public String ScreenOrientation() { public String ScreenOrientation() {
switch (getRequestedOrientation()) { switch (getRequestedOrientation()) {
case ActivityInfo.SCREEN_ORIENTATION_BEHIND: case ActivityInfo.SCREEN_ORIENTATION_BEHIND:
......
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