Verified Commit 12225e75 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by boklm
Browse files

fixup! Various Android workarounds 

Revert "Various Android workarounds"

This reverts commit 30735a57.
parent ee94fae8

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt

+3 −3
Original line number Diff line number Diff line
@@ -719,9 +719,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { 
                MessageNotificationWorker.setMessageNotificationWorker(applicationContext)

            }



            // if (components.core.sentFromFirefoxManager.shouldShowSnackbar) {

            //     components.appStore.dispatch(ShareAction.ShareToWhatsApp)

            // }

            if (components.core.sentFromFirefoxManager.shouldShowSnackbar) {

                components.appStore.dispatch(ShareAction.ShareToWhatsApp)

            }

        }



        onBackPressedCallback.isEnabled = true

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/HomepageHeader.kt

+3 −3
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ fun HomepageHeader( 
            .padding(start = 16.dp, end = 16.dp, top = 18.dp, bottom = 32.dp),

        verticalAlignment = Alignment.CenterVertically,

    ) {

        // WordmarkLogo()

        WordmarkLogo()



        // WordmarkText(wordmarkTextColor)

        WordmarkText(wordmarkTextColor)



        // Spacer(modifier = Modifier.weight(1f))

        Spacer(modifier = Modifier.weight(1f))



        PrivateBrowsingButton(

            color = privateBrowsingButtonColor,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt

+2 −4
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { 


    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        // FIXME: Update A-S

        // SyncTelemetry.processOpenSyncSettingsMenuTelemetry()

        SyncTelemetry.processOpenSyncSettingsMenuTelemetry()

        SyncAccount.opened.record(NoExtras())



        accountManager = requireComponents.backgroundServices.accountManager
@@ -125,8 +124,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { 
                }

            }

        }

        // FIXME: Update A-S

        // SyncTelemetry.processSaveSyncSettingsTelemetry(enabledEngines, disabledEngines)

        SyncTelemetry.processSaveSyncSettingsTelemetry(enabledEngines, disabledEngines)

    }



    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {