From: uazo Date: Mon, 17 May 2021 12:30:12 +0000 Subject: Add support for ISupportHelpAndFeedback --- .../chrome/browser/settings/SettingsActivity.java | 11 ++++++++--- .../components/browser_ui/settings/SettingsUtils.java | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java @@ -56,6 +56,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.ui.UiUtils; @@ -252,9 +253,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { - HelpAndFeedbackLauncherImpl.getInstance().show(this, - getString(R.string.help_context_settings), Profile.getLastUsedRegularProfile(), - null); + if (mainFragment instanceof SettingsUtils.ISupportHelpAndFeedback) { + ((SettingsUtils.ISupportHelpAndFeedback)mainFragment).onHelpAndFeebackPressed(); + } else { + HelpAndFeedbackLauncherImpl.getInstance().show(this, + getString(R.string.help_context_settings), Profile.getLastUsedRegularProfile(), + null); + } return true; } return super.onOptionsItemSelected(item); diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java --- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java +++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java @@ -126,4 +126,8 @@ public class SettingsUtils { ImageView imageButton = (ImageView) button; return imageButton.getDrawable() == parentMenu.getOverflowIcon(); } + + public interface ISupportHelpAndFeedback { + void onHelpAndFeebackPressed(); + } } -- 2.17.1