From 08dcf0f2ddb7d989a212a1829b8ae7eefb503661 Mon Sep 17 00:00:00 2001 From: Arvind Kaushik Date: Wed, 21 Jun 2023 09:27:43 +0530 Subject: [PATCH 1/6] add keepScreenOn in preferences --- app/src/main/java/com/termux/x11/LoriePreferences.java | 7 +++++++ app/src/main/java/com/termux/x11/MainActivity.java | 9 +++++++-- app/src/main/res/xml/preferences.xml | 5 +++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index 1f44bbc82..834e3082e 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -250,6 +250,13 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { edit.commit(); } + if ("keepScreenOn".equals(key)) { + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(requireContext()); + SharedPreferences.Editor edit = preferences.edit(); + edit.putBoolean("keepScreenOn", true); + edit.commit(); + } + if ("enableAccessibilityServiceAutomatically".equals(key)) { Boolean value = (Boolean) newValue; if (!value) diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java index e616c75bc..305161445 100644 --- a/app/src/main/java/com/termux/x11/MainActivity.java +++ b/app/src/main/java/com/termux/x11/MainActivity.java @@ -103,7 +103,7 @@ protected void onCreate(Bundle savedInstanceState) { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences.registerOnSharedPreferenceChangeListener((sharedPreferences, key) -> onPreferencesChanged(key)); - getWindow().setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_KEEP_SCREEN_ON | FLAG_TRANSLUCENT_STATUS, 0); + getWindow().setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_TRANSLUCENT_STATUS, 0); requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.main_activity); @@ -471,6 +471,11 @@ public void onWindowFocusChanged(boolean hasFocus) { boolean fullscreen = p.getBoolean("fullscreen", false); boolean reseed = p.getBoolean("Reseed", true); + if (p.getBoolean("keepScreenOn", false)) + window.addFlags(FLAG_KEEP_SCREEN_ON); + else + window.clearFlags(FLAG_KEEP_SCREEN_ON); + fullscreen = fullscreen || getIntent().getBooleanExtra(REQUEST_LAUNCH_EXTERNAL_DISPLAY, false); int requestedOrientation = p.getBoolean("forceLandscape", false) ? @@ -493,7 +498,7 @@ public void onWindowFocusChanged(boolean hasFocus) { window.setNavigationBarColor(Color.BLACK); } - window.setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_KEEP_SCREEN_ON | FLAG_TRANSLUCENT_STATUS, 0); + window.setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_TRANSLUCENT_STATUS, 0); if (hasFocus && fullscreen) { window.addFlags(FLAG_FULLSCREEN); decorView.setSystemUiVisibility( diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index ca6e86259..544973b7c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -60,6 +60,11 @@ android:title="Hide display cutout (if any)" android:defaultValue="false" android:key="hideCutout" /> + + From ad78aef7cb3ddc71f479e7908b2553baec77d680 Mon Sep 17 00:00:00 2001 From: Twaik Yont Date: Tue, 27 Jun 2023 14:19:45 +0300 Subject: [PATCH 2/6] Update LoriePreferences.java --- app/src/main/java/com/termux/x11/LoriePreferences.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index 834e3082e..1f44bbc82 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -250,13 +250,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { edit.commit(); } - if ("keepScreenOn".equals(key)) { - SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(requireContext()); - SharedPreferences.Editor edit = preferences.edit(); - edit.putBoolean("keepScreenOn", true); - edit.commit(); - } - if ("enableAccessibilityServiceAutomatically".equals(key)) { Boolean value = (Boolean) newValue; if (!value) From c717e4b305818b63056e08d6fb8f01af24ad62ba Mon Sep 17 00:00:00 2001 From: Twaik Yont Date: Tue, 27 Jun 2023 14:21:24 +0300 Subject: [PATCH 3/6] Update preferences.xml --- app/src/main/res/xml/preferences.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 544973b7c..2342c16fc 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -63,7 +63,7 @@ From ccc82b45bb343743ae3ee906bf8d49cfe1898c8d Mon Sep 17 00:00:00 2001 From: Twaik Yont Date: Tue, 27 Jun 2023 14:30:27 +0300 Subject: [PATCH 4/6] Update MainActivity.java --- app/src/main/java/com/termux/x11/MainActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java index 305161445..312a9a834 100644 --- a/app/src/main/java/com/termux/x11/MainActivity.java +++ b/app/src/main/java/com/termux/x11/MainActivity.java @@ -471,11 +471,6 @@ public void onWindowFocusChanged(boolean hasFocus) { boolean fullscreen = p.getBoolean("fullscreen", false); boolean reseed = p.getBoolean("Reseed", true); - if (p.getBoolean("keepScreenOn", false)) - window.addFlags(FLAG_KEEP_SCREEN_ON); - else - window.clearFlags(FLAG_KEEP_SCREEN_ON); - fullscreen = fullscreen || getIntent().getBooleanExtra(REQUEST_LAUNCH_EXTERNAL_DISPLAY, false); int requestedOrientation = p.getBoolean("forceLandscape", false) ? @@ -513,6 +508,11 @@ public void onWindowFocusChanged(boolean hasFocus) { decorView.setSystemUiVisibility(0); } + if (p.getBoolean("keepScreenOn", false)) + window.addFlags(FLAG_KEEP_SCREEN_ON); + else + window.clearFlags(FLAG_KEEP_SCREEN_ON); + if (reseed) window.setSoftInputMode(SOFT_INPUT_ADJUST_RESIZE | SOFT_INPUT_STATE_HIDDEN); else From 4e8a09902461834093c5cc941e29a98280ddf0bc Mon Sep 17 00:00:00 2001 From: Twaik Yont Date: Tue, 27 Jun 2023 14:33:20 +0300 Subject: [PATCH 5/6] Update MainActivity.java --- app/src/main/java/com/termux/x11/MainActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java index 312a9a834..70886aef8 100644 --- a/app/src/main/java/com/termux/x11/MainActivity.java +++ b/app/src/main/java/com/termux/x11/MainActivity.java @@ -103,7 +103,7 @@ protected void onCreate(Bundle savedInstanceState) { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences.registerOnSharedPreferenceChangeListener((sharedPreferences, key) -> onPreferencesChanged(key)); - getWindow().setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_TRANSLUCENT_STATUS, 0); + getWindow().setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_KEEP_SCREEN_ON | FLAG_TRANSLUCENT_STATUS, 0); requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.main_activity); @@ -493,7 +493,7 @@ public void onWindowFocusChanged(boolean hasFocus) { window.setNavigationBarColor(Color.BLACK); } - window.setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_TRANSLUCENT_STATUS, 0); + window.setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_KEEP_SCREEN_ON | FLAG_TRANSLUCENT_STATUS, 0); if (hasFocus && fullscreen) { window.addFlags(FLAG_FULLSCREEN); decorView.setSystemUiVisibility( From f77531c8eda218200ae4a1441ed71256be6c0cf6 Mon Sep 17 00:00:00 2001 From: Twaik Yont Date: Tue, 27 Jun 2023 14:33:45 +0300 Subject: [PATCH 6/6] Update MainActivity.java --- app/src/main/java/com/termux/x11/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java index 70886aef8..98dedb678 100644 --- a/app/src/main/java/com/termux/x11/MainActivity.java +++ b/app/src/main/java/com/termux/x11/MainActivity.java @@ -508,7 +508,7 @@ public void onWindowFocusChanged(boolean hasFocus) { decorView.setSystemUiVisibility(0); } - if (p.getBoolean("keepScreenOn", false)) + if (p.getBoolean("keepScreenOn", true)) window.addFlags(FLAG_KEEP_SCREEN_ON); else window.clearFlags(FLAG_KEEP_SCREEN_ON);