Merge branch 'master' into gallery

Author: Yuncong Zhang

Runtime/Plugins/platform/ios/UIWidgetsViewController.mm

@@ -65,6 +65,12 @@ -(void)keyboardWillChangeFrame:(NSNotification*)notification {
     CGFloat bottom = CGRectGetHeight([[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]);
     CGFloat scale = [UIScreen mainScreen].scale;
 
+    // scale == 3 => screen is 1242 * 2208 => we have to perform down-sampling to obtain the real length
+    // 0.8696 = 1920 / 2208, the vertical down-sampling ratio
+    if (scale == 3) {
+        bottom = bottom * 0.8696;
+    }
+
     viewInsets.bottom = bottom * scale;
     padding.bottom = 0;
 

Runtime/engine/UIWidgetsPanel.cs

@@ -196,6 +196,14 @@ internal void applyRenderTexture(Rect screenRect, Texture texture, Material mat)
         protected virtual void Update() {
             this._displayMetrics.Update();
             UIWidgetsMessageManager.ensureUIWidgetsMessageManagerIfNeeded();
+            
+#if UNITY_ANDROID
+            if (Input.GetKeyDown(KeyCode.Escape)) {
+                this._windowAdapter.withBinding(() => {
+                    WidgetsBinding.instance.handlePopRoute();
+                });
+            }
+#endif
 
             if (!this._viewMetricsCallbackRegistered) {
                 this._viewMetricsCallbackRegistered = true;

Runtime/widgets/binding.cs

@@ -4,6 +4,7 @@
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.rendering;
 using Unity.UIWidgets.ui;
+using UnityEngine;
 
 namespace Unity.UIWidgets.widgets {
     public interface WidgetsBindingObserver {
@@ -54,6 +55,23 @@ public bool removeObserver(WidgetsBindingObserver observer) {
             return this._observers.Remove(observer);
         }
 
+        public void handlePopRoute() {
+            var idx = -1;
+            
+            void _handlePopRouteSub(bool result) {
+                if (!result) {
+                    idx++;
+                    if (idx >= this._observers.Count) {
+                        Application.Quit();
+                        return;
+                    }
+                    this._observers[idx].didPopRoute().Then(_handlePopRouteSub);
+                }
+            }
+            
+            _handlePopRouteSub(false);
+        }
+
         public readonly WidgetInspectorService widgetInspectorService;
 
         protected override void handleMetricsChanged() {