PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

#1116 fix tablet mode

Browse Source
This commit is contained in:
Carmelo Messina
2024-05-22 16:31:43 +02:00
parent 9d44640632
commit 7a280bc516
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Add-option-to-force-tablet-UI.patch
+23 -1
View File
@@ -30,6 +30,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../java/res/values-sw600dp/dimens.xml | 5 ++--
.../toolbar/java/res/values/dimens.xml | 5 ++--
.../browser/toolbar/ControlContainer.java | 2 +-
.../browser/toolbar/ToolbarFeatures.java | 4 ++-
.../top/TabStripTransitionCoordinator.java | 2 +-
.../toolbar/top/ToolbarControlContainer.java | 28 ++++++++++++++++++-
.../browser/toolbar/top/ToolbarLayout.java | 5 +++-
@@ -37,7 +38,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../res/xml/accessibility_preferences.xml | 5 ++++
.../AccessibilitySettingsDelegate.java | 11 ++++++++
.../chromium/ui/base/DeviceFormFactor.java | 9 ++++++
33 files changed, 171 insertions(+), 34 deletions(-)
34 files changed, 174 insertions(+), 35 deletions(-)
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -546,6 +547,27 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
/**
* @return The {@link ViewResourceAdapter} that exposes this {@link View} as a CC resource.
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.toolbar;
import androidx.annotation.OptIn;
import androidx.core.os.BuildCompat;
+import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.base.ResettersForTesting;
import org.chromium.base.cached_flags.BooleanCachedFieldTrialParameter;
import org.chromium.base.cached_flags.IntCachedFieldTrialParameter;
@@ -71,7 +72,8 @@ public final class ToolbarFeatures {
* is enabled.
*/
public static boolean isDynamicTopChromeEnabled() {
- return ChromeFeatureList.sDynamicTopChrome.isEnabled();
+ return ChromeFeatureList.sDynamicTopChrome.isEnabled()
+ && !DeviceFormFactor.isForceTabletUI();
}
/** Returns if we are using optimized window layout for tab strip. */
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java