fix #955

Author: akliuxingyuan

app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt

@@ -30,6 +30,7 @@ import mozilla.components.feature.tab.collections.TabCollection
 import mozilla.components.feature.tabs.WindowFeature
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import mozilla.components.support.ktx.android.util.dpToPx
 import mozilla.components.support.ktx.kotlin.isContentUrl
 import mozilla.telemetry.glean.private.NoExtras
 import org.mozilla.fenix.GleanMetrics.AddressToolbar
@@ -352,7 +353,11 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
         context: Context,
         isTablet: Boolean,
     ) {
-        addHomeAction(context = context)
+        if (context.settings().shouldShowHomeButton) {
+            addHomeAction(context = context)
+        } else {
+            (_browserToolbarView as? BrowserToolbarView)?.toolbar?.setPadding(8.dpToPx(resources.displayMetrics), 0, 0, 0)
+        }
         updateTabletToolbarActions(isTablet = isTablet)
         (browserToolbarView as? BrowserToolbarView)?.toolbar?.invalidateActions()
     }

app/src/main/java/org/mozilla/fenix/home/topsites/TopSites.kt

@@ -62,7 +62,7 @@ import org.mozilla.fenix.theme.FirefoxTheme
 import org.mozilla.fenix.wallpapers.WallpaperState
 import kotlin.math.ceil
 
-private const val TOP_SITES_PER_PAGE = 8
+private const val TOP_SITES_PER_PAGE = 20
 private const val TOP_SITES_PER_ROW = 4
 private const val TOP_SITES_ITEM_SIZE = 84
 private const val TOP_SITES_ROW_WIDTH = TOP_SITES_PER_ROW * TOP_SITES_ITEM_SIZE

app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesConfigCreator.kt

@@ -55,6 +55,7 @@ internal fun getTopSitesConfig(
                     }
                 },
             ),
+            showTopRecentSites = settings.showTopRecentSites
         )
     }
 }

automation/iceraven/install-sdk.sh

@@ -21,7 +21,7 @@ popd
 export ANDROID_SDK_ROOT=$HOME/android-sdk/android-sdk-linux
 
 # Install the weirdly missing NDK
-${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;27.2.12479018"
+${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;28.2.13676358"
 
 # Point the build at the tools
 echo "sdk.dir=${ANDROID_SDK_ROOT}" >> local.properties

gradle/mozconfig.gradle

@@ -11,10 +11,10 @@ gradle.ext.mozconfig.substs.MOZ_APP_VERSION = file("${projectRootDir}/version.tx
 gradle.ext.mozconfig.substs.MOZ_ANDROID_FAT_AAR_ARCHITECTURES = true
 gradle.ext.mozconfig.substs.MOZ_UPDATE_CHANNEL = 'release'
 gradle.ext.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES = true
-gradle.ext.mozconfig.substs.ANDROID_BUILD_TOOLS_VERSION = "35.0.0" // build/moz.configure/android-sdk.configure#L61
+gradle.ext.mozconfig.substs.ANDROID_BUILD_TOOLS_VERSION = "36.0.0" // build/moz.configure/android-sdk.configure#L140
 gradle.ext.mozconfig.topsrcdir = System.getProperty("user.dir")
 gradle.ext.mozconfig.topobjdir = System.getProperty("user.dir")
 
 gradle.ext.vcsHashFileContent = false
 
-gradle.startParameter.offline = false
+gradle.startParameter.offline = false