fenix 112.0

pull/600/head
akliuxingyuan 1 year ago
parent e95c430d11
commit e53d37a144

@ -1 +1 @@
Subproject commit 4074006ffff65ca6414d8d0ed77bc924966283c2
Subproject commit 557610ccc734506d89fab0e136fd2038913abb6c

@ -42,7 +42,7 @@ import org.mozilla.fenix.theme.defaultTypography
private fun CookieBannerReEngagementDialogComposePreview() {
FirefoxTheme {
CookieBannerReEngagementDialogCompose(
dialogTitle = "Allow Firefox to reject cookie banners?",
dialogTitle = "Allow Iceraven to reject cookie banners?",
dialogText =
"Automatically reject cookie requests, when possible. Otherwise, " +
"accept all cookies to dismiss cookie banners.",

@ -1569,7 +1569,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
*/
var showContileFeature by booleanPreference(
key = appContext.getPreferenceKey(R.string.pref_key_enable_contile),
default = true,
default = false,
)
/**

@ -117,9 +117,6 @@ object FenixDependencies {
const val protobuf_javalite = "com.google.protobuf:protobuf-javalite:${FenixVersions.protobuf}"
const val protobuf_compiler = "com.google.protobuf:protoc:${FenixVersions.protobuf}"
const val adjust = "com.adjust.sdk:adjust-android:${FenixVersions.adjust}"
const val installreferrer = "com.android.installreferrer:installreferrer:${FenixVersions.installreferrer}"
const val jna = "net.java.dev.jna:jna:${FenixVersions.jna}@jar"
const val junit = "junit:junit:${FenixVersions.junit}"
@ -156,12 +153,6 @@ object FenixDependencies {
const val uiautomator = "androidx.test.uiautomator:uiautomator:${FenixVersions.uiautomator}"
const val robolectric = "org.robolectric:robolectric:${FenixVersions.robolectric}"
const val google_ads_id = "com.google.android.gms:play-services-ads-identifier:${FenixVersions.google_ads_id_version}"
// Required for in-app reviews
const val google_play_review = "com.google.android.play:review:${FenixVersions.google_play_review_version}"
const val google_play_review_ktx = "com.google.android.play:review-ktx:${FenixVersions.google_play_review_version}"
const val detektApi = "io.gitlab.arturbosch.detekt:detekt-api:${FenixVersions.detekt}"
const val detektTest = "io.gitlab.arturbosch.detekt:detekt-test:${FenixVersions.detekt}"
const val junitApi = "org.junit.jupiter:junit-jupiter-api:${FenixVersions.junit}"

Loading…
Cancel
Save