diff --git a/Jenkinsfile b/Jenkinsfile index 7ebc9f440b7..08e993e8900 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,8 +16,8 @@ def matrix = [ 'target': 'arm-linux-androideabi', 'test': false, ], - 'ghostery-alpha':[ - 'bundleid': 'com.ghostery.android.alpha', + 'ghostery-canary':[ + 'bundleid': 'com.ghostery.android.canary', 'target': 'arm-linux-androideabi', 'test': false, ], diff --git a/Jenkinsfile.nightlyadhoc b/Jenkinsfile.nightlyadhoc index 8d0f5680df9..fe68c8d2aa5 100644 --- a/Jenkinsfile.nightlyadhoc +++ b/Jenkinsfile.nightlyadhoc @@ -1,17 +1,29 @@ #!/bin/env groovy @Library(['cliqz-shared-library@v1.2', 'browser-android@automation']) _ +final CLIQZ = 'cliqz' +final CLIQZ_ALPHA = 'cliqz-alpha' +final GHOSTERY = 'ghostery' +final GHOSTERY_CANARY = 'ghostery-canary' +final CERT_FILE_ID = 'd746a1dd-e075-4844-869a-32116a496352' +final CERT_PASS_ID = 'b7422020-fe1b-4c57-9230-f3d52afee3cf' +final CLIQZ_APIFILE_ID = '2939d2e1-dd9a-4097-adc2-430e3d67157a' +final GHOSTERY_APIFILE_ID = '81d5a4c2-c504-4d18-a29f-18421bb04ddc' properties([ - pipelineTriggers([cron(env.BRANCH_NAME == 'master' ? 'H 23 * * * ' : '')]), + pipelineTriggers([pollSCM(env.BRANCH_NAME == 'master' ? 'H 23 * * * ' : '')]), parameters([ booleanParam(name: 'CLIQZ_ARM', defaultValue: false, description: 'Builds the Cliqz branded `arm` build.'), booleanParam(name: 'CLIQZ_X86', defaultValue: false, description: 'Builds the Cliqz branded `x86` build.'), booleanParam(name: 'GHOSTERY_ARM', defaultValue: true, description: 'Builds the Ghostery branded `arm` build.'), - booleanParam(name: 'GHOSTERY_X86', defaultValue: true, description: 'Builds the Ghostery branded `x86` build.'), + booleanParam(name: 'GHOSTERY_X86', defaultValue: false, description: 'Builds the Ghostery branded `x86` build.'), booleanParam(name: 'CLIQZ_ALPHA_ARM', defaultValue: false, description: 'Builds the Cliqz-Alpha branded `arm` build.'), booleanParam(name: 'CLIQZ_ALPHA_X86', defaultValue: false, description: 'Builds the Cliqz-Alpha branded `x86` build.'), - booleanParam(name: 'GHOSTERY_ALPHA_ARM', defaultValue: true, description: 'Builds the Ghostery-Alpha branded `arm` build.'), - booleanParam(name: 'GHOSTERY_ALPHA_X86', defaultValue: false, description: 'Builds the Ghostery-Alpha branded `x86` build.') + booleanParam(name: 'GHOSTERY_CANARY_ARM', defaultValue: true, description: 'Builds the Ghostery-Alpha branded `arm` build.'), + booleanParam(name: 'GHOSTERY_CANARY_X86', defaultValue: true, description: 'Builds the Ghostery-Alpha branded `x86` build.'), + choice( name: 'BRAND', + choices: [ GHOSTERY_CANARY, GHOSTERY, CLIQZ_ALPHA, CLIQZ], + description: 'Pick a brand to publish to the playstore' + ) ]) ]) @@ -58,19 +70,19 @@ def matrix = [ 'target': 'i686-linux-android', 'buildParam': params.CLIQZ_ALPHA_X86, ], - 'Ghostery Alpha ARM':[ + 'Ghostery Canary ARM':[ 'arch': 'arm', - 'brand': 'ghostery-alpha', + 'brand': 'ghostery-canary', 'channel': 'MA52', 'target': 'arm-linux-androideabi', - 'buildParam': params.GHOSTERY_ALPHA_ARM, + 'buildParam': params.GHOSTERY_CANARY_ARM, ], - 'Ghostery Alpha X86':[ + 'Ghostery Canary X86':[ 'arch': 'x86', - 'brand': 'ghostery-alpha', + 'brand': 'ghostery-canary', 'channel': 'MA52', 'target': 'i686-linux-android', - 'buildParam': params.GHOSTERY_ALPHA_X86, + 'buildParam': params.GHOSTERY_CANARY_X86, ], ] def baseImage @@ -124,7 +136,7 @@ def build(Map m){ apk = cliqz.buildBrowser("${androidtarget}", "${brandname}", "nightly", "/app") } } - stage("Upload: ${flavorname}") { + stage("S3Upload: ${flavorname}") { withCredentials([ [ $class: 'UsernamePasswordMultiBinding', @@ -174,6 +186,58 @@ def stepsForParallelBuilds = helpers.entries(matrix).collectEntries{ stage('Build Applications'){ parallel stepsForParallelBuilds } +if (params.GHOSTERY_CANARY_ARM && params.GHOSTERY_CANARY_X86 == true){ + node ('kria'){ + baseImage.inside(){ + stage('Upload') { + final brand = params.BRAND + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'f1732e5f-3e84-47ad-9286-a5fa6657ec43', + passwordVariable: 'AWS_SECRET_ACCESS_KEY', + usernameVariable: 'AWS_ACCESS_KEY_ID', + ] + ]) { + utils.s3Copy( + "s3://repository.cliqz.com/dist/android/nightly/${BRANCH_NAME}/${brand}/latest.apk", + "mozilla-release/mobile/android/", + "arm", + "", + false + ) + utils.s3Copy( + "s3://repository.cliqz.com/dist/android/nightly/${BRANCH_NAME}/${brand}/latest_x86.apk", + "mozilla-release/mobile/android/", + "", + "x86", + false + ) + sh'mv mozilla-release/mobile/android/_x86.apk mozilla-release/mobile/android/x86.apk' + } + def apiFile + switch(brand) { + case CLIQZ: + case CLIQZ_ALPHA: + apiFile = CLIQZ_APIFILE_ID + break + case GHOSTERY: + case GHOSTERY_CANARY: + apiFile = GHOSTERY_APIFILE_ID + break + default: + error("Invalid Brand") + } + utils.fastlaneRelease( + brand, + CERT_FILE_ID, + CERT_PASS_ID, + apiFile + ) + } + } + } +} def transitionIssueList def passedBuilds @@ -193,7 +257,7 @@ stage('Send email') { Check console output at ${env.JOB_URL}${env.BUILD_NUMBER}/ to view the results. """ params.each { prop, val -> - if(prop != "BRANCH"){ + if(prop != "BRAND"){ if(val){ def splitText = prop.toString().toLowerCase().split("_") def brand = "" diff --git a/Jenkinsfile.upload b/Jenkinsfile.upload index 8f48e63a5c6..866e7300018 100644 --- a/Jenkinsfile.upload +++ b/Jenkinsfile.upload @@ -1,9 +1,20 @@ #!/bin/env groovy @Library(['cliqz-shared-library@v1.2', 'browser-android@automation']) _ +final CLIQZ = 'cliqz' +final CLIQZ_ALPHA = 'cliqz-alpha' +final GHOSTERY = 'ghostery' +final GHOSTERY_CANARY = 'ghostery-canary' +final CERT_FILE_ID = 'd746a1dd-e075-4844-869a-32116a496352' +final CERT_PASS_ID = 'b7422020-fe1b-4c57-9230-f3d52afee3cf' +final CLIQZ_APIFILE_ID = '2939d2e1-dd9a-4097-adc2-430e3d67157a' +final GHOSTERY_APIFILE_ID = '81d5a4c2-c504-4d18-a29f-18421bb04ddc' + properties([ parameters([ - booleanParam(name: 'CLIQZ', defaultValue: false, description: 'Builds and uploads the Cliqz brand to Play Store. If False, the Ghostery Brand.') + choice( name: 'BRAND', + choices: [ CLIQZ, CLIQZ_ALPHA, GHOSTERY, GHOSTERY_CANARY ], + description: 'Pick a brand to use' ) ]) ]) @@ -22,13 +33,13 @@ node('master') { baseImage.inside() { try { def apk = "" - def brand = (params.CLIQZ) ? "cliqz" : "ghostery" + final brand = params.BRAND stage('Build and Signs APKS') { cliqz.buildCliqzReactNative("cliqz") withCredentials([ - file(credentialsId: 'd746a1dd-e075-4844-869a-32116a496352', variable: 'CERT_PATH' ), - string(credentialsId: 'b7422020-fe1b-4c57-9230-f3d52afee3cf', variable: 'CERT_PASS') + file(credentialsId: CERT_FILE_ID, variable: 'CERT_PATH' ), + string(credentialsId: CERT_PASS_ID, variable: 'CERT_PASS') ]) { apk = cliqz.buildBrowser("i686-linux-android", "${brand}", "release") sh "cp build/${apk} mozilla-release/mobile/android/x86.apk" @@ -37,16 +48,25 @@ node('master') { } } stage('Upload') { - def storeCert = '81d5a4c2-c504-4d18-a29f-18421bb04ddc' - if (params.CLIQZ){ - storeCert = '2939d2e1-dd9a-4097-adc2-430e3d67157a' + def apiFile + switch(brand) { + case CLIQZ: + case CLIQZ_ALPHA: + apiFile = CLIQZ_APIFILE_ID + break + case GHOSTERY: + case GHOSTERY_CANARY: + apiFile = GHOSTERY_APIFILE_ID + break + default: + error("Invalid Brand") } archiveArtifacts allowEmptyArchive: true, artifacts: "build/*.apk" utils.fastlaneRelease( - "${brand}", - 'd746a1dd-e075-4844-869a-32116a496352', - 'b7422020-fe1b-4c57-9230-f3d52afee3cf', - storeCert + brand, + CERT_FILE_ID, + CERT_PASS_ID, + apiFile ) } } diff --git a/mozconfigs/deploy.mozconfig b/mozconfigs/deploy.mozconfig index 23e43c3c073..22947fa0491 100644 --- a/mozconfigs/deploy.mozconfig +++ b/mozconfigs/deploy.mozconfig @@ -14,7 +14,7 @@ ac_add_options --disable-debug ac_add_options --with-android-sdk=$ANDROID_HOME ac_add_options --with-android-ndk=$ANDROID_NDK -# Available Brands: 'cliqz', 'cliqz-alpha', 'ghostery' & 'ghostery-alpha' +# Available Brands: 'cliqz', 'cliqz-alpha', 'ghostery' & 'ghostery-canary' # Write build artifacts to: mk_add_options MOZ_OBJDIR=./objdir-frontend-android/$BRAND diff --git a/mozconfigs/ghostery-alpha.mozconfig b/mozconfigs/ghostery-canary.mozconfig similarity index 88% rename from mozconfigs/ghostery-alpha.mozconfig rename to mozconfigs/ghostery-canary.mozconfig index 568eb090f0a..53b8de0e9d7 100644 --- a/mozconfigs/ghostery-alpha.mozconfig +++ b/mozconfigs/ghostery-canary.mozconfig @@ -3,7 +3,7 @@ mk_add_options GIT=/usr/bin/git # Branding -ac_add_options --with-branding=mobile/android/branding/ghostery-alpha +ac_add_options --with-branding=mobile/android/branding/ghostery-canary # Build Firefox for Android Artifact Mode: @@ -17,7 +17,7 @@ ac_add_options --with-android-sdk=/home/jenkins/.mozbuild/android-sdk-linux # Write build artifacts to: -mk_add_options MOZ_OBJDIR=./objdir-frontend-android/ghostery-alpha +mk_add_options MOZ_OBJDIR=./objdir-frontend-android/ghostery-canary # l10n support ac_add_options --with-l10n-base="$topsrcdir/../l10n" diff --git a/mozconfigs/jenkins.mozconfig b/mozconfigs/jenkins.mozconfig index da083e4a215..6de3ad1490b 100644 --- a/mozconfigs/jenkins.mozconfig +++ b/mozconfigs/jenkins.mozconfig @@ -12,7 +12,7 @@ ac_add_options --with-android-sdk=$ANDROID_HOME # Allow artifact builds: ac_add_options --enable-artifact-builds -# Available Brands: 'cliqz', 'cliqz-alpha', 'ghostery' & 'ghostery-alpha' +# Available Brands: 'cliqz', 'cliqz-alpha', 'ghostery' & 'ghostery-canary' # Write build artifacts to: mk_add_options MOZ_OBJDIR=./objdir-frontend-android/$BRAND diff --git a/mozconfigs/spacifici.mozconfig b/mozconfigs/spacifici.mozconfig index 0f822e70096..d2faeea7662 100644 --- a/mozconfigs/spacifici.mozconfig +++ b/mozconfigs/spacifici.mozconfig @@ -8,7 +8,7 @@ fi # Branding if [ -z "${CLIQZ_BRANDING}" ] then - CLIQZ_BRANDING="ghostery-alpha" + CLIQZ_BRANDING="ghostery-canary" fi ac_add_options --with-branding="mobile/android/branding/${CLIQZ_BRANDING}" diff --git a/mozilla-release/mobile/android/app/src/main/res/values/colors.xml b/mozilla-release/mobile/android/app/src/main/res/values/colors.xml index 0dda6b9c7f4..ac81008392d 100644 --- a/mozilla-release/mobile/android/app/src/main/res/values/colors.xml +++ b/mozilla-release/mobile/android/app/src/main/res/values/colors.xml @@ -369,6 +369,9 @@ #97A4AE @color/url_bar_dark_blue_color + + + #FDC257 diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-hdpi/ic_launcher.png b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 6b0280e65f7..00000000000 Binary files a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-hdpi/large_icon.png b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-hdpi/large_icon.png deleted file mode 100644 index 0a7cc9d2bd9..00000000000 Binary files a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-hdpi/large_icon.png and /dev/null differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xhdpi/ic_launcher.png b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 7057def3127..00000000000 Binary files a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xhdpi/large_icon.png b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xhdpi/large_icon.png deleted file mode 100644 index 9e4b5185fb9..00000000000 Binary files a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xhdpi/large_icon.png and /dev/null differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxhdpi/ic_launcher.png b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 0a7cc9d2bd9..00000000000 Binary files a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxhdpi/large_icon.png b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxhdpi/large_icon.png deleted file mode 100644 index f700132cf4b..00000000000 Binary files a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxhdpi/large_icon.png and /dev/null differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxxhdpi/ic_launcher.png b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxxhdpi/ic_launcher.png deleted file mode 100644 index 9e4b5185fb9..00000000000 Binary files a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxxhdpi/large_icon.png b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxxhdpi/large_icon.png deleted file mode 100644 index 89ca6aa2634..00000000000 Binary files a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxxhdpi/large_icon.png and /dev/null differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/configure.sh b/mozilla-release/mobile/android/branding/ghostery-canary/configure.sh similarity index 85% rename from mozilla-release/mobile/android/branding/ghostery-alpha/configure.sh rename to mozilla-release/mobile/android/branding/ghostery-canary/configure.sh index f8948a0b4d6..10125da1517 100644 --- a/mozilla-release/mobile/android/branding/ghostery-alpha/configure.sh +++ b/mozilla-release/mobile/android/branding/ghostery-canary/configure.sh @@ -2,8 +2,8 @@ # 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/. -ANDROID_PACKAGE_NAME=com.ghostery.android.alpha -MOZ_APP_DISPLAYNAME="Ghostery Alpha" +ANDROID_PACKAGE_NAME=com.ghostery.android.canary +MOZ_APP_DISPLAYNAME="Ghostery Canary" MOZ_APP_VERSION="2.4.2" KEYSTORE_ALIAS="ghostery" MOZ_UPDATER= diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/content/about.png b/mozilla-release/mobile/android/branding/ghostery-canary/content/about.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/content/about.png rename to mozilla-release/mobile/android/branding/ghostery-canary/content/about.png diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/content/favicon32.png b/mozilla-release/mobile/android/branding/ghostery-canary/content/favicon32.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/content/favicon32.png rename to mozilla-release/mobile/android/branding/ghostery-canary/content/favicon32.png diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/content/favicon64.png b/mozilla-release/mobile/android/branding/ghostery-canary/content/favicon64.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/content/favicon64.png rename to mozilla-release/mobile/android/branding/ghostery-canary/content/favicon64.png diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/content/jar.mn b/mozilla-release/mobile/android/branding/ghostery-canary/content/jar.mn similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/content/jar.mn rename to mozilla-release/mobile/android/branding/ghostery-canary/content/jar.mn diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/content/moz.build b/mozilla-release/mobile/android/branding/ghostery-canary/content/moz.build similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/content/moz.build rename to mozilla-release/mobile/android/branding/ghostery-canary/content/moz.build diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/locales/en-US/appstrings.properties b/mozilla-release/mobile/android/branding/ghostery-canary/locales/en-US/appstrings.properties similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/locales/en-US/appstrings.properties rename to mozilla-release/mobile/android/branding/ghostery-canary/locales/en-US/appstrings.properties diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/locales/en-US/brand.dtd b/mozilla-release/mobile/android/branding/ghostery-canary/locales/en-US/brand.dtd similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/locales/en-US/brand.dtd rename to mozilla-release/mobile/android/branding/ghostery-canary/locales/en-US/brand.dtd diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/locales/en-US/brand.properties b/mozilla-release/mobile/android/branding/ghostery-canary/locales/en-US/brand.properties similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/locales/en-US/brand.properties rename to mozilla-release/mobile/android/branding/ghostery-canary/locales/en-US/brand.properties diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/locales/jar.mn b/mozilla-release/mobile/android/branding/ghostery-canary/locales/jar.mn similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/locales/jar.mn rename to mozilla-release/mobile/android/branding/ghostery-canary/locales/jar.mn diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/locales/moz.build b/mozilla-release/mobile/android/branding/ghostery-canary/locales/moz.build similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/locales/moz.build rename to mozilla-release/mobile/android/branding/ghostery-canary/locales/moz.build diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/moz.build b/mozilla-release/mobile/android/branding/ghostery-canary/moz.build similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/moz.build rename to mozilla-release/mobile/android/branding/ghostery-canary/moz.build diff --git a/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-hdpi/ic_launcher.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000000..d9e012bffe5 Binary files /dev/null and b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-hdpi/ic_launcher.png differ diff --git a/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-hdpi/large_icon.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-hdpi/large_icon.png new file mode 100644 index 00000000000..2810fa95a98 Binary files /dev/null and b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-hdpi/large_icon.png differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-hdpi/offrz_background_down.9.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-hdpi/offrz_background_down.9.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-hdpi/offrz_background_down.9.png rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-hdpi/offrz_background_down.9.png diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-mdpi/offrz_background_down.9.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-mdpi/offrz_background_down.9.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-mdpi/offrz_background_down.9.png rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-mdpi/offrz_background_down.9.png diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-nodpi/firstrun_welcome.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-nodpi/firstrun_welcome.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-nodpi/firstrun_welcome.png rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-nodpi/firstrun_welcome.png diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-v26/ic_launcher_foreground.xml b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-v26/ic_launcher_foreground.xml similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-v26/ic_launcher_foreground.xml rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-v26/ic_launcher_foreground.xml diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-v26/icon.xml b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-v26/icon.xml similarity index 71% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-v26/icon.xml rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-v26/icon.xml index e7160602087..80f8a24798a 100644 --- a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-v26/icon.xml +++ b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-v26/icon.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xhdpi/ic_launcher.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 00000000000..8a840589d43 Binary files /dev/null and b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xhdpi/ic_launcher.png differ diff --git a/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xhdpi/large_icon.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xhdpi/large_icon.png new file mode 100644 index 00000000000..241b3cc0657 Binary files /dev/null and b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xhdpi/large_icon.png differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xhdpi/offrz_background_down.9.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xhdpi/offrz_background_down.9.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xhdpi/offrz_background_down.9.png rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xhdpi/offrz_background_down.9.png diff --git a/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxhdpi/ic_launcher.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 00000000000..2810fa95a98 Binary files /dev/null and b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxhdpi/large_icon.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxhdpi/large_icon.png new file mode 100644 index 00000000000..286bcbcb8cf Binary files /dev/null and b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxhdpi/large_icon.png differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxhdpi/offrz_background_down.9.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxhdpi/offrz_background_down.9.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxhdpi/offrz_background_down.9.png rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxhdpi/offrz_background_down.9.png diff --git a/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxxhdpi/ic_launcher.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000000..241b3cc0657 Binary files /dev/null and b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxxhdpi/large_icon.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxxhdpi/large_icon.png new file mode 100644 index 00000000000..f78ddfb1962 Binary files /dev/null and b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxxhdpi/large_icon.png differ diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxxhdpi/offrz_background_down.9.png b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxxhdpi/offrz_background_down.9.png similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable-xxxhdpi/offrz_background_down.9.png rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable-xxxhdpi/offrz_background_down.9.png diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable/icon.xml b/mozilla-release/mobile/android/branding/ghostery-canary/res/drawable/icon.xml similarity index 100% rename from mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable/icon.xml rename to mozilla-release/mobile/android/branding/ghostery-canary/res/drawable/icon.xml diff --git a/mozilla-release/mobile/android/fastlane/Appfile.ghostery-canary b/mozilla-release/mobile/android/fastlane/Appfile.ghostery-canary new file mode 100644 index 00000000000..c5d1cb384e3 --- /dev/null +++ b/mozilla-release/mobile/android/fastlane/Appfile.ghostery-canary @@ -0,0 +1,2 @@ +json_key_file(ENV["PLAY_STORE_CERT"]) # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("com.ghostery.android.canary") # e.g. com.krausefx.app