Merge branch 'ucr'

appinventor/components/src/com/google/appinventor/components/runtime/AppInventorCompatActivity.java

@@ -19,6 +19,7 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.widget.FrameLayout.LayoutParams;
 import android.widget.TextView;
 import com.google.appinventor.components.common.ComponentConstants;
@@ -56,6 +57,7 @@ public class AppInventorCompatActivity extends Activity implements AppCompatCall
     if (currentTheme != Theme.PACKAGED) {
       applyTheme();
     }
+    Window.Callback classicCallback = getWindow().getCallback();
     appCompatDelegate = AppCompatDelegate.create(this, this);
     try {
       appCompatDelegate.onCreate(icicle);
@@ -63,6 +65,7 @@ public class AppInventorCompatActivity extends Activity implements AppCompatCall
       // Thrown in "Classic" mode
       appCompatDelegate = null;
       AppInventorCompatActivity.classicMode = true;
+      getWindow().setCallback(classicCallback);
     }
 
     super.onCreate(icicle);