Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

Enable Android Autofill support in all build types.

Browse Source
upstream-sync
Sebastian Kaspari 3 years ago committed by mergify[bot]
parent 4ac1089f4a
commit 846274b7cd
7 changed files with 22 additions and 100 deletions
Show Stats Download Patch File Download Diff File

1
app/build.gradle
Unescape Escape View File

@ -171,6 +171,7 @@ android {
}
beta {
java.srcDirs = ['src/migration/java']
manifest.srcFile "src/migration/AndroidManifest.xml"
}
release {
java.srcDirs = ['src/migration/java']

44
app/src/beta/AndroidManifest.xml
Unescape Escape View File

@ -1,44 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.mozilla.fenix"
android:sharedUserId="${sharedUserId}">
<application
android:name="org.mozilla.fenix.MigratingFenixApplication"
tools:replace="android:name">
<activity android:name=".autofill.AutofillUnlockActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name=".autofill.AutofillConfirmActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name=".autofill.AutofillSearchActivity"
android:exported="false"
android:theme="@style/DialogActivityTheme" />
<service
android:name=".autofill.AutofillService"
android:label="@string/app_name"
android:permission="android.permission.BIND_AUTOFILL_SERVICE">
<intent-filter>
<action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
<!-- Overriding the alias of the main manifest to route app launches through our
MigrationDecisionActivity which will show the migration screen before launching
into the app if needed. -->
<activity-alias
android:name="${applicationId}.App"
android:targetActivity="org.mozilla.fenix.MigrationDecisionActivity"
tools:replace="android:targetActivity" />
<activity
android:name="org.mozilla.fenix.MigrationDecisionActivity"
android:exported="false" />
<service android:name="org.mozilla.fenix.MigrationService" />
</application>
</manifest>

22
app/src/debug/AndroidManifest.xml
Unescape Escape View File

@ -19,28 +19,6 @@
<application
tools:replace="android:name"
android:name="org.mozilla.fenix.DebugFenixApplication">
<activity android:name=".autofill.AutofillUnlockActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name=".autofill.AutofillConfirmActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name=".autofill.AutofillSearchActivity"
android:exported="false"
android:theme="@style/DialogActivityTheme" />
<service
android:name=".autofill.AutofillService"
android:label="@string/app_name"
android:permission="android.permission.BIND_AUTOFILL_SERVICE">
<intent-filter>
<action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
</application>
</manifest>

21
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -245,6 +245,27 @@
<activity android:name=".settings.account.AuthIntentReceiverActivity"
android:exported="false" />
<activity android:name=".autofill.AutofillUnlockActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name=".autofill.AutofillConfirmActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name=".autofill.AutofillSearchActivity"
android:exported="false"
android:theme="@style/DialogActivityTheme" />
<service
android:name=".autofill.AutofillService"
android:label="@string/app_name"
android:permission="android.permission.BIND_AUTOFILL_SERVICE">
<intent-filter>
<action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
<service android:name=".media.MediaSessionService"
android:exported="false" />

8
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
Unescape Escape View File

@ -59,14 +59,6 @@ object FeatureFlags {
*/
val inactiveTabs = Config.channel.isNightlyOrDebug
/**
* Enables support for Android Autofill.
*
* In addition to toggling this flag, matching entries in the Android Manifest of the build
* type need to present.
*/
val androidAutofill = Config.channel.isNightlyOrDebug || Config.channel.isBeta
/**
* Enables showing the home screen behind the search dialog
*/

5
app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt
Unescape Escape View File

@ -25,7 +25,6 @@ import kotlinx.coroutines.launch
import mozilla.components.feature.autofill.preference.AutofillPreference
import mozilla.components.service.fxa.SyncEngine
import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components
@ -102,10 +101,6 @@ class SavedLoginsAuthFragment : PreferenceFragmentCompat() {
requirePreference<AutofillPreference>(R.string.pref_key_android_autofill).apply {
update()
if (!FeatureFlags.androidAutofill) {
isVisible = false
}
}
requirePreference<Preference>(R.string.pref_key_login_exceptions).apply {

21
app/src/nightly/AndroidManifest.xml
Unescape Escape View File

@ -4,27 +4,6 @@
<application>
<activity android:name=".autofill.AutofillUnlockActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name=".autofill.AutofillConfirmActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name=".autofill.AutofillSearchActivity"
android:exported="false" />
<service
android:name=".autofill.AutofillService"
android:label="@string/app_name"
android:permission="android.permission.BIND_AUTOFILL_SERVICE">
<intent-filter>
<action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
<service android:name=".customtabs.CustomTabsService">
<!-- Trusted Web Activities are currently only supported in nightly. -->
<intent-filter tools:node="removeAll" />

Write Preview
Loading…
Cancel
Save