Merge branch 'android-improve' into 'flidas'

More improved Android support

See merge request trisquel/package-helpers!212

helpers/DATA/firefox/android/branding/configure.sh

@@ -0,0 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_UPDATER=
+MOZ_ANDROID_ANR_REPORTER=
+MOZ_ANDROID_GCM_SENDERID=965234145045
+MOZ_MMA_GCM_SENDERID=242693410970
+ANDROID_PACKAGE_NAME=org.gnu.abrowser
+MOZ_APP_DISPLAYNAME="Abrowser"
+MOZ_ANDROID_SHARED_ID=org.gnu.abrowser.sharedID

helpers/DATA/firefox/android/branding/content/jar.mn

@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+  content/branding/about.png                     (about.png)
+  content/branding/favicon32.png                 (favicon32.png)
+  content/branding/favicon64.png                 (favicon64.png)

helpers/DATA/firefox/android/branding/content/moz.build

@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']

helpers/DATA/firefox/android/branding/locales/en-US/brand.dtd

@@ -0,0 +1,10 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY  brandShortName  "Abrowser">
+<!ENTITY  brandFullName   "Abrowser">
+
+<!ENTITY  brandPocket     "Pocket">
+
+<!ENTITY  vendorShortName "Trisquel">

helpers/DATA/firefox/android/branding/locales/en-US/brand.properties

@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShortName=Abrowser
+brandFullName=Abrowser

helpers/DATA/firefox/android/branding/locales/jar.mn

@@ -0,0 +1,11 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+  locale/branding/brand.properties (en-US/brand.properties)

helpers/DATA/firefox/android/branding/locales/moz.build

@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']

helpers/DATA/firefox/android/branding/moz.build

@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']

helpers/make-firefox

@@ -250,6 +250,52 @@ sed s/_temp_/AbrowserProfileMigrator/ -i browser/components/migration/moz.build
 # js settings
 cat $DATA/settings.js >> debian/vendor-abrowser.js
 
+#################
+# Android stuff #
+#################
+
+# Settings
+cat << EOF >> mobile/android/confvars.sh
+# Abrowser settings
+MOZ_APP_BASENAME=Abrowser
+MOZ_APP_VENDOR=Trisquel
+MOZ_PAY=0
+MOZ_SERVICES_HEALTHREPORT=0
+MOZ_SERVICES_HEALTHREPORTER=0
+MOZ_SERVICES_METRICS=0
+MOZ_DATA_REPORTING=0
+MOZ_DEVICES=0
+MOZ_ANDROID_GOOGLE_PLAY_SERVICES=0
+MOZ_TELEMETRY_REPORTING=0
+MOZ_ADDON_SIGNING=0
+EOF
+
+sed '/SENDERID/d' -i mobile/android/app/mobile.js
+
+# Fix locale
+cat << EOF >> mobile/locales/en-US/chrome/region.properties
+browser.search.defaultenginename=DuckDuckGo
+browser.search.order.1=DuckDuckGo
+browser.search.order.2=Google
+browser.search.order.3=Yahoo
+browser.suggestedsites.restricted_mozilla.url=https://www.trisquel.info
+browser.suggestedsites.webmaker.title=GNU Project
+browser.suggestedsites.webmaker.url=https://www.gnu.org
+EOF
+
+sed -i '/aboutPage.logoTrademark/d' \
+mobile/android/locales/en-US/chrome/about.dtd
+echo -e '\n<!ENTITY aboutPage.logoTrademark                "Abrowser and the Abrowser logos are trademarks of the Free Software Foundation.">' >> \
+mobile/android/locales/en-US/chrome/about.dtd
+
+# Branding
+rm mobile/android/branding/{official,unofficial,beta,nightly} -rf
+cp -a $DATA/android/branding/ mobile/android/branding/official
+cp $DATA/android/mobile.ico mobile/android/app/
+cp $DATA/android/images/* mobile/android/themes/core/images/
+cp -a $DATA/android/res/main/* mobile/android/app/src/main/res/
+cp -a $DATA/android/res/photon/* mobile/android/app/src/photon/res/
+
 # Postinst script to manage profile migration and system links
 echo '