Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
- 
c48c9424
by clairehurst at 2023-10-03T16:00:40+00:00
5 changed files:
- fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
- fenix/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt
- fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
- fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
- fenix/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt
Changes:
| ... | ... | @@ -164,7 +164,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { | 
| 164 | 164 |              view = view,
 | 
| 165 | 165 |          )
 | 
| 166 | 166 | |
| 167 | -        if (context.settings().shouldShowOpenInAppCfr) {
 | |
| 167 | +        if (false) { // context.settings().shouldShowOpenInAppCfr
 | |
| 168 | 168 |              openInAppOnboardingObserver.set(
 | 
| 169 | 169 |                  feature = OpenInAppOnboardingObserver(
 | 
| 170 | 170 |                      context = context,
 | 
| ... | ... | @@ -66,7 +66,7 @@ class OpenInAppOnboardingObserver( | 
| 66 | 66 |                          currentUrl = tab.content.url
 | 
| 67 | 67 |                      } else {
 | 
| 68 | 68 |                          // Loading state has changed
 | 
| 69 | -                        maybeShowOpenInAppBanner(tab.content.url, tab.content.loading)
 | |
| 69 | +//                      maybeShowOpenInAppBanner(tab.content.url, tab.content.loading)
 | |
| 70 | 70 |                      }
 | 
| 71 | 71 |                  }
 | 
| 72 | 72 |          }
 | 
| ... | ... | @@ -373,7 +373,7 @@ open class DefaultToolbarMenu( | 
| 373 | 373 |                  findInPageItem,
 | 
| 374 | 374 |                  desktopSiteItem,
 | 
| 375 | 375 |                  customizeReaderView.apply { visible = ::shouldShowReaderViewCustomization },
 | 
| 376 | -                openInApp.apply { visible = ::shouldShowOpenInApp },
 | |
| 376 | +//              openInApp.apply { visible = ::shouldShowOpenInApp },
 | |
| 377 | 377 |                  //reportSiteIssuePlaceholder,
 | 
| 378 | 378 |                  BrowserMenuDivider(),
 | 
| 379 | 379 |                  // addToHomeScreenItem.apply { visible = ::canAddToHomescreen },
 | 
| ... | ... | @@ -122,7 +122,7 @@ class CustomTabToolbarMenu( | 
| 122 | 122 |              BrowserMenuDivider().apply { visible = { !isSandboxCustomTab } },
 | 
| 123 | 123 |              desktopMode,
 | 
| 124 | 124 |              findInPage,
 | 
| 125 | -            openInApp.apply { visible = ::shouldShowOpenInApp },
 | |
| 125 | +//          openInApp.apply { visible = ::shouldShowOpenInApp },
 | |
| 126 | 126 |              openInFenix.apply { visible = { !isSandboxCustomTab } },
 | 
| 127 | 127 |              BrowserMenuDivider(),
 | 
| 128 | 128 |              menuToolbar,
 | 
| ... | ... | @@ -70,6 +70,7 @@ class DynamicDownloadDialog( | 
| 70 | 70 |              )
 | 
| 71 | 71 | |
| 72 | 72 |              binding.downloadDialogActionButton.apply {
 | 
| 73 | +                visibility = View.VISIBLE
 | |
| 73 | 74 |                  text = context.getString(
 | 
| 74 | 75 |                      mozilla.components.feature.downloads.R.string.mozac_feature_downloads_button_try_again,
 | 
| 75 | 76 |                  )
 | 
| ... | ... | @@ -90,6 +91,7 @@ class DynamicDownloadDialog( | 
| 90 | 91 |              )
 | 
| 91 | 92 | |
| 92 | 93 |              binding.downloadDialogActionButton.apply {
 | 
| 94 | +                visibility = View.GONE
 | |
| 93 | 95 |                  text = context.getString(
 | 
| 94 | 96 |                      mozilla.components.feature.downloads.R.string.mozac_feature_downloads_button_open,
 | 
| 95 | 97 |                  )
 |