|
@@ -466,9 +466,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
|
|
+ mSnackbarManager.showSnackbar(mSnackbar);
|
|
+ mSnackbarManager.showSnackbar(mSnackbar);
|
|
+ }
|
|
+ }
|
|
+
|
|
+
|
|
- private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate {
|
|
|
|
- @Override
|
|
|
|
- public boolean isEnabled() {
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public void addExtraPreferences(PreferenceFragmentCompat fragment) {
|
|
|
|
+ if (ImageDescriptionsController.getInstance().shouldShowImageDescriptionsMenuItem()) {
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
|
@@ -2079,7 +2079,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
|
|
diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
|
|
diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
|
|
--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
|
|
--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
|
|
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
|
|
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
|
|
-@@ -28,6 +28,8 @@ public class AccessibilitySettings
|
|
|
|
|
|
+@@ -31,12 +31,15 @@ public class AccessibilitySettings
|
|
public static final String PREF_CAPTIONS = "captions";
|
|
public static final String PREF_CAPTIONS = "captions";
|
|
|
|
|
|
static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
|
|
static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
|
|
@@ -2088,15 +2088,14 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
|
|
private TextScalePreference mTextScalePref;
|
|
private TextScalePreference mTextScalePref;
|
|
private ChromeBaseCheckBoxPreference mForceEnableZoomPref;
|
|
private ChromeBaseCheckBoxPreference mForceEnableZoomPref;
|
|
private boolean mRecordFontSizeChangeOnStop;
|
|
private boolean mRecordFontSizeChangeOnStop;
|
|
-@@ -35,6 +37,7 @@ public class AccessibilitySettings
|
|
|
|
- private BooleanPreferenceDelegate mForceTabletUIDelegate;
|
|
|
|
|
|
+ private AccessibilitySettingsDelegate mDelegate;
|
|
private BooleanPreferenceDelegate mReaderForAccessibilityDelegate;
|
|
private BooleanPreferenceDelegate mReaderForAccessibilityDelegate;
|
|
private BooleanPreferenceDelegate mAccessibilityTabSwitcherDelegate;
|
|
private BooleanPreferenceDelegate mAccessibilityTabSwitcherDelegate;
|
|
+ private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
|
|
+ private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
|
|
|
|
|
|
private FontSizePrefs mFontSizePrefs;
|
|
private FontSizePrefs mFontSizePrefs;
|
|
private FontSizePrefsObserver mFontSizePrefsObserver = new FontSizePrefsObserver() {
|
|
private FontSizePrefsObserver mFontSizePrefsObserver = new FontSizePrefsObserver() {
|
|
-@@ -54,6 +57,10 @@ public class AccessibilitySettings
|
|
|
|
|
|
+@@ -56,6 +59,10 @@ public class AccessibilitySettings
|
|
mFontSizePrefs = FontSizePrefs.getInstance(delegate.getBrowserContextHandle());
|
|
mFontSizePrefs = FontSizePrefs.getInstance(delegate.getBrowserContextHandle());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2107,7 +2106,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
|
|
@Override
|
|
@Override
|
|
public void onActivityCreated(Bundle savedInstanceState) {
|
|
public void onActivityCreated(Bundle savedInstanceState) {
|
|
super.onActivityCreated(savedInstanceState);
|
|
super.onActivityCreated(savedInstanceState);
|
|
-@@ -103,6 +110,12 @@ public class AccessibilitySettings
|
|
|
|
|
|
+@@ -105,6 +112,12 @@ public class AccessibilitySettings
|
|
getPreferenceScreen().removePreference(accessibilityTabSwitcherPref);
|
|
getPreferenceScreen().removePreference(accessibilityTabSwitcherPref);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2120,7 +2119,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
|
|
Preference captions = findPreference(PREF_CAPTIONS);
|
|
Preference captions = findPreference(PREF_CAPTIONS);
|
|
captions.setOnPreferenceClickListener(preference -> {
|
|
captions.setOnPreferenceClickListener(preference -> {
|
|
Intent intent = new Intent(Settings.ACTION_CAPTIONING_SETTINGS);
|
|
Intent intent = new Intent(Settings.ACTION_CAPTIONING_SETTINGS);
|
|
-@@ -147,6 +160,9 @@ public class AccessibilitySettings
|
|
|
|
|
|
+@@ -150,6 +163,9 @@ public class AccessibilitySettings
|
|
if (mReaderForAccessibilityDelegate != null) {
|
|
if (mReaderForAccessibilityDelegate != null) {
|
|
mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue);
|
|
mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue);
|
|
}
|
|
}
|