Backed out changeset 72a77da6a4d9 (bug 1883741) for causing android toolbar failures/bustages. CLOSED TREE

mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/BrowserToolbar.kt

@@ -349,13 +349,6 @@ class BrowserToolbar @JvmOverloads constructor(
         display.showMenuButton()
     }
 
-    /**
-     * Sets the horizontal padding in display mode.
-     */
-    override fun setDisplayHorizontalPadding(horizontalPadding: Int) {
-        display.setHorizontalPadding(horizontalPadding)
-    }
-
     /**
      * Hides the page action separator in display/edit mode.
      */

mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt

@@ -668,13 +668,6 @@ class DisplayToolbar internal constructor(
         views.menu.setShouldBeHidden(false)
     }
 
-    /**
-     * Sets the horizontal padding.
-     */
-    fun setHorizontalPadding(horizontalPadding: Int) {
-        rootView.setPadding(horizontalPadding, 0, horizontalPadding, 0)
-    }
-
     /**
      * Hides the page action separator in display mode.
      */

mobile/android/android-components/components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/BrowserToolbarTest.kt

@@ -596,21 +596,6 @@ class BrowserToolbarTest {
         verify(edit).hidePageActionSeparator()
     }
 
-    @Test
-    fun `WHEN setDisplayHorizontalPadding is sent to BrowserToolbar THEN it will be forwarded to the DisplayToolbar`() {
-        val toolbar = BrowserToolbar(testContext)
-
-        val display: DisplayToolbar = mock()
-        toolbar.display = display
-        toolbar.edit = mock()
-
-        toolbar.setDisplayHorizontalPadding(123)
-        verify(display).setHorizontalPadding(123)
-
-        toolbar.setDisplayHorizontalPadding(0)
-        verify(display).setHorizontalPadding(0)
-    }
-
     @Test
     fun `cast to view`() {
         // Given

mobile/android/android-components/components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt

@@ -183,11 +183,6 @@ interface Toolbar : ScrollableToolbar {
      */
     fun showMenuButton()
 
-    /**
-     * Sets the horizontal padding in display mode.
-     */
-    fun setDisplayHorizontalPadding(horizontalPadding: Int)
-
     /**
      * Hides the page action separator in display mode.
      */

mobile/android/android-components/docs/changelog.md

@@ -9,16 +9,13 @@ permalink: /changelog/
 * **feature-downloads**
   * Content intent of completed `DownloadNotification` now uses a `PendingIntent` which launches an `Activity` directly, see [Bug 1885167](https://bugzilla.mozilla.org/show_bug.cgi?id=1885167).
 
-* **concept-toolbar**
-  * Added the `setDisplayHorizontalPadding` method, allowing the caller to dynamically adjust the horizontal padding for the display toolbar.
-
 # 125.0
 * [Commits](https://github.com/mozilla-mobile/firefox-android/compare/releases_v124..releases_v125)
 * [Dependencies](https://github.com/mozilla-mobile/firefox-android/blob/releases_v125/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt)
 * [Gecko](https://github.com/mozilla-mobile/firefox-android/blob/releases_v125/android-components/plugins/dependencies/src/main/java/Gecko.kt)
 * [Configuration](https://github.com/mozilla-mobile/firefox-android/blob/releases_v125/android-components/.config.yml)
 
-* **concept-toolbar**:
+* **concept-toolabar**:
   * Added a new method for `ActionButton` to update the contentDescription and the iconTint, see [Bug 1875817](https://bugzilla.mozilla.org/show_bug.cgi?id=1875817).
 
 * **concept-engine**

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt

@@ -124,11 +124,6 @@ class DefaultToolbarIntegration(
 
         if (isNavBarEnabled) {
             toolbar.hideMenuButton()
-            toolbar.setDisplayHorizontalPadding(
-                context.resources.getDimensionPixelSize(
-                    R.dimen.browser_fragment_display_toolbar_padding,
-                ),
-            )
         } else {
             val tabCounterMenu = FenixTabCounterMenu(
                 context = context,

mobile/android/fenix/app/src/main/res/values/dimens.xml

@@ -90,8 +90,6 @@
     <dimen name="browser_fragment_toolbar_elevation">16dp</dimen>
     <!-- The download dialogs are shown above the toolbar so they need a bigger elevation. -->
     <dimen name="browser_fragment_download_dialog_elevation">17dp</dimen>
-    <!-- The size of padding for the display toolbar. -->
-    <dimen name="browser_fragment_display_toolbar_padding">8dp</dimen>
 
     <!-- Search Fragment -->
     <dimen name="search_fragment_clipboard_item_height">56dp</dimen>