From 58ffeb2905fb2ac809efb6c8084e8c4234158ed3 Mon Sep 17 00:00:00 2001 From: mike a Date: Mon, 13 Mar 2023 20:09:54 -0700 Subject: [PATCH] Bug 1815637 - cherry picking 548379d, the original rtl commit (cherry picked from commit 8fd38cae82759585482a1ae74be7f246ac092839) --- .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 3 ++- .../java/org/mozilla/fenix/collections/CollectionsDialog.kt | 5 +++-- .../fenix/components/toolbar/BrowserToolbarMenuController.kt | 3 ++- .../fenix/home/mozonline/PrivacyContentDisplayHelper.kt | 3 ++- .../fenix/home/sessioncontrol/SessionControlController.kt | 3 ++- .../org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt | 5 +++-- .../fenix/library/bookmarks/edit/EditBookmarkFragment.kt | 3 ++- .../org/mozilla/fenix/library/history/HistoryFragment.kt | 3 ++- .../library/historymetadata/HistoryMetadataGroupFragment.kt | 3 ++- .../java/org/mozilla/fenix/search/SearchDialogController.kt | 3 ++- .../java/org/mozilla/fenix/search/SearchDialogFragment.kt | 5 +++-- .../main/java/org/mozilla/fenix/settings/SettingsFragment.kt | 3 ++- .../mozilla/fenix/settings/about/AboutLibrariesFragment.kt | 2 ++ .../fenix/settings/account/AccountSettingsFragment.kt | 3 ++- .../mozilla/fenix/settings/account/DefaultSyncController.kt | 3 ++- .../mozilla/fenix/settings/address/view/AddressEditorView.kt | 3 ++- .../fenix/settings/autofill/AutofillSettingFragment.kt | 3 ++- .../fenix/settings/creditcards/CreditCardEditorFragment.kt | 3 ++- .../deletebrowsingdata/DeleteBrowsingDataFragment.kt | 3 ++- .../fenix/settings/logins/fragment/LoginDetailFragment.kt | 3 ++- .../settings/logins/fragment/SavedLoginsAuthFragment.kt | 3 ++- .../fenix/settings/quicksettings/ClearSiteDataView.kt | 3 ++- .../SitePermissionsDetailsExceptionsFragment.kt | 3 ++- .../sitepermissions/SitePermissionsExceptionsFragment.kt | 3 ++- .../SitePermissionsManageExceptionsPhoneFeatureFragment.kt | 3 ++- .../org/mozilla/fenix/settings/studies/StudiesAdapter.kt | 3 ++- .../java/org/mozilla/fenix/settings/studies/StudiesView.kt | 3 ++- .../java/org/mozilla/fenix/share/AddNewDeviceFragment.kt | 3 ++- app/src/main/res/layout/about_list_item.xml | 1 + app/src/main/res/layout/component_collection_creation.xml | 1 + .../layout/component_collection_creation_name_collection.xml | 2 ++ .../component_collection_creation_select_collection.xml | 2 ++ app/src/main/res/layout/component_downloads.xml | 1 + app/src/main/res/layout/component_history.xml | 1 + app/src/main/res/layout/component_history_metadata_group.xml | 1 + app/src/main/res/layout/fenix_snackbar.xml | 2 +- app/src/main/res/layout/fragment_add_ons_management.xml | 1 + app/src/main/res/layout/fragment_address_editor.xml | 2 ++ app/src/main/res/layout/fragment_credit_card_editor.xml | 2 ++ app/src/main/res/layout/fragment_pwa_onboarding.xml | 1 + app/src/main/res/layout/fragment_sign_out.xml | 1 + .../main/res/layout/fragment_site_permissions_exceptions.xml | 1 + app/src/main/res/layout/fragment_turn_on_sync.xml | 4 +++- app/src/main/res/layout/normal_browser_tray_list.xml | 2 +- app/src/main/res/layout/private_browser_tray_list.xml | 2 +- app/src/main/res/layout/start_download_dialog_layout.xml | 1 + app/src/main/res/values/styles.xml | 3 +++ 47 files changed, 86 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index 03f0c70d30..58dd8855fc 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -104,6 +104,7 @@ import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.ktx.kotlin.getOrigin import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged import mozilla.components.support.locale.ActivityContextWrapper +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.GleanMetrics.MediaState @@ -999,7 +1000,7 @@ abstract class BaseBrowserFragment : } create() - }.show().secure(activity) + }.show().withCenterAlignedButtons().secure(activity) context.settings().incrementSecureWarningCount() } diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionsDialog.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionsDialog.kt index 6b859c7690..683d45862d 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionsDialog.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionsDialog.kt @@ -15,6 +15,7 @@ import kotlinx.coroutines.launch import mozilla.components.browser.state.state.TabSessionState import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.support.ktx.android.view.showKeyboard +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.R import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.ext.getDefaultCollectionNumber @@ -79,7 +80,7 @@ fun CollectionsDialog.show( dialog.cancel() } - val dialog = builder.create() + val dialog = builder.create().withCenterAlignedButtons() val collectionNames = arrayOf(context.getString(R.string.tab_tray_add_new_collection)) + collections val collectionsListAdapter = CollectionsListAdapter(collectionNames) { @@ -126,7 +127,7 @@ internal fun CollectionsDialog.showAddNewDialog( onNegativeButtonClick.invoke() dialog.cancel() } - .create() + .create().withCenterAlignedButtons() .show() collectionNameEditText.setSelection(0, collectionNameEditText.text.length) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt index f343c7cd8e..de1cbf824e 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt @@ -29,6 +29,7 @@ import mozilla.components.feature.top.sites.PinnedSiteStorage import mozilla.components.feature.top.sites.TopSite import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.ViewBoundFeatureWrapper +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.GleanMetrics.AppMenu import org.mozilla.fenix.GleanMetrics.Collections import org.mozilla.fenix.GleanMetrics.Events @@ -266,7 +267,7 @@ class DefaultBrowserToolbarMenuController( setPositiveButton(R.string.top_sites_max_limit_confirmation_button) { dialog, _ -> dialog.dismiss() } - create() + create().withCenterAlignedButtons() }.show() } else { ioScope.launch { diff --git a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt index fa5cd45bb4..e22522e51a 100644 --- a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt +++ b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt @@ -12,6 +12,7 @@ import android.text.Spanned import android.text.method.LinkMovementMethod import android.widget.TextView import androidx.appcompat.app.AlertDialog +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.components.metrics.MetricServiceType @@ -79,7 +80,7 @@ fun showPrivacyPopWindow(context: Context, activity: Activity) { .setTitle(context.getString(R.string.privacy_notice_title)) .setMessage(messageSpannable) .setCancelable(false) - val alertDialog: AlertDialog = builder.create() + val alertDialog: AlertDialog = builder.create().withCenterAlignedButtons() alertDialog.show() alertDialog.findViewById(android.R.id.message)?.movementMethod = LinkMovementMethod.getInstance() } diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt index b27d1664ee..0cfecbeca6 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt @@ -28,6 +28,7 @@ import mozilla.components.feature.tabs.TabsUseCases import mozilla.components.feature.top.sites.TopSite import mozilla.components.service.nimbus.messaging.Message import mozilla.components.support.ktx.android.view.showKeyboard +import mozilla.components.ui.widgets.withCenterAlignedButtons import mozilla.telemetry.glean.private.NoExtras import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.GleanMetrics.Collections @@ -312,7 +313,7 @@ class DefaultSessionControlController( setNegativeButton(R.string.top_sites_rename_dialog_cancel) { dialog, _ -> dialog.cancel() } - }.show().also { + }.show().withCenterAlignedButtons().also { topSiteLabelEditText.setSelection(0, topSiteLabelEditText.text.length) topSiteLabelEditText.showKeyboard() } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 0d3d1e9c30..abc69cb14c 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -40,6 +40,7 @@ import mozilla.components.concept.storage.BookmarkNodeType import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.support.base.feature.UserInteractionHandler import mozilla.components.support.ktx.kotlin.toShortUrl +import mozilla.components.ui.widgets.withCenterAlignedButtons import mozilla.telemetry.glean.private.NoExtras import org.mozilla.fenix.GleanMetrics.BookmarksManagement import org.mozilla.fenix.HomeActivity @@ -313,7 +314,7 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan dialog.dismiss() } setCancelable(false) - create() + create().withCenterAlignedButtons() show() } } @@ -418,7 +419,7 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan operation = getDeleteOperation(BookmarkRemoveType.FOLDER), ) } - create() + create().withCenterAlignedButtons() } .show() } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt index 27a551f84f..b80b013eba 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt @@ -37,6 +37,7 @@ import mozilla.components.support.ktx.android.content.getColorFromAttr import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.ktx.android.view.showKeyboard import mozilla.components.support.ktx.kotlin.toShortUrl +import mozilla.components.ui.widgets.withCenterAlignedButtons import mozilla.telemetry.glean.private.NoExtras import org.mozilla.fenix.GleanMetrics.BookmarksManagement import org.mozilla.fenix.NavHostActivity @@ -246,7 +247,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark), MenuProv } dialog.dismiss() } - create() + create().withCenterAlignedButtons() }.show() } } diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index 006e39ef93..4221af6876 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -39,6 +39,7 @@ import mozilla.components.service.fxa.SyncEngine import mozilla.components.service.fxa.sync.SyncReason import mozilla.components.support.base.feature.UserInteractionHandler import mozilla.components.support.ktx.kotlin.toShortUrl +import mozilla.components.ui.widgets.withCenterAlignedButtons import mozilla.telemetry.glean.private.NoExtras import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.FeatureFlags @@ -438,7 +439,7 @@ class HistoryFragment : LibraryPageFragment(), UserInteractionHandler, } GleanHistory.removePromptOpened.record(NoExtras()) - }.create() + }.create().withCenterAlignedButtons() } @Suppress("UnusedPrivateMember") diff --git a/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt b/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt index 7433310a5f..7ba3a9cf13 100644 --- a/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt @@ -28,6 +28,7 @@ import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.lib.state.ext.flowScoped import mozilla.components.support.base.feature.UserInteractionHandler import mozilla.components.support.ktx.kotlin.toShortUrl +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.addons.showSnackBar @@ -282,7 +283,7 @@ class HistoryMetadataGroupFragment : interactor.onDeleteAllConfirmed() dialog.dismiss() } - .create() + .create().withCenterAlignedButtons() companion object { const val TAG = "DELETE_CONFIRMATION_DIALOG_FRAGMENT" diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt index f926d0df53..89018d3789 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt @@ -18,6 +18,7 @@ import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.engine.EngineSession.LoadUrlFlags import mozilla.components.feature.tabs.TabsUseCases import mozilla.components.support.ktx.kotlin.isUrl +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.SearchShortcuts @@ -318,7 +319,7 @@ class SearchDialogController( dialog.cancel() activity.startActivity(intent) } - create() + create().withCenterAlignedButtons() } } } diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index 50121620c6..7abb310db9 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -71,6 +71,7 @@ import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.ktx.kotlin.toNormalizedUrl import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged import mozilla.components.ui.autocomplete.InlineAutocompleteEditText +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.GleanMetrics.Awesomebar import org.mozilla.fenix.GleanMetrics.VoiceSearch @@ -694,7 +695,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { setPositiveButton(R.string.qr_scanner_dialog_invalid_ok) { dialog: DialogInterface, _ -> dialog.dismiss() } - create() + create().withCenterAlignedButtons() }.show() } } else { @@ -719,7 +720,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { ) dialog.dismiss() } - create() + create().withCenterAlignedButtons() }.show() } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt index 460aa6bc1d..3b33e295a8 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt @@ -38,6 +38,7 @@ import mozilla.components.concept.sync.OAuthAccount import mozilla.components.concept.sync.Profile import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.ktx.android.view.showKeyboard +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.Config import org.mozilla.fenix.FeatureFlags @@ -423,7 +424,7 @@ class SettingsFragment : PreferenceFragmentCompat() { binding.customAmoUser.setText(context.settings().overrideAmoUser) binding.customAmoUser.requestFocus() binding.customAmoUser.showKeyboard() - create() + create().withCenterAlignedButtons() }.show() null diff --git a/app/src/main/java/org/mozilla/fenix/settings/about/AboutLibrariesFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/about/AboutLibrariesFragment.kt index d9721705a7..98a3a11b91 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/about/AboutLibrariesFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/about/AboutLibrariesFragment.kt @@ -13,6 +13,7 @@ import android.widget.ListView import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.R import org.mozilla.fenix.databinding.FragmentAboutLibrariesBinding import org.mozilla.fenix.ext.showToolbar @@ -98,6 +99,7 @@ class AboutLibrariesFragment : Fragment(R.layout.fragment_about_libraries) { .setTitle(libraryItem.name) .setMessage(libraryItem.license) .create() + .withCenterAlignedButtons() dialog.show() val textView = dialog.findViewById(android.R.id.message)!! diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt index e90c04bffe..85106afcf5 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt @@ -35,6 +35,7 @@ import mozilla.components.service.fxa.sync.SyncStatusObserver import mozilla.components.service.fxa.sync.getLastSynced import mozilla.components.service.fxa.sync.setLastSynced import mozilla.components.support.ktx.android.content.getColorFromAttr +import mozilla.components.ui.widgets.withCenterAlignedButtons import mozilla.telemetry.glean.private.NoExtras import org.mozilla.fenix.Config import org.mozilla.fenix.FeatureFlags @@ -294,7 +295,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { ) startActivity(intent) } - create() + create().withCenterAlignedButtons() }.show().secure(activity) it.settings().incrementShowLoginsSecureWarningSyncCount() } diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/DefaultSyncController.kt b/app/src/main/java/org/mozilla/fenix/settings/account/DefaultSyncController.kt index b043733081..e7c4323f57 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/DefaultSyncController.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/DefaultSyncController.kt @@ -12,6 +12,7 @@ import android.provider.Settings import android.text.SpannableString import androidx.annotation.VisibleForTesting import androidx.appcompat.app.AlertDialog +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.settings.SupportUtils @@ -68,7 +69,7 @@ class DefaultSyncController( dialog.cancel() activity.startActivity(intent) } - create() + create().withCenterAlignedButtons() } } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/address/view/AddressEditorView.kt b/app/src/main/java/org/mozilla/fenix/settings/address/view/AddressEditorView.kt index 517e73f2d6..18858e0ceb 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/address/view/AddressEditorView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/address/view/AddressEditorView.kt @@ -16,6 +16,7 @@ import mozilla.components.concept.storage.Address import mozilla.components.concept.storage.UpdatableAddressFields import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.ktx.android.view.showKeyboard +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.GleanMetrics.Addresses import org.mozilla.fenix.R import org.mozilla.fenix.databinding.FragmentAddressEditorBinding @@ -120,7 +121,7 @@ class AddressEditorView( interactor.onDeleteAddress(guid) Addresses.deleted.add() } - create() + create().withCenterAlignedButtons() }.show() } diff --git a/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt index 839666f981..382f331626 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt @@ -26,6 +26,7 @@ import kotlinx.coroutines.launch import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.service.fxa.SyncEngine import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.NavGraphDirections import org.mozilla.fenix.R import org.mozilla.fenix.components.StoreProvider @@ -291,7 +292,7 @@ class AutofillSettingFragment : BiometricPromptPreferenceFragment() { startActivity(intent) } - create() + create().withCenterAlignedButtons() }.show().secure(activity) context.settings().incrementSecureWarningCount() } diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt index b71f5a6315..5e16987b8a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt @@ -22,6 +22,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.ktx.android.view.showKeyboard +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.R import org.mozilla.fenix.SecureFragment import org.mozilla.fenix.databinding.FragmentCreditCardEditorBinding @@ -155,7 +156,7 @@ class CreditCardEditorFragment : dialog.cancel() } setPositiveButton(R.string.credit_cards_delete_dialog_button, onPositiveClickListener) - create() + create().withCenterAlignedButtons() }.show() } diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt index d31ff2a636..6a578ef0ba 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt @@ -20,6 +20,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import mozilla.components.lib.state.ext.flowScoped +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.databinding.FragmentDeleteBrowsingDataBinding @@ -150,7 +151,7 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da it.dismiss() deleteSelected() } - create() + create().withCenterAlignedButtons() }.show() } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt index ad9994b8f8..ddfe391a18 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt @@ -23,6 +23,7 @@ import androidx.navigation.fragment.navArgs import com.google.android.material.snackbar.Snackbar import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.service.glean.private.NoExtras +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.GleanMetrics.Logins import org.mozilla.fenix.HomeActivity @@ -220,7 +221,7 @@ class LoginDetailFragment : SecureFragment(R.layout.fragment_login_detail), Menu interactor.onDeleteLogin(args.savedLoginId) dialog.dismiss() } - create() + create().withCenterAlignedButtons() }.show() } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt index 58acc1c73e..1dc5496a63 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt @@ -26,6 +26,7 @@ import mozilla.components.feature.autofill.preference.AutofillPreference import mozilla.components.service.fxa.SyncEngine import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.ViewBoundFeatureWrapper +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.GleanMetrics.Logins import org.mozilla.fenix.R import org.mozilla.fenix.components.accounts.FenixFxAEntryPoint @@ -215,7 +216,7 @@ class SavedLoginsAuthFragment : PreferenceFragmentCompat() { val intent = Intent(ACTION_SECURITY_SETTINGS) startActivity(intent) } - create() + create().withCenterAlignedButtons() }.show().secure(activity) context.settings().incrementSecureWarningCount() } diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ClearSiteDataView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ClearSiteDataView.kt index bd123de81d..7f9e3e7ff6 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ClearSiteDataView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ClearSiteDataView.kt @@ -18,6 +18,7 @@ import androidx.navigation.NavController import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.R import org.mozilla.fenix.databinding.QuicksettingsClearSiteDataBinding import org.mozilla.fenix.ext.components @@ -107,7 +108,7 @@ class ClearSiteDataView( it.dismiss() interactor.onClearSiteDataClicked(baseDomain) } - create() + create().withCenterAlignedButtons() }.show() } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt index 9b7dbc997d..addf2d85d2 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt @@ -19,6 +19,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import mozilla.components.concept.engine.permission.SitePermissions import mozilla.components.support.ktx.kotlin.stripDefaultPort +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.R import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.requireComponents @@ -145,7 +146,7 @@ class SitePermissionsDetailsExceptionsFragment : PreferenceFragmentCompat() { setNegativeButton(R.string.clear_permissions_negative) { dialog: DialogInterface, _ -> dialog.cancel() } - }.show() + }.show().withCenterAlignedButtons() true } diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt index 99388b9fe9..613f86e07d 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt @@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch import mozilla.components.concept.engine.permission.SitePermissions import mozilla.components.support.ktx.kotlin.stripDefaultPort +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.NavHostActivity import org.mozilla.fenix.R import org.mozilla.fenix.ext.components @@ -119,7 +120,7 @@ class SitePermissionsExceptionsFragment : setNegativeButton(R.string.clear_permissions_negative) { dialog: DialogInterface, _ -> dialog.cancel() } - }.show() + }.show().withCenterAlignedButtons() } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt index 739b7eb620..f7c35ecf94 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt @@ -26,6 +26,7 @@ import kotlinx.coroutines.launch import mozilla.components.concept.engine.permission.SitePermissions import mozilla.components.concept.engine.permission.SitePermissions.Status.ALLOWED import mozilla.components.concept.engine.permission.SitePermissions.Status.BLOCKED +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.R import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.settings @@ -162,7 +163,7 @@ class SitePermissionsManageExceptionsPhoneFeatureFragment : Fragment() { setNegativeButton(R.string.clear_permission_negative) { dialog: DialogInterface, _ -> dialog.cancel() } - }.show() + }.show().withCenterAlignedButtons() } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesAdapter.kt b/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesAdapter.kt index 39b87b0fd1..7a82c9a887 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesAdapter.kt @@ -19,6 +19,7 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import com.google.android.material.button.MaterialButton import mozilla.components.service.nimbus.messaging.MESSAGING_FEATURE_ID +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.experiments.nimbus.internal.EnrolledExperiment import org.mozilla.fenix.R import org.mozilla.fenix.settings.studies.CustomViewHolder.SectionViewHolder @@ -141,7 +142,7 @@ class StudiesAdapter( .setTitle(R.string.preference_experiments_2) .setMessage(R.string.studies_restart_app) .setCancelable(false) - val alertDialog: AlertDialog = builder.create() + val alertDialog: AlertDialog = builder.create().withCenterAlignedButtons() alertDialog.show() return alertDialog } diff --git a/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesView.kt b/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesView.kt index 077e618e85..f9ee948f80 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesView.kt @@ -22,6 +22,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import mozilla.components.service.nimbus.NimbusApi import mozilla.components.support.base.log.logger.Logger +import mozilla.components.ui.widgets.withCenterAlignedButtons import mozilla.telemetry.glean.private.NoExtras import org.mozilla.experiments.nimbus.internal.EnrolledExperiment import org.mozilla.fenix.GleanMetrics.Preferences @@ -82,7 +83,7 @@ class StudiesView( .setTitle(R.string.preference_experiments_2) .setMessage(R.string.studies_restart_app) .setCancelable(false) - val alertDialog: AlertDialog = builder.create() + val alertDialog: AlertDialog = builder.create().withCenterAlignedButtons() alertDialog.show() } bindDescription() diff --git a/app/src/main/java/org/mozilla/fenix/share/AddNewDeviceFragment.kt b/app/src/main/java/org/mozilla/fenix/share/AddNewDeviceFragment.kt index 1172ad883b..3c5150c322 100644 --- a/app/src/main/java/org/mozilla/fenix/share/AddNewDeviceFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/share/AddNewDeviceFragment.kt @@ -8,6 +8,7 @@ import android.os.Bundle import android.view.View import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment +import mozilla.components.ui.widgets.withCenterAlignedButtons import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R @@ -44,7 +45,7 @@ class AddNewDeviceFragment : Fragment(R.layout.fragment_add_new_device) { AlertDialog.Builder(requireContext()).apply { setMessage(R.string.sync_connect_device_dialog) setPositiveButton(R.string.sync_confirmation_button) { dialog, _ -> dialog.cancel() } - create() + create().withCenterAlignedButtons() }.show() } } diff --git a/app/src/main/res/layout/about_list_item.xml b/app/src/main/res/layout/about_list_item.xml index c27d7d3bb9..184d7c686e 100644 --- a/app/src/main/res/layout/about_list_item.xml +++ b/app/src/main/res/layout/about_list_item.xml @@ -17,6 +17,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:gravity="center" + android:textAlignment="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml index 438b6f5647..fafa997bf5 100644 --- a/app/src/main/res/layout/component_collection_creation.xml +++ b/app/src/main/res/layout/component_collection_creation.xml @@ -179,6 +179,7 @@ android:layout_height="wrap_content" android:background="?android:attr/selectableItemBackground" android:text="@string/create_collection_save" + android:textAlignment="center" android:textColor="?textActionPrimary" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/component_collection_creation_name_collection.xml b/app/src/main/res/layout/component_collection_creation_name_collection.xml index 443b8d2c5a..c734f6d4a7 100644 --- a/app/src/main/res/layout/component_collection_creation_name_collection.xml +++ b/app/src/main/res/layout/component_collection_creation_name_collection.xml @@ -36,6 +36,7 @@ android:alpha="0" android:background="?android:attr/selectableItemBackgroundBorderless" android:text="@string/create_collection_select_all" + android:textAlignment="center" android:textAllCaps="false" android:textColor="@color/fx_mobile_text_color_oncolor_primary" android:textSize="16sp" @@ -153,6 +154,7 @@ android:layout_height="wrap_content" android:background="?android:attr/selectableItemBackground" android:text="@string/create_collection_save" + android:textAlignment="center" android:textAppearance="@style/TextAppearance.MaterialComponents.Button" android:textColor="?textActionPrimary" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml index 74e08de7fc..fbd52d883b 100644 --- a/app/src/main/res/layout/component_collection_creation_select_collection.xml +++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml @@ -36,6 +36,7 @@ android:alpha="0" android:background="?android:attr/selectableItemBackgroundBorderless" android:text="@string/create_collection_select_all" + android:textAlignment="center" android:textAllCaps="false" android:textColor="@color/fx_mobile_text_color_oncolor_primary" android:textSize="16sp" @@ -158,6 +159,7 @@ android:alpha="0.0" android:background="?android:attr/selectableItemBackground" android:text="@string/create_collection_save" + android:textAlignment="center" android:textAppearance="@style/TextAppearance.MaterialComponents.Button" android:textColor="?textActionPrimary" android:visibility="gone" diff --git a/app/src/main/res/layout/component_downloads.xml b/app/src/main/res/layout/component_downloads.xml index 8a0e809d30..c8a802b447 100644 --- a/app/src/main/res/layout/component_downloads.xml +++ b/app/src/main/res/layout/component_downloads.xml @@ -26,6 +26,7 @@ android:layout_height="0dp" android:gravity="center" android:text="@string/download_empty_message_1" + android:textAlignment="center" android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone" diff --git a/app/src/main/res/layout/component_history.xml b/app/src/main/res/layout/component_history.xml index 30f8831b98..26ec213970 100644 --- a/app/src/main/res/layout/component_history.xml +++ b/app/src/main/res/layout/component_history.xml @@ -40,6 +40,7 @@ android:layout_height="0dp" android:gravity="center" android:text="@string/history_empty_message" + android:textAlignment="center" android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone" diff --git a/app/src/main/res/layout/component_history_metadata_group.xml b/app/src/main/res/layout/component_history_metadata_group.xml index 2bd63c648e..50526f7632 100644 --- a/app/src/main/res/layout/component_history_metadata_group.xml +++ b/app/src/main/res/layout/component_history_metadata_group.xml @@ -14,6 +14,7 @@ android:layout_height="0dp" android:gravity="center" android:text="@string/history_empty_message" + android:textAlignment="center" android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone" diff --git a/app/src/main/res/layout/fenix_snackbar.xml b/app/src/main/res/layout/fenix_snackbar.xml index c4757c35b2..9364f7bdce 100644 --- a/app/src/main/res/layout/fenix_snackbar.xml +++ b/app/src/main/res/layout/fenix_snackbar.xml @@ -51,7 +51,7 @@ android:minHeight="48dp" android:paddingTop="8dp" android:paddingBottom="8dp" - android:textAlignment="textEnd" + android:textAlignment="center" android:textAllCaps="true" android:textColor="@color/photonWhite" android:textSize="14sp" diff --git a/app/src/main/res/layout/fragment_add_ons_management.xml b/app/src/main/res/layout/fragment_add_ons_management.xml index 433d4f4d60..36a28f2330 100644 --- a/app/src/main/res/layout/fragment_add_ons_management.xml +++ b/app/src/main/res/layout/fragment_add_ons_management.xml @@ -29,6 +29,7 @@ android:layout_gravity="center" android:gravity="center" android:text="@string/no_add_ons" + android:textAlignment="center" android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="gone"/> diff --git a/app/src/main/res/layout/fragment_address_editor.xml b/app/src/main/res/layout/fragment_address_editor.xml index 7c16e56e93..82d559b65c 100644 --- a/app/src/main/res/layout/fragment_address_editor.xml +++ b/app/src/main/res/layout/fragment_address_editor.xml @@ -438,6 +438,7 @@ android:letterSpacing="0" android:padding="10dp" android:text="@string/addressess_delete_address_button" + android:textAlignment="center" android:textAllCaps="false" android:textColor="@color/fx_mobile_text_color_warning" android:visibility="gone" @@ -453,6 +454,7 @@ android:letterSpacing="0" android:padding="10dp" android:text="@string/addresses_cancel_button" + android:textAlignment="center" android:textAllCaps="false" android:textColor="?attr/textPrimary" android:textStyle="bold" diff --git a/app/src/main/res/layout/fragment_credit_card_editor.xml b/app/src/main/res/layout/fragment_credit_card_editor.xml index c5b94bb7be..76211b90b2 100644 --- a/app/src/main/res/layout/fragment_credit_card_editor.xml +++ b/app/src/main/res/layout/fragment_credit_card_editor.xml @@ -178,6 +178,7 @@ android:letterSpacing="0" android:padding="10dp" android:text="@string/credit_cards_delete_card_button" + android:textAlignment="center" android:textAllCaps="false" android:textColor="@color/fx_mobile_text_color_warning" android:visibility="gone" @@ -192,6 +193,7 @@ android:letterSpacing="0" android:padding="10dp" android:text="@string/credit_cards_cancel_button" + android:textAlignment="center" android:textAllCaps="false" android:textColor="?attr/textPrimary" android:textStyle="bold" diff --git a/app/src/main/res/layout/fragment_pwa_onboarding.xml b/app/src/main/res/layout/fragment_pwa_onboarding.xml index f10fde42f9..cbe2268a4b 100644 --- a/app/src/main/res/layout/fragment_pwa_onboarding.xml +++ b/app/src/main/res/layout/fragment_pwa_onboarding.xml @@ -84,6 +84,7 @@ android:layout_height="wrap_content" android:letterSpacing="0" android:text="@string/add_to_homescreen_continue" + android:textAlignment="center" android:textAllCaps="false" android:textColor="?attr/textPrimary" android:textSize="16sp" diff --git a/app/src/main/res/layout/fragment_sign_out.xml b/app/src/main/res/layout/fragment_sign_out.xml index c0cbe1de89..792e7162f3 100644 --- a/app/src/main/res/layout/fragment_sign_out.xml +++ b/app/src/main/res/layout/fragment_sign_out.xml @@ -32,6 +32,7 @@ android:padding="10dp" android:scrollbars="none" android:text="@string/sign_out_cancel" + android:textAlignment="center" android:textAllCaps="false" android:textColor="?attr/textPrimary" android:textStyle="bold" diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions.xml index 3c74d3c812..433ccaae3c 100644 --- a/app/src/main/res/layout/fragment_site_permissions_exceptions.xml +++ b/app/src/main/res/layout/fragment_site_permissions_exceptions.xml @@ -37,6 +37,7 @@ android:layout_height="0dp" android:gravity="center" android:text="@string/no_site_exceptions" + android:textAlignment="center" android:textColor="?attr/textPrimary" android:textSize="20sp" android:visibility="gone" diff --git a/app/src/main/res/layout/fragment_turn_on_sync.xml b/app/src/main/res/layout/fragment_turn_on_sync.xml index 90b4dc98a4..682cea71e2 100644 --- a/app/src/main/res/layout/fragment_turn_on_sync.xml +++ b/app/src/main/res/layout/fragment_turn_on_sync.xml @@ -21,6 +21,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="@string/sign_in_with_camera" + android:textAlignment="center" android:textAppearance="@style/Header16TextStyle" android:textColor="?attr/textPrimary" android:textSize="20sp" @@ -48,6 +49,7 @@ android:layout_marginTop="16dp" android:gravity="center" tools:text="@string/sign_in_instructions" + android:textAlignment="center" android:textColor="?attr/textPrimary" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" @@ -78,7 +80,7 @@ android:id="@+id/createAccount" android:layout_width="0dp" android:layout_height="wrap_content" - android:gravity="center" + android:textAlignment="center" android:textAppearance="@style/Body14TextStyle" app:layout_constraintTop_toBottomOf="@id/signInEmailButton" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/normal_browser_tray_list.xml b/app/src/main/res/layout/normal_browser_tray_list.xml index 5f24844455..a225e1768e 100644 --- a/app/src/main/res/layout/normal_browser_tray_list.xml +++ b/app/src/main/res/layout/normal_browser_tray_list.xml @@ -21,9 +21,9 @@ android:layout_height="match_parent" android:focusable="true" android:focusableInTouchMode="true" - android:gravity="center_horizontal" android:paddingTop="80dp" android:text="@string/no_open_tabs_description" + android:textAlignment="center" android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="visible" /> diff --git a/app/src/main/res/layout/private_browser_tray_list.xml b/app/src/main/res/layout/private_browser_tray_list.xml index b59252edf6..5ada3e7ca7 100644 --- a/app/src/main/res/layout/private_browser_tray_list.xml +++ b/app/src/main/res/layout/private_browser_tray_list.xml @@ -21,9 +21,9 @@ android:layout_height="match_parent" android:focusable="true" android:focusableInTouchMode="true" - android:gravity="center_horizontal" android:paddingTop="80dp" android:text="@string/no_open_tabs_description" + android:textAlignment="center" android:textColor="?attr/textSecondary" android:textSize="16sp" android:visibility="visible" /> diff --git a/app/src/main/res/layout/start_download_dialog_layout.xml b/app/src/main/res/layout/start_download_dialog_layout.xml index 8456ec9f69..0ac7400fd6 100644 --- a/app/src/main/res/layout/start_download_dialog_layout.xml +++ b/app/src/main/res/layout/start_download_dialog_layout.xml @@ -91,6 +91,7 @@ android:paddingStart="8dp" android:paddingEnd="8dp" android:text="@string/mozac_feature_downloads_dialog_download" + android:textAlignment="center" android:background="@drawable/download_dialog_download_button_background" android:textColor="?attr/textOnColorPrimary" android:textAllCaps="false" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 779f0761f6..0c4fe1bb35 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -16,6 +16,7 @@ @style/SearchViewStyle @style/AutoCompleteTextViewStyle + viewStart true @style/WindowAnimationTransition @style/progressBarStyleHorizontal @@ -217,6 +218,7 @@ @style/SearchViewStyle @style/AutoCompleteTextViewStyle + viewStart true @style/WindowAnimationTransition @style/progressBarStyleHorizontal @@ -598,6 +600,7 @@ wrap_content 40dp 32dp + center ?accentUsedOnDarkBackground @integer/font_weight_medium @integer/font_weight_medium