Merge branch 'bug_40205_96.3.0' into 'tor-browser-96.3.0-11.5-1'
Resolve Bug 40205: Rebase Fenix patches to 96.3.0 See merge request !143
Branches tor-browser-96.3.0-11.5-1
Showing
- .gitlab-ci.yml 138 additions, 0 deletions.gitlab-ci.yml
- app/build.gradle 64 additions, 21 deletionsapp/build.gradle
- app/proguard-rules.pro 3 additions, 0 deletionsapp/proguard-rules.pro
- app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt 1 addition, 1 deletion.../org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
- app/src/beta/res/drawable/ic_launcher_foreground.xml 0 additions, 221 deletionsapp/src/beta/res/drawable/ic_launcher_foreground.xml
- app/src/beta/res/mipmap-hdpi/ic_launcher.png 0 additions, 0 deletionsapp/src/beta/res/mipmap-hdpi/ic_launcher.png
- app/src/beta/res/mipmap-mdpi/ic_launcher.png 0 additions, 0 deletionsapp/src/beta/res/mipmap-mdpi/ic_launcher.png
- app/src/beta/res/mipmap-xhdpi/ic_launcher.png 0 additions, 0 deletionsapp/src/beta/res/mipmap-xhdpi/ic_launcher.png
- app/src/beta/res/mipmap-xxhdpi/ic_launcher.png 0 additions, 0 deletionsapp/src/beta/res/mipmap-xxhdpi/ic_launcher.png
- app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png 0 additions, 0 deletionsapp/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
- app/src/beta/res/values/static_strings.xml 1 addition, 1 deletionapp/src/beta/res/values/static_strings.xml
- app/src/beta/res/xml/shortcuts.xml 2 additions, 2 deletionsapp/src/beta/res/xml/shortcuts.xml
- app/src/debug/res/drawable/ic_launcher_foreground.xml 0 additions, 83 deletionsapp/src/debug/res/drawable/ic_launcher_foreground.xml
- app/src/debug/res/xml/shortcuts.xml 2 additions, 2 deletionsapp/src/debug/res/xml/shortcuts.xml
- app/src/main/AndroidManifest.xml 10 additions, 5 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/assets/allowed_addons.json 3266 additions, 0 deletionsapp/src/main/assets/allowed_addons.json
- app/src/main/java/org/mozilla/fenix/FenixApplication.kt 26 additions, 0 deletionsapp/src/main/java/org/mozilla/fenix/FenixApplication.kt
- app/src/main/java/org/mozilla/fenix/HomeActivity.kt 66 additions, 2 deletionsapp/src/main/java/org/mozilla/fenix/HomeActivity.kt
- app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt 5 additions, 2 deletions...org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
- app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt 1 addition, 1 deletion...ain/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
Loading
-
mentioned in issue #40216 (moved)
-
mentioned in issue tor-browser#41186 (closed)
Please register or sign in to comment