Skip to content

GitLab

A
appinventor-sources
Commit 0166242c authored by Jeffrey I. Schiller's avatar Jeffrey I. Schiller
Browse files
Options

Merge branch 'ucr'

parents ae675d46 6b9590d3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
appinventor/components/src/com/google/appinventor/components/runtime/AppInventorCompatActivity.java
View file @ 0166242c
...@@ -19,6 +19,7 @@ import android.util.Log; ...@@ -19,6 +19,7 @@ import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window;
import android.widget.FrameLayout.LayoutParams; import android.widget.FrameLayout.LayoutParams;
import android.widget.TextView; import android.widget.TextView;
import com.google.appinventor.components.common.ComponentConstants; import com.google.appinventor.components.common.ComponentConstants;
...@@ -56,6 +57,7 @@ public class AppInventorCompatActivity extends Activity implements AppCompatCall ...@@ -56,6 +57,7 @@ public class AppInventorCompatActivity extends Activity implements AppCompatCall
if (currentTheme != Theme.PACKAGED) { if (currentTheme != Theme.PACKAGED) {
applyTheme(); applyTheme();
} }
Window.Callback classicCallback = getWindow().getCallback();
appCompatDelegate = AppCompatDelegate.create(this, this); appCompatDelegate = AppCompatDelegate.create(this, this);
try { try {
appCompatDelegate.onCreate(icicle); appCompatDelegate.onCreate(icicle);
...@@ -63,6 +65,7 @@ public class AppInventorCompatActivity extends Activity implements AppCompatCall ...@@ -63,6 +65,7 @@ public class AppInventorCompatActivity extends Activity implements AppCompatCall
// Thrown in "Classic" mode // Thrown in "Classic" mode
appCompatDelegate = null; appCompatDelegate = null;
AppInventorCompatActivity.classicMode = true; AppInventorCompatActivity.classicMode = true;
getWindow().setCallback(classicCallback);
} }
super.onCreate(icicle); super.onCreate(icicle);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment