diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index 73a067733fc..6b0aa6a2539 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -25,15 +25,12 @@ import org.json.JSONObject; */ public class PlatformPlugin extends JSONMessageListener implements ActivityLifecycleListener { private final Activity mActivity; - private static final int DEFAULT_OVERLAYS = View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; + public static final int DEFAULT_SYSTEM_UI = View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; public PlatformPlugin(Activity activity) { mActivity = activity; - mEnabledOverlays = DEFAULT_OVERLAYS; + mEnabledOverlays = DEFAULT_SYSTEM_UI; } @Override @@ -130,7 +127,10 @@ public class PlatformPlugin extends JSONMessageListener implements ActivityLifec private int mEnabledOverlays; private void setSystemChromeEnabledSystemUIOverlays(JSONArray overlays) throws JSONException { - int enabledOverlays = DEFAULT_OVERLAYS; + int enabledOverlays = DEFAULT_SYSTEM_UI + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; if (overlays.length() == 0) { enabledOverlays |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; diff --git a/shell/platform/android/org/domokit/sky/shell/SkyActivity.java b/shell/platform/android/org/domokit/sky/shell/SkyActivity.java index 74172f436b4..306d2d03bc4 100644 --- a/shell/platform/android/org/domokit/sky/shell/SkyActivity.java +++ b/shell/platform/android/org/domokit/sky/shell/SkyActivity.java @@ -8,21 +8,13 @@ import android.app.Activity; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.util.Log; -import android.view.View; import android.view.Window; import android.view.WindowManager; - +import io.flutter.plugin.platform.PlatformPlugin; import io.flutter.view.FlutterMain; import io.flutter.view.FlutterView; - -import org.chromium.base.PathUtils; -import org.chromium.base.TraceEvent; -import org.chromium.mojom.sky.EventType; -import org.chromium.mojom.sky.InputEvent; - -import java.io.File; import java.util.ArrayList; +import org.chromium.base.TraceEvent; /** @@ -60,9 +52,7 @@ public class SkyActivity extends Activity { Window window = getWindow(); window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); window.setStatusBarColor(0x40000000); - window.getDecorView().setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); + window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI); } String[] args = getArgsFromIntent(getIntent());