From 6d0cbbf62d6a0ed1ed05a69b0ab152919a0a1201 Mon Sep 17 00:00:00 2001 From: suhan-paradkar <12suhangp34@gmail.com> Date: Sun, 11 Jul 2021 10:08:53 +0530 Subject: [PATCH] Add activity-wise Multiwindow support --- app/src/main/AndroidManifest.xml | 12 +++++++----- .../com/termux/x11/AdditionalKeyboardView.java | 6 ++++++ .../main/java/com/termux/x11/MainActivity.java | 7 +++++++ app/src/main/res/xml/preferences.xml | 16 ++++++++++++++-- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20d1cda..9d34d38 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,9 +18,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning" - android:resizeableActivity="true" - android:debuggable="true" - android:supportsPictureInPicture="true"> + android:debuggable="true"> + android:supportsPictureInPicture="true" + android:configChanges="fontScale|orientation|screenSize|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|screenLayout|touchscreen|uiMode|smallestScreenSize|density" + android:resizeableActivity="true"> @@ -46,7 +46,9 @@ + android:name=".LoriePreferences" + android:supportsPictureInPicture="false" + android:resizeableActivity="true"> diff --git a/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java b/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java index 834d2fb..8678bee 100644 --- a/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java +++ b/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java @@ -70,6 +70,12 @@ public class AdditionalKeyboardView extends HorizontalScrollView implements View return; } + if (isInPictureInPictureMode()) { + if (getVisibility() != View.GONE) + setVisibility(View.GONE); + return; + } + Rect r = new Rect(); getWindowVisibleDisplayFrame(r); diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java index 2a3b4b6..bdbc604 100644 --- a/app/src/main/java/com/termux/x11/MainActivity.java +++ b/app/src/main/java/com/termux/x11/MainActivity.java @@ -113,4 +113,11 @@ public class MainActivity extends AppCompatActivity { @Override public void onBackPressed() {} + @Override + public void onUserLeaveHint () { + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); + if (preferences.getBooolean("PIP", true)) { + enterPictureInPictureMode(); + } + } } diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index f6fbc3a..89fb01e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -1,18 +1,24 @@ - - + + + +