github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-12 10:42:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-10837 Support platform-specific orientation on Android

Browse Source 
Remove processing of "orientation" preference and let
user to specify any platform-specific value for Android

 This closes #281
This commit is contained in:
Vladimir Kotikov 2016-03-18 15:07:16 +03:00
parent bc9e895e25
commit 69a2a5b551
1 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bin/templates/cordova/lib/prepare.js vendored
View File

@ -131,7 +131,7 @@ function updateProjectAccordingTo(platformConfig, locations) {
var orig_pkg = manifest.getPackageId(); var orig_pkg = manifest.getPackageId();
manifest.getActivity() manifest.getActivity()
.setOrientation(findOrientationValue(platformConfig)) .setOrientation(platformConfig.getPreference('orientation'))
.setLaunchMode(findAndroidLaunchModePreference(platformConfig)); .setLaunchMode(findAndroidLaunchModePreference(platformConfig));
manifest.setVersionName(platformConfig.version()) manifest.setVersionName(platformConfig.version())
@ -344,36 +344,3 @@ function findAndroidLaunchModePreference(platformConfig) {
return launchMode; return launchMode;
} }
/**
* Queries ConfigParser object for the orientation <preference> value. Warns if
* global preference value is not supported by platform.
*
* @param {Object} platformConfig ConfigParser object
*
* @return {String} Global/platform-specific orientation in lower-case
* (or empty string if both are undefined).
*/
function findOrientationValue(platformConfig) {
var ORIENTATION_DEFAULT = 'default';
var orientation = platformConfig.getPreference('orientation');
if (!orientation) {
return ORIENTATION_DEFAULT;
}
var GLOBAL_ORIENTATIONS = ['default', 'portrait','landscape'];
function isSupported(orientation) {
return GLOBAL_ORIENTATIONS.indexOf(orientation.toLowerCase()) >= 0;
}
// Check if the given global orientation is supported
if (orientation && isSupported(orientation)) {
return orientation;
}
events.emit('warn', 'Unsupported global orientation: ' + orientation +
'. Defaulting to value: ' + ORIENTATION_DEFAULT);
return ORIENTATION_DEFAULT;
}