Update insets handling on Android 11-14

vkryl · vkryl · commit 72281a59f5be · 2025-08-29T19:30:06.000+03:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -71,6 +71,8 @@ android {
 
     buildConfigField("boolean", "EXPERIMENTAL", isExperimentalBuild.toString())
 
+    buildConfigInt("TARGET_SDK_INT", versions.getIntOrThrow("version.sdk_target"))
+
     buildConfigInt("TELEGRAM_API_ID", properties.getIntOrThrow("telegram.api_id"))
     buildConfigString("TELEGRAM_API_HASH", properties.getOrThrow("telegram.api_hash"))
 
diff --git a/app/src/main/java/org/thunderdog/challegram/BaseActivity.java b/app/src/main/java/org/thunderdog/challegram/BaseActivity.java
@@ -1961,7 +1961,7 @@ public RootFrameLayout getRootView () {
   }
 
   public int getVisibleContentHeight () {
-    if (Config.ENABLE_EDGE_TO_EDGE) {
+    if (Settings.instance().useEdgeToEdge()) {
       return rootView.getInnerContentHeight();
     } else {
       return contentView.getMeasuredHeight();
@@ -2103,7 +2103,7 @@ public boolean openForceTouch (ForceTouchView.ForceTouchContext context) {
       // forceTouchWindow.setNeedRootInsets();
     }
     forceTouchWindow.init(true);
-    forceTouchWindow.setNeedFullScreen(Config.ENABLE_EDGE_TO_EDGE);
+    forceTouchWindow.setNeedFullScreen(Settings.instance().useEdgeToEdge());
     if (!context.allowFullscreen()) {
       forceTouchWindow.setNeedRootInsets();
     }
diff --git a/app/src/main/java/org/thunderdog/challegram/component/attach/MediaBottomBaseController.java b/app/src/main/java/org/thunderdog/challegram/component/attach/MediaBottomBaseController.java
@@ -40,6 +40,7 @@
 import org.thunderdog.challegram.theme.ColorId;
 import org.thunderdog.challegram.tool.Screen;
 import org.thunderdog.challegram.tool.Views;
+import org.thunderdog.challegram.unsorted.Settings;
 import org.thunderdog.challegram.util.HapticMenuHelper;
 import org.thunderdog.challegram.widget.EmptyTextView;
 
@@ -148,7 +149,7 @@ protected final void initMetrics () { // FIXME make private again and move calli
   }
 
   private int getBarHeightIfAvailable () {
-    return mediaLayout.inSpecificMode() && mediaLayout.getMode() != MediaLayout.MODE_CUSTOM_ADAPTER ? 0 : MediaBottomBar.getBarHeight() + (Config.ENABLE_EDGE_TO_EDGE ? context.getRootView().getSystemInsetsWithoutIme().bottom : 0);
+    return mediaLayout.inSpecificMode() && mediaLayout.getMode() != MediaLayout.MODE_CUSTOM_ADAPTER ? 0 : MediaBottomBar.getBarHeight() + (Settings.instance().useEdgeToEdge() ? context.getRootView().getSystemInsetsWithoutIme().bottom : 0);
   }
 
   private void resetStartHeights (boolean initial) {
diff --git a/app/src/main/java/org/thunderdog/challegram/component/attach/MediaLayout.java b/app/src/main/java/org/thunderdog/challegram/component/attach/MediaLayout.java
@@ -521,7 +521,7 @@ public void show (boolean overlayStatusBar) {
     popupLayout.setDismissListener(this);
     popupLayout.setNeedRootInsets();
     popupLayout.setOverlayStatusBar(overlayStatusBar);
-    popupLayout.init(!Config.ENABLE_EDGE_TO_EDGE);
+    popupLayout.init(true);
     popupLayout.showAnimatedPopupView(this, this);
   }
 
diff --git a/app/src/main/java/org/thunderdog/challegram/config/Config.java b/app/src/main/java/org/thunderdog/challegram/config/Config.java
@@ -247,7 +247,8 @@ public static boolean useCloudPlayback (TdApi.Message playPauseFile) {
   public static final boolean USE_CUSTOM_NAVIGATION_COLOR = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
   public static final boolean USE_TRANSPARENT_STATUS_BAR = false; // Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM;
 
-  public static final boolean ENABLE_EDGE_TO_EDGE = Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM;
+  public static final boolean EDGE_TO_EDGE_AVAILABLE = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
+  public static final boolean EDGE_TO_EDGE_CUSTOMIZABLE = EDGE_TO_EDGE_AVAILABLE && (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM || BuildConfig.TARGET_SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM);
 
   public static final boolean PREFER_RENDER_EXTENSIONS = true;
 
diff --git a/app/src/main/java/org/thunderdog/challegram/mediaview/MediaViewController.java b/app/src/main/java/org/thunderdog/challegram/mediaview/MediaViewController.java
@@ -205,7 +205,9 @@ public class MediaViewController extends ViewController<MediaViewController.Args
   public static final int MODE_SECRET = 4; // just single photo, no animations and etc
   public static final int MODE_SIMPLE = 5;
 
-  private static final boolean APPLY_ALL_INSETS = Config.ENABLE_EDGE_TO_EDGE;
+  private boolean useEdgeToEdge () {
+    return Settings.instance().useEdgeToEdge();
+  }
 
   public MediaViewController (Context context, Tdlib tdlib) {
     super(context, tdlib);
@@ -3432,7 +3434,7 @@ private void animateVideoFactor (float toFactor) {
   private boolean ignoreCaptionUpdate;
 
   private boolean canRunFullscreen () {
-    if (APPLY_ALL_INSETS) {
+    if (useEdgeToEdge()) {
       return true;
     }
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Config.CUTOUT_ENABLED && mode == MODE_MESSAGES) {
@@ -3485,7 +3487,7 @@ private int measureBottomWrapHeight () {
     if (captionFactor == 1f && captionWrapView != null) {
       height += captionWrapView.getMeasuredHeight();
     }
-    if (APPLY_ALL_INSETS) {
+    if (useEdgeToEdge()) {
       height += bottomInnerMargin;
     }
     return height;
@@ -5128,7 +5130,7 @@ protected void onDraw (Canvas c) {
         headerView.setElevation(Screen.dp(3f));
       }
       attachHeaderViewWithoutNavigation(headerView);
-      headerView.initWithSingleController(this, APPLY_ALL_INSETS || ((SET_FULLSCREEN_ON_OPEN || canRunFullscreen()) && !Config.CUTOUT_ENABLED));
+      headerView.initWithSingleController(this, useEdgeToEdge() || ((SET_FULLSCREEN_ON_OPEN || canRunFullscreen()) && !Config.CUTOUT_ENABLED));
       headerView.getFilling().setShadowAlpha(0f);
       int leftMargin = Screen.dp(68f);
       int rightMargin = measureButtonsPadding();
@@ -5430,8 +5432,8 @@ public void dispatchSystemInsets (View parentView, ViewGroup.MarginLayoutParams
     int bottomInset = insets.bottom;
     boolean changed = this.bottomInnerMargin != bottomInset;
     this.bottomInnerMargin = bottomInset;
-    if (APPLY_ALL_INSETS || (mode == MODE_GALLERY && isFromCamera)) {
-      int controlsMargin = APPLY_ALL_INSETS || bottomInset <= Screen.getNavigationBarHeight() ? bottomInset : 0;
+    if (useEdgeToEdge() || (mode == MODE_GALLERY && isFromCamera)) {
+      int controlsMargin = useEdgeToEdge() || bottomInset <= Screen.getNavigationBarHeight() ? bottomInset : 0;
       setControlsMargin(controlsMargin);
       int bottomOffset = getSectionBottomOffset(SECTION_CROP);
       Views.setBottomMargin(cropTargetView, bottomOffset);
@@ -5706,7 +5708,7 @@ private int getSectionBottomOffset (int section) {
     if (mode != MODE_GALLERY) {
       return 0;
     }
-    int add = APPLY_ALL_INSETS || isFromCamera ? this.bottomInnerMargin : 0;
+    int add = useEdgeToEdge() || isFromCamera ? this.bottomInnerMargin : 0;
     switch (section) {
       case SECTION_CAPTION: {
         return 0; // Screen.dp(56f);
@@ -8640,7 +8642,7 @@ private void openForceEditMode () {
   }
 
   private void stopFullScreenTemporarily (boolean stop) {
-    if (APPLY_ALL_INSETS) {
+    if (useEdgeToEdge()) {
       return;
     }
     if (stop) {
diff --git a/app/src/main/java/org/thunderdog/challegram/navigation/RootDrawable.java b/app/src/main/java/org/thunderdog/challegram/navigation/RootDrawable.java
@@ -33,6 +33,7 @@
 import org.thunderdog.challegram.tool.Paints;
 import org.thunderdog.challegram.tool.Screen;
 import org.thunderdog.challegram.tool.UI;
+import org.thunderdog.challegram.unsorted.Settings;
 
 public class RootDrawable extends Drawable {
   private final RootState state;
@@ -57,7 +58,7 @@ public void draw (@NonNull final Canvas c) {
     if (!state.isDisabled) {
       c.drawColor(Theme.getColor(state.getColorId()));
     }
-    if (Config.ENABLE_EDGE_TO_EDGE) {
+    if (Settings.instance().useEdgeToEdge()) {
       int width = state.context.getRootView().getMeasuredWidth();
       int height = state.context.getRootView().getMeasuredHeight();
       Rect rect = state.context.getRootView().getSystemInsetsWithoutIme();
diff --git a/app/src/main/java/org/thunderdog/challegram/tool/UI.java b/app/src/main/java/org/thunderdog/challegram/tool/UI.java
@@ -588,7 +588,7 @@ public static ViewController<?> getCurrentStackItem (Context context) {
   public static void clearActivity (BaseActivity a) {
     a.requestWindowFeature(Window.FEATURE_NO_TITLE);
     Window w = a.getWindow();
-    if (Config.ENABLE_EDGE_TO_EDGE) {
+    if (Settings.instance().useEdgeToEdge()) {
       w.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
     } else {
       w.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/BottomSheetViewController.java b/app/src/main/java/org/thunderdog/challegram/ui/BottomSheetViewController.java
@@ -29,6 +29,7 @@
 import org.thunderdog.challegram.tool.Screen;
 import org.thunderdog.challegram.tool.UI;
 import org.thunderdog.challegram.tool.Views;
+import org.thunderdog.challegram.unsorted.Settings;
 import org.thunderdog.challegram.v.CustomRecyclerView;
 import org.thunderdog.challegram.widget.LickView;
 import org.thunderdog.challegram.widget.PopupLayout;
@@ -528,7 +529,7 @@ public void getItemOffsets (@NonNull Rect outRect, @NonNull View view, RecyclerV
 
       if (position == 0 || isUnknown) {
         top = controller.canHideByScroll() ?
-          (controller.getTargetHeight() - HeaderView.getTopOffset() - (Config.ENABLE_EDGE_TO_EDGE ? controller.context().getRootView().getSystemInsetsWithoutIme().bottom : 0)):
+          (controller.getTargetHeight() - HeaderView.getTopOffset() - (Settings.instance().useEdgeToEdge() ? controller.context().getRootView().getSystemInsetsWithoutIme().bottom : 0)):
           (controller.getContentOffset());
       }
       if (position == itemCount - 1 || isUnknown) {
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/MessageOptionsPagerController.java b/app/src/main/java/org/thunderdog/challegram/ui/MessageOptionsPagerController.java
@@ -57,6 +57,7 @@
 import org.thunderdog.challegram.tool.Screen;
 import org.thunderdog.challegram.tool.UI;
 import org.thunderdog.challegram.tool.Views;
+import org.thunderdog.challegram.unsorted.Settings;
 import org.thunderdog.challegram.util.DrawableProvider;
 import org.thunderdog.challegram.util.OptionDelegate;
 import org.thunderdog.challegram.util.text.Counter;
@@ -459,7 +460,7 @@ protected int getContentOffset () {
         - (Screen.dp(54) + HeaderView.getTopOffset())
         - getOptionItemsHeight()
         - Screen.dp(1)
-        - (Config.ENABLE_EDGE_TO_EDGE ? context().getRootView().getSystemInsetsWithoutIme().bottom : 0)
+        - (Settings.instance().useEdgeToEdge() ? context().getRootView().getSystemInsetsWithoutIme().bottom : 0)
       );
     } else {
       return Screen.currentHeight() / 2;
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/MessagesController.java b/app/src/main/java/org/thunderdog/challegram/ui/MessagesController.java
@@ -8663,7 +8663,7 @@ public int makeGuessAboutHeight () {
       return makeGuessAboutForcePreviewHeight();
     } else {
       int height;
-      if (Config.ENABLE_EDGE_TO_EDGE) {
+      if (Settings.instance().useEdgeToEdge()) {
         height = context().getVisibleContentHeight() - context().getRootView().getTopInset() - HeaderView.getSize(false);
       } else {
         height = Screen.currentHeight() - HeaderView.getSize(true);
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/SettingsBugController.java b/app/src/main/java/org/thunderdog/challegram/ui/SettingsBugController.java
@@ -744,6 +744,15 @@ protected void setValuedSetting (ListItem item, SettingView view, boolean isUpda
           items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, R.string.Experiment_PeerIdsInfo));
         }
 
+        if (Config.EDGE_TO_EDGE_CUSTOMIZABLE) {
+          if (!items.isEmpty()) {
+            items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+          }
+          items.add(new ListItem(ListItem.TYPE_RADIO_SETTING, R.id.btn_experiment, 0, R.string.Experiment_NoEdgeToEdge).setLongValue(Settings.EXPERIMENT_FLAG_NO_EDGE_TO_EDGE));
+          items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+          items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, R.string.Experiment_NoEdgeToEdgeInfo));
+        }
+
         if (items.isEmpty()) {
           items.add(new ListItem(ListItem.TYPE_EMPTY, 0, 0, R.string.ExperimentalSettingsUnavailable));
         }
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/ShareController.java b/app/src/main/java/org/thunderdog/challegram/ui/ShareController.java
@@ -1234,7 +1234,7 @@ protected void onLayout (boolean changed, int l, int t, int r, int b) {
     bottomWrap.setId(R.id.share_bottom);
     bottomWrap.setOrientation(LinearLayout.VERTICAL);
     contentView.addView(bottomWrap);
-    if (Config.ENABLE_EDGE_TO_EDGE) {
+    if (Settings.instance().useEdgeToEdge()) {
       RelativeLayout.LayoutParams rp = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0);
       rp.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
       spaceView = new FillingSpace(context);
@@ -2283,7 +2283,7 @@ protected void applySearchTransformFactor (float factor, boolean isOpening) {
     super.applySearchTransformFactor(factor, isOpening);
     setSmoothScrollFactor(isOpening ? factor : 1f - factor);
     setScrollLocked(factor == 1f);
-    if (!Config.ENABLE_EDGE_TO_EDGE) {
+    if (!Settings.instance().useEdgeToEdge()) {
       popupLayout.setIgnoreBottom(factor != 0f);
     }
   }
@@ -2377,7 +2377,7 @@ public void onCustomShowComplete () {
     popupLayout.setBoundController(this);
     popupLayout.setPopupHeightProvider(this);
     popupLayout.setOverlayStatusBar(overlayStatusBar);
-    popupLayout.init(Config.ENABLE_EDGE_TO_EDGE);
+    popupLayout.init(Settings.instance().useEdgeToEdge());
     popupLayout.setAlwaysApplyIme(true);
     popupLayout.setHideKeyboard();
     popupLayout.setNeedRootInsets();
diff --git a/app/src/main/java/org/thunderdog/challegram/unsorted/Settings.java b/app/src/main/java/org/thunderdog/challegram/unsorted/Settings.java
@@ -427,6 +427,7 @@ private static String key (String key, int accountId) {
 
   public static final long EXPERIMENT_FLAG_ALLOW_EXPERIMENTS = 1;
   public static final long EXPERIMENT_FLAG_SHOW_PEER_IDS = 1 << 2;
+  public static final long EXPERIMENT_FLAG_NO_EDGE_TO_EDGE = 1 << 3;
 
   public static final long REMOVED_EXPERIMENT_FLAG_ENABLE_FOLDERS = 1 << 1;
 
@@ -2782,6 +2783,16 @@ public void setUseSystemFonts (boolean useSystemFonts) {
     setSetting(FLAG_OTHER_USE_SYSTEM_FONTS, useSystemFonts);
   }
 
+  public boolean useEdgeToEdge () {
+    if (Config.EDGE_TO_EDGE_AVAILABLE) {
+      if (Config.EDGE_TO_EDGE_CUSTOMIZABLE) {
+        return !isExperimentEnabled(EXPERIMENT_FLAG_NO_EDGE_TO_EDGE);
+      }
+      return true;
+    }
+    return false;
+  }
+
   public boolean useBigEmoji () {
     return checkNegativeSetting(FLAG_OTHER_DISABLE_BIG_EMOJI);
   }
diff --git a/app/src/main/java/org/thunderdog/challegram/widget/RootFrameLayout.java b/app/src/main/java/org/thunderdog/challegram/widget/RootFrameLayout.java
@@ -39,6 +39,7 @@
 import org.thunderdog.challegram.tool.UI;
 import org.thunderdog.challegram.tool.Views;
 import org.thunderdog.challegram.unsorted.Passcode;
+import org.thunderdog.challegram.unsorted.Settings;
 
 import me.vkryl.android.widget.FrameLayoutFix;
 import me.vkryl.core.lambda.CancellableRunnable;
@@ -244,7 +245,7 @@ public void removeInsetsChangeListener (InsetsChangeListener listener) {
   private boolean hasIgnoredChanged;
 
   public void forceHideKeyboard () {
-    if (Config.ENABLE_EDGE_TO_EDGE) {
+    if (Settings.instance().useEdgeToEdge()) {
       if (hasIgnoredChanged && systemInsetsWithoutIme.bottom == systemInsets.bottom) {
         effectiveInsets.set(effectiveInsetsWithoutIme);
         notifyChanges(true);
@@ -261,7 +262,7 @@ private void processWindowInsets (Object insetsRaw, boolean force) {
     final int imeHeight = CAN_DETECT_IME ? getImeHeight(insetsRaw) : 0;
     final boolean isKeyboardVisible = imeHeight > 0;
 
-    boolean ignoreChanges = Config.ENABLE_EDGE_TO_EDGE && !force &&
+    boolean ignoreChanges = Settings.instance().useEdgeToEdge() && !force &&
       UI.getContext(getContext()).isInFullScreen() &&
       (this instanceof BaseRootLayout || (UI.getContext(getContext()).isHideNavigation() && verticalSystemInsetsUpdated && !horizontalSystemInsetsUpdated));
     hasIgnoredChanged = ignoreChanges;
@@ -287,12 +288,12 @@ private void processWindowInsets (Object insetsRaw, boolean force) {
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !ignoreChanges) {
       if (this instanceof BaseRootLayout) {
-        if (!Config.ENABLE_EDGE_TO_EDGE || !UI.getContext(getContext()).isInFullScreen()) {
+        if (!Settings.instance().useEdgeToEdge() || !UI.getContext(getContext()).isInFullScreen()) {
           Screen.setStatusBarHeight(effectiveInsets.top);
         }
       }
 
-     if (!Config.ENABLE_EDGE_TO_EDGE) {
+     if (!Settings.instance().useEdgeToEdge()) {
         if (hadInsets && !ignoreSystemNavigationBar && verticalSystemInsetsUpdated && !horizontalSystemInsetsUpdated) {
           int bottomDiff = (shouldIgnoreBottomMargin(prevSystemInsets.bottom) ? 0 : prevSystemInsets.bottom) - (shouldIgnoreBottomMargin(effectiveInsets.bottom) ? 0 : effectiveInsets.bottom);
 
@@ -511,7 +512,7 @@ protected void onMeasure (int widthMeasureSpec, int heightMeasureSpec) {
         View view = getChildAt(i);
         if (view != null) {
           LayoutParams params = (LayoutParams) view.getLayoutParams();
-          if (Config.ENABLE_EDGE_TO_EDGE && view instanceof InterceptLayout) {
+          if (Settings.instance().useEdgeToEdge() && view instanceof InterceptLayout) {
             applyNavigationInsets((InterceptLayout) view, params, effectiveInsets, effectiveInsetsWithoutIme);
           } else if (view.getFitsSystemWindows()) {
             dispatchChildInsets(view, windowInsetsRaw, params.gravity);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -5287,6 +5287,9 @@
   <string name="Experiment_PeerIds">Show Peer IDs in Profiles</string>
   <string name="Experiment_PeerIdsInfo">Show API identifiers of users and chats in their profiles</string>
 
+  <string name="Experiment_NoEdgeToEdge">Disable Edge to Edge</string>
+  <string name="Experiment_NoEdgeToEdgeInfo">Edge to Edge support on Android 11–14 is not tested, issues are expected. Use this settings to compare behavior without edge-to-edge mode.</string>
+
   <string name="PeerId">Peer ID</string>
   <string name="UserId">User ID</string>
   <string name="SecretChatId">Secret Chat ID</string>
diff --git a/buildSrc/src/main/kotlin/tgx/gradle/plugin/ModulePlugin.kt b/buildSrc/src/main/kotlin/tgx/gradle/plugin/ModulePlugin.kt
@@ -99,7 +99,7 @@ open class ModulePlugin : Plugin<Project> {
     val androidExt = project.extensions.getByName("android")
     if (androidExt is BaseExtension) {
       androidExt.apply {
-        compileSdkVersion(versions.getOrThrow("version.sdk_compile").toInt())
+        compileSdkVersion(versions.getIntOrThrow("version.sdk_compile"))
         buildToolsVersion(versions.getOrThrow("version.build_tools"))
 
         // TODO: investigate why AGP 8.1.2 forces default ndkVersion,
@@ -142,7 +142,7 @@ open class ModulePlugin : Plugin<Project> {
 
         defaultConfig {
           minSdk = Config.MIN_SDK_VERSION
-          targetSdk = versions.getOrThrow("version.sdk_target").toInt()
+          targetSdk = versions.getIntOrThrow("version.sdk_target")
           multiDexEnabled = true
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1961,7 +1961,7 @@ public RootFrameLayout getRootView () {`
`1961`	`1961`	`}`
`1962`	`1962`
`1963`	`1963`	`public int getVisibleContentHeight () {`
`1964`		`- if (Config.ENABLE_EDGE_TO_EDGE) {`
	`1964`	`+ if (Settings.instance().useEdgeToEdge()) {`
`1965`	`1965`	`return rootView.getInnerContentHeight();`
`1966`	`1966`	`} else {`
`1967`	`1967`	`return contentView.getMeasuredHeight();`
`@@ -2103,7 +2103,7 @@ public boolean openForceTouch (ForceTouchView.ForceTouchContext context) {`
`2103`	`2103`	`// forceTouchWindow.setNeedRootInsets();`
`2104`	`2104`	`}`
`2105`	`2105`	`forceTouchWindow.init(true);`
`2106`		`- forceTouchWindow.setNeedFullScreen(Config.ENABLE_EDGE_TO_EDGE);`
	`2106`	`+ forceTouchWindow.setNeedFullScreen(Settings.instance().useEdgeToEdge());`
`2107`	`2107`	`if (!context.allowFullscreen()) {`
`2108`	`2108`	`forceTouchWindow.setNeedRootInsets();`
`2109`	`2109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`import org.thunderdog.challegram.theme.ColorId;`
`41`	`41`	`import org.thunderdog.challegram.tool.Screen;`
`42`	`42`	`import org.thunderdog.challegram.tool.Views;`
	`43`	`+import org.thunderdog.challegram.unsorted.Settings;`
`43`	`44`	`import org.thunderdog.challegram.util.HapticMenuHelper;`
`44`	`45`	`import org.thunderdog.challegram.widget.EmptyTextView;`
`45`	`46`
`@@ -148,7 +149,7 @@ protected final void initMetrics () { // FIXME make private again and move calli`
`148`	`149`	`}`
`149`	`150`
`150`	`151`	`private int getBarHeightIfAvailable () {`
`151`		`- return mediaLayout.inSpecificMode() && mediaLayout.getMode() != MediaLayout.MODE_CUSTOM_ADAPTER ? 0 : MediaBottomBar.getBarHeight() + (Config.ENABLE_EDGE_TO_EDGE ? context.getRootView().getSystemInsetsWithoutIme().bottom : 0);`
	`152`	`+ return mediaLayout.inSpecificMode() && mediaLayout.getMode() != MediaLayout.MODE_CUSTOM_ADAPTER ? 0 : MediaBottomBar.getBarHeight() + (Settings.instance().useEdgeToEdge() ? context.getRootView().getSystemInsetsWithoutIme().bottom : 0);`
`152`	`153`	`}`
`153`	`154`
`154`	`155`	`private void resetStartHeights (boolean initial) {`
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ public void show (boolean overlayStatusBar) {`
`521`	`521`	`popupLayout.setDismissListener(this);`
`522`	`522`	`popupLayout.setNeedRootInsets();`
`523`	`523`	`popupLayout.setOverlayStatusBar(overlayStatusBar);`
`524`		`- popupLayout.init(!Config.ENABLE_EDGE_TO_EDGE);`
	`524`	`+ popupLayout.init(true);`
`525`	`525`	`popupLayout.showAnimatedPopupView(this, this);`
`526`	`526`	`}`
`527`	`527`