Merge in v5 code

src/@ionic-native/plugins/screen-orientation/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
+import { Cordova, CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -35,7 +35,7 @@ import { Observable } from 'rxjs/Observable';
  * );
  *
  * ```
- * 
+ *
  * @advanced
  *
  * Accepted orientation values:
@@ -72,6 +72,11 @@ export class ScreenOrientation extends IonicNativePlugin {
     LANDSCAPE: 'landscape',
     ANY: 'any'
   };
+  /**
+   * Get the current orientation of the device.
+   */
+  @CordovaProperty()
+  type: string;
 
   /**
    * Listen to orientation change event
@@ -81,7 +86,9 @@ export class ScreenOrientation extends IonicNativePlugin {
     eventObservable: true,
     event: 'orientationchange'
   })
-  onChange(): Observable<void> { return; }
+  onChange(): Observable<void> {
+    return;
+  }
 
   /**
    * Lock the orientation to the passed value.
@@ -90,18 +97,15 @@ export class ScreenOrientation extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  lock(orientation: string): Promise<any> { return; }
+  lock(orientation: string): Promise<any> {
+    return;
+  }
 
   /**
    * Unlock and allow all orientations.
    */
   @Cordova({ sync: true })
-  unlock(): void { }
-
-  /**
-   * Get the current orientation of the device.
-   */
-  @CordovaProperty
-  type: string;
+  unlock(): void {
+  }
 
 }