You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/04/15 21:36:18 UTC

git commit: CB-6312 Use "landscape" instead of "userLandscape" in AndroidManifest.xml

Repository: cordova-cli
Updated Branches:
  refs/heads/master 38db7a2db -> 3a4a9ebda


CB-6312 Use "landscape" instead of "userLandscape" in AndroidManifest.xml


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/3a4a9ebd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/3a4a9ebd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/3a4a9ebd

Branch: refs/heads/master
Commit: 3a4a9ebda605ef9522a4d58fa50e494831a3bbd0
Parents: 38db7a2
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Apr 15 15:30:58 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Apr 15 15:30:58 2014 -0400

----------------------------------------------------------------------
 spec/metadata/android_parser.spec.js | 2 +-
 src/metadata/android_parser.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/3a4a9ebd/spec/metadata/android_parser.spec.js
----------------------------------------------------------------------
diff --git a/spec/metadata/android_parser.spec.js b/spec/metadata/android_parser.spec.js
index 2459704..6c6ea41 100644
--- a/spec/metadata/android_parser.spec.js
+++ b/spec/metadata/android_parser.spec.js
@@ -127,7 +127,7 @@ describe('android project parser', function() {
             it('should handle portrait orientation', function() {
                 cfg.getPreference = function() { return 'portrait'; };
                 p.update_from_config(cfg);
-                expect(manifestRoot.getroot().find('./application/activity').attrib['android:screenOrientation']).toEqual('userPortrait');
+                expect(manifestRoot.getroot().find('./application/activity').attrib['android:screenOrientation']).toEqual('portrait');
             });
             it('should handle invalid orientation', function() {
                 cfg.getPreference = function() { return 'prtrait'; };

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/3a4a9ebd/src/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/android_parser.js b/src/metadata/android_parser.js
index 1e4058b..51b5aa7 100644
--- a/src/metadata/android_parser.js
+++ b/src/metadata/android_parser.js
@@ -90,10 +90,10 @@ module.exports.prototype = {
                     delete act.attrib["android:screenOrientation"];
                     break;
                 case 'portrait':
-                    act.attrib["android:screenOrientation"] = 'userPortrait';
+                    act.attrib["android:screenOrientation"] = 'portrait';
                     break;
                 case 'landscape':
-                    act.attrib["android:screenOrientation"] = 'userLandscape';
+                    act.attrib["android:screenOrientation"] = 'landscape';
             }
         }