diff --git a/app/src/main/java/io/pslab/activity/LogicalAnalyzerActivity.java b/app/src/main/java/io/pslab/activity/LogicalAnalyzerActivity.java index 4f562156a..84761fe05 100644 --- a/app/src/main/java/io/pslab/activity/LogicalAnalyzerActivity.java +++ b/app/src/main/java/io/pslab/activity/LogicalAnalyzerActivity.java @@ -1,10 +1,13 @@ package io.pslab.activity; +import android.os.Build; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.MenuItem; +import android.view.View; +import android.view.WindowManager; import io.pslab.R; import io.pslab.communication.ScienceLab; @@ -31,6 +34,23 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_logic_analyzer); scienceLab = ScienceLabCommon.scienceLab; ButterKnife.bind(this); + + if (Build.VERSION.SDK_INT < 16) { + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + else { + View decorView = getWindow().getDecorView(); + + decorView.setSystemUiVisibility((View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY)); + } + getSupportFragmentManager().beginTransaction().add(R.id.la_frame_layout, LALogicLinesFragment.newInstance(this)).commit(); setSupportActionBar(toolbar); if (getSupportActionBar() != null) { diff --git a/app/src/main/java/io/pslab/activity/OscilloscopeActivity.java b/app/src/main/java/io/pslab/activity/OscilloscopeActivity.java index d72a7b6da..c38443ab1 100644 --- a/app/src/main/java/io/pslab/activity/OscilloscopeActivity.java +++ b/app/src/main/java/io/pslab/activity/OscilloscopeActivity.java @@ -6,6 +6,7 @@ import android.graphics.Color; import android.graphics.Point; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.support.annotation.IdRes; @@ -19,6 +20,7 @@ import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; +import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; @@ -185,6 +187,22 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_oscilloscope); ButterKnife.bind(this); + if (Build.VERSION.SDK_INT < 16) { + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + else { + View decorView = getWindow().getDecorView(); + + decorView.setSystemUiVisibility((View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY)); + } + setUpBottomSheet(); parentLayout.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java index d9e1c93a3..3eadc6c06 100644 --- a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java +++ b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.support.annotation.NonNull; @@ -18,6 +19,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView; @@ -181,6 +183,23 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_wave_generator_main); ButterKnife.bind(this); + + if (Build.VERSION.SDK_INT < 16) { + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + else { + View decorView = getWindow().getDecorView(); + + decorView.setSystemUiVisibility((View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY)); + } + scienceLab = ScienceLabCommon.scienceLab; if (!WaveGeneratorCommon.isInitialized) { new WaveGeneratorCommon(true);