From b35c0e3a73e9cc1efe06b69a9b0dee87d854395b Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Wed, 20 Nov 2013 15:16:00 +0100 Subject: [PATCH 1/3] Backed out changeset a829f4d2584a (bug 934646) Android Nightlies Build Bustage --HG-- rename : mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png => mobile/android/branding/aurora/content/fennec_144x144.png rename : mobile/android/branding/aurora/res/drawable-mdpi/icon.png => mobile/android/branding/aurora/content/fennec_48x48.png rename : mobile/android/branding/aurora/res/drawable-hdpi/icon.png => mobile/android/branding/aurora/content/fennec_72x72.png rename : mobile/android/branding/aurora/res/drawable-xhdpi/icon.png => mobile/android/branding/aurora/content/fennec_96x96.png rename : mobile/android/branding/beta/res/drawable-xxhdpi/icon.png => mobile/android/branding/beta/content/fennec_144x144.png rename : mobile/android/branding/beta/res/drawable-mdpi/icon.png => mobile/android/branding/beta/content/fennec_48x48.png rename : mobile/android/branding/beta/res/drawable-hdpi/icon.png => mobile/android/branding/beta/content/fennec_72x72.png rename : mobile/android/branding/beta/res/drawable-xhdpi/icon.png => mobile/android/branding/beta/content/fennec_96x96.png rename : mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png => mobile/android/branding/nightly/content/fennec_144x144.png rename : mobile/android/branding/nightly/res/drawable-mdpi/icon.png => mobile/android/branding/nightly/content/fennec_48x48.png rename : mobile/android/branding/nightly/res/drawable-hdpi/icon.png => mobile/android/branding/nightly/content/fennec_72x72.png rename : mobile/android/branding/nightly/res/drawable-xhdpi/icon.png => mobile/android/branding/nightly/content/fennec_96x96.png rename : mobile/android/branding/official/res/drawable-xxhdpi/icon.png => mobile/android/branding/official/content/fennec_144x144.png rename : mobile/android/branding/official/res/drawable-mdpi/icon.png => mobile/android/branding/official/content/fennec_48x48.png rename : mobile/android/branding/official/res/drawable-hdpi/icon.png => mobile/android/branding/official/content/fennec_72x72.png rename : mobile/android/branding/official/res/drawable-xhdpi/icon.png => mobile/android/branding/official/content/fennec_96x96.png rename : mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_144x144.png rename : mobile/android/branding/unofficial/res/drawable-mdpi/icon.png => mobile/android/branding/unofficial/content/fennec_48x48.png rename : mobile/android/branding/unofficial/res/drawable-hdpi/icon.png => mobile/android/branding/unofficial/content/fennec_72x72.png rename : mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_96x96.png --- build/mobile/robocop/moz.build | 4 + build/mobile/sutagent/android/fencp/moz.build | 8 + build/mobile/sutagent/android/ffxcp/moz.build | 8 + build/mobile/sutagent/android/moz.build | 10 + .../mobile/sutagent/android/watcher/moz.build | 11 + config/config.mk | 3 +- config/makefiles/java-build.mk | 32 +- js/src/config/config.mk | 3 +- js/src/config/makefiles/java-build.mk | 32 +- mobile/android/base/Makefile.in | 63 +- mobile/android/base/android-services.mozbuild | 23 + mobile/android/base/moz.build | 609 +++++++++++++++++- .../drawable-mdpi/crash_reporter.png | Bin .../layout/crash_reporter.xml | 0 .../icon.png => content/fennec_144x144.png} | Bin .../icon.png => content/fennec_48x48.png} | Bin .../icon.png => content/fennec_72x72.png} | Bin .../icon.png => content/fennec_96x96.png} | Bin .../icon.png => content/fennec_144x144.png} | Bin .../icon.png => content/fennec_48x48.png} | Bin .../icon.png => content/fennec_72x72.png} | Bin .../icon.png => content/fennec_96x96.png} | Bin .../icon.png => content/fennec_144x144.png} | Bin .../icon.png => content/fennec_48x48.png} | Bin .../icon.png => content/fennec_72x72.png} | Bin .../icon.png => content/fennec_96x96.png} | Bin .../icon.png => content/fennec_144x144.png} | Bin .../icon.png => content/fennec_48x48.png} | Bin .../icon.png => content/fennec_72x72.png} | Bin .../icon.png => content/fennec_96x96.png} | Bin .../icon.png => content/fennec_144x144.png} | Bin .../icon.png => content/fennec_48x48.png} | Bin .../icon.png => content/fennec_72x72.png} | Bin .../icon.png => content/fennec_96x96.png} | Bin .../junit3/android-services.mozbuild | 7 + python/mozbuild/mozbuild/frontend/emitter.py | 2 +- .../mozbuild/frontend/sandbox_symbols.py | 7 +- 37 files changed, 773 insertions(+), 49 deletions(-) rename mobile/android/base/{crashreporter/res => resources}/drawable-mdpi/crash_reporter.png (100%) rename mobile/android/base/{crashreporter/res => resources}/layout/crash_reporter.xml (100%) rename mobile/android/branding/aurora/{res/drawable-xxhdpi/icon.png => content/fennec_144x144.png} (100%) rename mobile/android/branding/aurora/{res/drawable-mdpi/icon.png => content/fennec_48x48.png} (100%) rename mobile/android/branding/aurora/{res/drawable-hdpi/icon.png => content/fennec_72x72.png} (100%) rename mobile/android/branding/aurora/{res/drawable-xhdpi/icon.png => content/fennec_96x96.png} (100%) rename mobile/android/branding/beta/{res/drawable-xxhdpi/icon.png => content/fennec_144x144.png} (100%) rename mobile/android/branding/beta/{res/drawable-mdpi/icon.png => content/fennec_48x48.png} (100%) rename mobile/android/branding/beta/{res/drawable-hdpi/icon.png => content/fennec_72x72.png} (100%) rename mobile/android/branding/beta/{res/drawable-xhdpi/icon.png => content/fennec_96x96.png} (100%) rename mobile/android/branding/nightly/{res/drawable-xxhdpi/icon.png => content/fennec_144x144.png} (100%) rename mobile/android/branding/nightly/{res/drawable-mdpi/icon.png => content/fennec_48x48.png} (100%) rename mobile/android/branding/nightly/{res/drawable-hdpi/icon.png => content/fennec_72x72.png} (100%) rename mobile/android/branding/nightly/{res/drawable-xhdpi/icon.png => content/fennec_96x96.png} (100%) rename mobile/android/branding/official/{res/drawable-xxhdpi/icon.png => content/fennec_144x144.png} (100%) rename mobile/android/branding/official/{res/drawable-mdpi/icon.png => content/fennec_48x48.png} (100%) rename mobile/android/branding/official/{res/drawable-hdpi/icon.png => content/fennec_72x72.png} (100%) rename mobile/android/branding/official/{res/drawable-xhdpi/icon.png => content/fennec_96x96.png} (100%) rename mobile/android/branding/unofficial/{res/drawable-xxhdpi/icon.png => content/fennec_144x144.png} (100%) rename mobile/android/branding/unofficial/{res/drawable-mdpi/icon.png => content/fennec_48x48.png} (100%) rename mobile/android/branding/unofficial/{res/drawable-hdpi/icon.png => content/fennec_72x72.png} (100%) rename mobile/android/branding/unofficial/{res/drawable-xhdpi/icon.png => content/fennec_96x96.png} (100%) diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build index c271ec3908ce..c9ab6ecd17d5 100644 --- a/build/mobile/robocop/moz.build +++ b/build/mobile/robocop/moz.build @@ -3,3 +3,7 @@ # 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/. + +ANDROID_RESFILES = [ + 'res/values/strings.xml', +] diff --git a/build/mobile/sutagent/android/fencp/moz.build b/build/mobile/sutagent/android/fencp/moz.build index c271ec3908ce..835e25a84c14 100644 --- a/build/mobile/sutagent/android/fencp/moz.build +++ b/build/mobile/sutagent/android/fencp/moz.build @@ -3,3 +3,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/. + +ANDROID_RESFILES = [ + 'res/drawable-hdpi/icon.png', + 'res/drawable-ldpi/icon.png', + 'res/drawable-mdpi/icon.png', + 'res/layout/main.xml', + 'res/values/strings.xml', +] diff --git a/build/mobile/sutagent/android/ffxcp/moz.build b/build/mobile/sutagent/android/ffxcp/moz.build index c271ec3908ce..835e25a84c14 100644 --- a/build/mobile/sutagent/android/ffxcp/moz.build +++ b/build/mobile/sutagent/android/ffxcp/moz.build @@ -3,3 +3,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/. + +ANDROID_RESFILES = [ + 'res/drawable-hdpi/icon.png', + 'res/drawable-ldpi/icon.png', + 'res/drawable-mdpi/icon.png', + 'res/layout/main.xml', + 'res/values/strings.xml', +] diff --git a/build/mobile/sutagent/android/moz.build b/build/mobile/sutagent/android/moz.build index c271ec3908ce..27426490f46d 100644 --- a/build/mobile/sutagent/android/moz.build +++ b/build/mobile/sutagent/android/moz.build @@ -3,3 +3,13 @@ # 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/. + +ANDROID_RESFILES = [ + 'res/drawable/ateamlogo.png', + 'res/drawable/ic_stat_first.png', + 'res/drawable/ic_stat_neterror.png', + 'res/drawable/ic_stat_warning.png', + 'res/drawable/icon.png', + 'res/layout/main.xml', + 'res/values/strings.xml', +] diff --git a/build/mobile/sutagent/android/watcher/moz.build b/build/mobile/sutagent/android/watcher/moz.build index c271ec3908ce..1794b48751c7 100644 --- a/build/mobile/sutagent/android/watcher/moz.build +++ b/build/mobile/sutagent/android/watcher/moz.build @@ -3,3 +3,14 @@ # 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/. + +ANDROID_RESFILES = [ + 'res/drawable-hdpi/ateamlogo.png', + 'res/drawable-hdpi/icon.png', + 'res/drawable-ldpi/ateamlogo.png', + 'res/drawable-ldpi/icon.png', + 'res/drawable-mdpi/ateamlogo.png', + 'res/drawable-mdpi/icon.png', + 'res/layout/main.xml', + 'res/values/strings.xml', +] diff --git a/config/config.mk b/config/config.mk index 645bf6c47fdb..2f03e336e255 100644 --- a/config/config.mk +++ b/config/config.mk @@ -35,7 +35,7 @@ endif # responsibility between Makefile.in and mozbuild files. _MOZBUILD_EXTERNAL_VARIABLES := \ ANDROID_GENERATED_RESFILES \ - ANDROID_RES_DIRS \ + ANDROID_RESFILES \ CMSRCS \ CMMSRCS \ CPP_UNIT_TESTS \ @@ -73,7 +73,6 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ $(NULL) _DEPRECATED_VARIABLES := \ - ANDROID_RESFILES \ MOCHITEST_FILES_PARTS \ MOCHITEST_BROWSER_FILES_PARTS \ SHORT_LIBNAME \ diff --git a/config/makefiles/java-build.mk b/config/makefiles/java-build.mk index b3f34ab1d033..179063b8fd5d 100644 --- a/config/makefiles/java-build.mk +++ b/config/makefiles/java-build.mk @@ -7,6 +7,29 @@ ifndef INCLUDED_JAVA_BUILD_MK #{ +ifdef ANDROID_RESFILES #{ +ifndef IGNORE_ANDROID_RESFILES #{ +res-dep := .deps-copy-java-res + +GENERATED_DIRS += res +GARBAGE += $(res-dep) + +export:: $(res-dep) + +res-dep-preqs := \ + $(addprefix $(srcdir)/,$(ANDROID_RESFILES)) \ + $(call mkdir_deps,res) \ + $(if $(IS_LANGUAGE_REPACK),FORCE) \ + $(NULL) + +# nop-build: only copy res/ files when needed +$(res-dep): $(res-dep-preqs) + $(call copy_dir,$(srcdir)/res,$(CURDIR)/res) + @$(TOUCH) $@ +endif #} IGNORE_ANDROID_RESFILES +endif #} ANDROID_RESFILES + + ifdef JAVAFILES #{ GENERATED_DIRS += classes @@ -16,8 +39,7 @@ endif #} JAVAFILES ifdef ANDROID_APK_NAME #{ -android_res_dirs := $(addprefix $(srcdir)/,$(or $(ANDROID_RES_DIRS),res)) -_ANDROID_RES_FLAG := $(addprefix -S ,$(android_res_dirs)) +_ANDROID_RES_FLAG := -S $(or $(ANDROID_RES_DIR),res) _ANDROID_ASSETS_FLAG := $(addprefix -A ,$(ANDROID_ASSETS_DIR)) GENERATED_DIRS += classes @@ -35,11 +57,7 @@ classes.dex: $(JAVAFILES) R.java: .aapt.deps $(ANDROID_APK_NAME).ap_: .aapt.deps -# This uses the fact that Android resource directories list all -# resource files one subdirectory below the parent resource directory. -android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(android_res_dirs))))) - -.aapt.deps: AndroidManifest.xml $(android_res_files) $(wildcard $(ANDROID_ASSETS_DIR)) +.aapt.deps: AndroidManifest.xml $(wildcard $(ANDROID_RES_DIR)) $(wildcard $(ANDROID_ASSETS_DIR)) $(AAPT) package -f -M $< -I $(ANDROID_SDK)/android.jar $(_ANDROID_RES_FLAG) $(_ANDROID_ASSETS_FLAG) \ -J ${@D} \ -F $(ANDROID_APK_NAME).ap_ diff --git a/js/src/config/config.mk b/js/src/config/config.mk index 645bf6c47fdb..2f03e336e255 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -35,7 +35,7 @@ endif # responsibility between Makefile.in and mozbuild files. _MOZBUILD_EXTERNAL_VARIABLES := \ ANDROID_GENERATED_RESFILES \ - ANDROID_RES_DIRS \ + ANDROID_RESFILES \ CMSRCS \ CMMSRCS \ CPP_UNIT_TESTS \ @@ -73,7 +73,6 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ $(NULL) _DEPRECATED_VARIABLES := \ - ANDROID_RESFILES \ MOCHITEST_FILES_PARTS \ MOCHITEST_BROWSER_FILES_PARTS \ SHORT_LIBNAME \ diff --git a/js/src/config/makefiles/java-build.mk b/js/src/config/makefiles/java-build.mk index b3f34ab1d033..179063b8fd5d 100644 --- a/js/src/config/makefiles/java-build.mk +++ b/js/src/config/makefiles/java-build.mk @@ -7,6 +7,29 @@ ifndef INCLUDED_JAVA_BUILD_MK #{ +ifdef ANDROID_RESFILES #{ +ifndef IGNORE_ANDROID_RESFILES #{ +res-dep := .deps-copy-java-res + +GENERATED_DIRS += res +GARBAGE += $(res-dep) + +export:: $(res-dep) + +res-dep-preqs := \ + $(addprefix $(srcdir)/,$(ANDROID_RESFILES)) \ + $(call mkdir_deps,res) \ + $(if $(IS_LANGUAGE_REPACK),FORCE) \ + $(NULL) + +# nop-build: only copy res/ files when needed +$(res-dep): $(res-dep-preqs) + $(call copy_dir,$(srcdir)/res,$(CURDIR)/res) + @$(TOUCH) $@ +endif #} IGNORE_ANDROID_RESFILES +endif #} ANDROID_RESFILES + + ifdef JAVAFILES #{ GENERATED_DIRS += classes @@ -16,8 +39,7 @@ endif #} JAVAFILES ifdef ANDROID_APK_NAME #{ -android_res_dirs := $(addprefix $(srcdir)/,$(or $(ANDROID_RES_DIRS),res)) -_ANDROID_RES_FLAG := $(addprefix -S ,$(android_res_dirs)) +_ANDROID_RES_FLAG := -S $(or $(ANDROID_RES_DIR),res) _ANDROID_ASSETS_FLAG := $(addprefix -A ,$(ANDROID_ASSETS_DIR)) GENERATED_DIRS += classes @@ -35,11 +57,7 @@ classes.dex: $(JAVAFILES) R.java: .aapt.deps $(ANDROID_APK_NAME).ap_: .aapt.deps -# This uses the fact that Android resource directories list all -# resource files one subdirectory below the parent resource directory. -android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(android_res_dirs))))) - -.aapt.deps: AndroidManifest.xml $(android_res_files) $(wildcard $(ANDROID_ASSETS_DIR)) +.aapt.deps: AndroidManifest.xml $(wildcard $(ANDROID_RES_DIR)) $(wildcard $(ANDROID_ASSETS_DIR)) $(AAPT) package -f -M $< -I $(ANDROID_SDK)/android.jar $(_ANDROID_RES_FLAG) $(_ANDROID_ASSETS_FLAG) \ -J ${@D} \ -F $(ANDROID_APK_NAME).ap_ diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 1ee45d8915f4..392e4005cdb4 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -91,6 +91,17 @@ GARBAGE += \ GARBAGE_DIRS += classes db jars res sync services generated +# Bug 567884 - Need a way to find appropriate icons during packaging +ifeq ($(MOZ_APP_NAME),fennec) +ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_48x48.png +ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_72x72.png +ICON_PATH_XHDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_96x96.png +ICON_PATH_XXHDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_144x144.png +else +ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon48.png +ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon64.png +endif + JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar ALL_JARS = \ @@ -181,16 +192,34 @@ preprocessed_package_KEEP_PATH := 1 PP_TARGETS += preprocessed_package -# This uses the fact that Android resource directories list all -# resource files one subdirectory below the parent resource directory. -android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(ANDROID_RES_DIRS))))) +res/drawable-mdpi/icon.png: $(ICON_PATH) + $(NSINSTALL) -D res/drawable-mdpi + cp $(ICON_PATH) $@ -$(ANDROID_GENERATED_RESFILES): $(call mkdir_deps,$(sort $(dir $(ANDROID_GENERATED_RESFILES)))) +res/drawable-hdpi/icon.png: $(ICON_PATH_HDPI) + $(NSINSTALL) -D res/drawable-hdpi + cp $(ICON_PATH_HDPI) $@ -# We don't have correct dependencies for strings.xml at this point, so -# we always recursively invoke the submake to check the dependencies. -# Sigh. -res/values/strings.xml: FORCE +res/drawable-xhdpi/icon.png: $(ICON_PATH_XHDPI) + $(NSINSTALL) -D res/drawable-xhdpi + cp $(ICON_PATH_XHDPI) $@ + +res/drawable-xxhdpi/icon.png: $(ICON_PATH_XXHDPI) + $(NSINSTALL) -D res/drawable-xxhdpi + cp $(ICON_PATH_XXHDPI) $@ + +ANDROID_RESDIRS := $(subst resources/,res/,$(sort $(dir $(ANDROID_RESFILES)))) + +$(call mkdir_deps,$(ANDROID_RESDIRS)): $(ANDROID_RESFILES) Makefile + $(RM) -r $(@D) + $(NSINSTALL) -D $(@D) + $(TOUCH) $@ + +$(subst resources/,res/,$(ANDROID_RESFILES)): $(call mkdir_deps,$(ANDROID_RESDIRS)) $(ANDROID_RESFILES) + @echo "creating $@" + $(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@) + +res/values/strings.xml: $(call mkdir_deps,res/values) $(MAKE) -C locales # With multilocale builds, there will be multiple strings.xml files. We need to @@ -199,22 +228,18 @@ MULTILOCALE_STRINGS_XML_FILES := $(wildcard res/values-*/strings.xml) all_resources = \ $(MULTILOCALE_STRINGS_XML_FILES) \ AndroidManifest.xml \ - $(android_res_files) \ + $(subst resources/,res/,$(ANDROID_RESFILES)) \ $(ANDROID_GENERATED_RESFILES) \ $(NULL) -$(gecko_package_dir)/R.txt: .aapt.deps +# generated/org/mozilla/gecko/R.java and gecko.ap_ are both produced +# by aapt; this saves an aapt invocation. + $(gecko_package_dir)/R.java: .aapt.deps gecko.ap_: .aapt.deps -# All of generated/org/mozilla/gecko/R.java, R.txt, and gecko.ap_ are -# produced by aapt; this saves aapt invocations. .aapt.deps: $(all_resources) - $(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar \ - --auto-add-overlay \ - $(addprefix -S ,$(ANDROID_RES_DIRS)) \ - --custom-package org.mozilla.gecko --non-constant-id \ - --output-text-symbols $(gecko_package_dir) \ + $(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res --custom-package org.mozilla.gecko --non-constant-id \ -J $(gecko_package_dir)/ \ -F gecko.ap_ @$(TOUCH) $@ @@ -222,6 +247,10 @@ gecko.ap_: .aapt.deps fennec_ids.txt: $(gecko_package_dir)/R.java fennec-ids-generator.py $(PYTHON) $(topsrcdir)/mobile/android/base/fennec-ids-generator.py -i $< -o $@ +# We process ANDROID_RESFILES specially for now; the following flag +# disables the default processing. +IGNORE_ANDROID_RESFILES=1 + include $(topsrcdir)/config/rules.mk # Override the Java settings with some specific android settings diff --git a/mobile/android/base/android-services.mozbuild b/mobile/android/base/android-services.mozbuild index 91ecd0389e05..bc575a8a8c3f 100644 --- a/mobile/android/base/android-services.mozbuild +++ b/mobile/android/base/android-services.mozbuild @@ -4,6 +4,29 @@ # 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_RESFILES += [ + 'resources/drawable-mdpi/sync_desktop.png', + 'resources/drawable-mdpi/sync_mobile.png', + 'resources/drawable/sync_pin_background.xml', + 'resources/layout/sync_account.xml', + 'resources/layout/sync_list_item.xml', + 'resources/layout/sync_redirect_to_setup.xml', + 'resources/layout/sync_send_tab.xml', + 'resources/layout/sync_setup.xml', + 'resources/layout/sync_setup_failure.xml', + 'resources/layout/sync_setup_jpake_waiting.xml', + 'resources/layout/sync_setup_nointernet.xml', + 'resources/layout/sync_setup_pair.xml', + 'resources/layout/sync_setup_success.xml', + 'resources/layout/sync_setup_webview.xml', + 'resources/values-large-v11/sync_styles.xml', + 'resources/values-v11/sync_styles.xml', + 'resources/values/sync_styles.xml', + 'resources/xml/sync_authenticator.xml', + 'resources/xml/sync_options.xml', + 'resources/xml/sync_syncadapter.xml', +] + sync_thirdparty_java_files = [ 'ch/boye/httpclientandroidlib/androidextra/HttpClientAndroidLog.java', 'ch/boye/httpclientandroidlib/annotation/GuardedBy.java', diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index d0378415d270..16d0f461d1e3 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -342,9 +342,7 @@ gbjar.generated_sources += [ 'org/mozilla/gecko/widget/GeckoTextView.java', ] if CONFIG['MOZ_CRASHREPORTER']: - gbjar.sources += [ 'CrashReporter.java' ] - ANDROID_RES_DIRS += [ SRCDIR + '/crashreporter/res' ] - + gbjar.sources += [ 'CrashReporter.java '] gbjar.sources += sync_java_files gbjar.generated_sources += sync_generated_java_files gbjar.extra_jars = [ @@ -355,12 +353,605 @@ gbjar.extra_jars = [ ] gbjar.javac_flags += ['-Xlint:all,-deprecation,-fallthrough'] -ANDROID_RES_DIRS += [ - SRCDIR + '/resources', - TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res', - OBJDIR + '/res', -] - ANDROID_GENERATED_RESFILES += [ + 'res/drawable-hdpi/icon.png', + 'res/drawable-mdpi/icon.png', + 'res/drawable-xhdpi/icon.png', + 'res/drawable-xxhdpi/icon.png', 'res/values/strings.xml', ] + +ANDROID_RESFILES += [ + 'resources/anim/grow_fade_in.xml', + 'resources/anim/grow_fade_in_center.xml', + 'resources/anim/popup_hide.xml', + 'resources/anim/popup_show.xml', + 'resources/anim/progress_spinner.xml', + 'resources/anim/shrink_fade_out.xml', + 'resources/color/primary_text.xml', + 'resources/color/primary_text_inverse.xml', + 'resources/color/secondary_text.xml', + 'resources/color/secondary_text_inverse.xml', + 'resources/color/select_item_multichoice.xml', + 'resources/color/tertiary_text.xml', + 'resources/color/tertiary_text_inverse.xml', + 'resources/color/top_sites_grid_item_title.xml', + 'resources/color/url_bar_title.xml', + 'resources/color/url_bar_title_hint.xml', + 'resources/drawable-hdpi-v11/alert_addon.png', + 'resources/drawable-hdpi-v11/alert_app.png', + 'resources/drawable-hdpi-v11/alert_camera.png', + 'resources/drawable-hdpi-v11/alert_download.png', + 'resources/drawable-hdpi-v11/alert_mic.png', + 'resources/drawable-hdpi-v11/alert_mic_camera.png', + 'resources/drawable-hdpi-v11/firefox_settings_alert.png', + 'resources/drawable-hdpi-v11/ic_menu_addons.png', + 'resources/drawable-hdpi-v11/ic_menu_apps.png', + 'resources/drawable-hdpi-v11/ic_menu_back.png', + 'resources/drawable-hdpi-v11/ic_menu_bookmark_add.png', + 'resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png', + 'resources/drawable-hdpi-v11/ic_menu_desktop_mode_off.png', + 'resources/drawable-hdpi-v11/ic_menu_desktop_mode_on.png', + 'resources/drawable-hdpi-v11/ic_menu_downloads.png', + 'resources/drawable-hdpi-v11/ic_menu_find_in_page.png', + 'resources/drawable-hdpi-v11/ic_menu_forward.png', + 'resources/drawable-hdpi-v11/ic_menu_new_private_tab.png', + 'resources/drawable-hdpi-v11/ic_menu_new_tab.png', + 'resources/drawable-hdpi-v11/ic_menu_quit.png', + 'resources/drawable-hdpi-v11/ic_menu_reload.png', + 'resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png', + 'resources/drawable-hdpi-v11/ic_menu_settings.png', + 'resources/drawable-hdpi-v11/ic_menu_share.png', + 'resources/drawable-hdpi-v11/ic_menu_tools.png', + 'resources/drawable-hdpi-v11/ic_status_logo.png', + 'resources/drawable-hdpi/abouthome_thumbnail.png', + 'resources/drawable-hdpi/alert_addon.png', + 'resources/drawable-hdpi/alert_app.png', + 'resources/drawable-hdpi/alert_camera.png', + 'resources/drawable-hdpi/alert_download.png', + 'resources/drawable-hdpi/alert_mic.png', + 'resources/drawable-hdpi/alert_mic_camera.png', + 'resources/drawable-hdpi/arrow_popup_bg.9.png', + 'resources/drawable-hdpi/blank.png', + 'resources/drawable-hdpi/bookmark_folder_closed.png', + 'resources/drawable-hdpi/bookmark_folder_opened.png', + 'resources/drawable-hdpi/close.png', + 'resources/drawable-hdpi/favicon.png', + 'resources/drawable-hdpi/find_close.png', + 'resources/drawable-hdpi/find_next.png', + 'resources/drawable-hdpi/find_prev.png', + 'resources/drawable-hdpi/folder.png', + 'resources/drawable-hdpi/grid_icon_bg_activated.9.png', + 'resources/drawable-hdpi/grid_icon_bg_focused.9.png', + 'resources/drawable-hdpi/handle_end.png', + 'resources/drawable-hdpi/handle_middle.png', + 'resources/drawable-hdpi/handle_start.png', + 'resources/drawable-hdpi/history_tabs_indicator_selected.9.png', + 'resources/drawable-hdpi/home_bg.png', + 'resources/drawable-hdpi/home_star.png', + 'resources/drawable-hdpi/home_tab_menu_strip.9.png', + 'resources/drawable-hdpi/ic_menu_addons_filler.png', + 'resources/drawable-hdpi/ic_menu_bookmark_add.png', + 'resources/drawable-hdpi/ic_menu_bookmark_remove.png', + 'resources/drawable-hdpi/ic_menu_character_encoding.png', + 'resources/drawable-hdpi/ic_menu_forward.png', + 'resources/drawable-hdpi/ic_menu_guest.png', + 'resources/drawable-hdpi/ic_menu_new_private_tab.png', + 'resources/drawable-hdpi/ic_menu_new_tab.png', + 'resources/drawable-hdpi/ic_menu_reload.png', + 'resources/drawable-hdpi/ic_status_logo.png', + 'resources/drawable-hdpi/ic_url_bar_go.png', + 'resources/drawable-hdpi/ic_url_bar_reader.png', + 'resources/drawable-hdpi/ic_url_bar_search.png', + 'resources/drawable-hdpi/ic_url_bar_star.png', + 'resources/drawable-hdpi/ic_url_bar_tab.png', + 'resources/drawable-hdpi/icon_bookmarks_empty.png', + 'resources/drawable-hdpi/icon_last_tabs.png', + 'resources/drawable-hdpi/icon_last_tabs_empty.png', + 'resources/drawable-hdpi/icon_most_recent.png', + 'resources/drawable-hdpi/icon_most_recent_empty.png', + 'resources/drawable-hdpi/icon_most_visited.png', + 'resources/drawable-hdpi/icon_openinapp.png', + 'resources/drawable-hdpi/icon_pageaction.png', + 'resources/drawable-hdpi/icon_reading_list_empty.png', + 'resources/drawable-hdpi/larry.png', + 'resources/drawable-hdpi/lock_identified.png', + 'resources/drawable-hdpi/lock_verified.png', + 'resources/drawable-hdpi/menu.png', + 'resources/drawable-hdpi/menu_item_check.png', + 'resources/drawable-hdpi/menu_item_more.png', + 'resources/drawable-hdpi/menu_item_uncheck.png', + 'resources/drawable-hdpi/menu_panel_bg.9.png', + 'resources/drawable-hdpi/menu_pb.png', + 'resources/drawable-hdpi/menu_popup_arrow_bottom.png', + 'resources/drawable-hdpi/menu_popup_arrow_top.png', + 'resources/drawable-hdpi/menu_popup_bg.9.png', + 'resources/drawable-hdpi/pause.png', + 'resources/drawable-hdpi/pin.png', + 'resources/drawable-hdpi/play.png', + 'resources/drawable-hdpi/reader.png', + 'resources/drawable-hdpi/reader_active.png', + 'resources/drawable-hdpi/reader_cropped.png', + 'resources/drawable-hdpi/reading_list.png', + 'resources/drawable-hdpi/shield.png', + 'resources/drawable-hdpi/shield_doorhanger.png', + 'resources/drawable-hdpi/spinner_default.9.png', + 'resources/drawable-hdpi/spinner_focused.9.png', + 'resources/drawable-hdpi/spinner_pressed.9.png', + 'resources/drawable-hdpi/tab_close.png', + 'resources/drawable-hdpi/tab_indicator_divider.9.png', + 'resources/drawable-hdpi/tab_indicator_selected.9.png', + 'resources/drawable-hdpi/tab_indicator_selected_focused.9.png', + 'resources/drawable-hdpi/tab_new.png', + 'resources/drawable-hdpi/tab_new_pb.png', + 'resources/drawable-hdpi/tab_thumbnail_default.png', + 'resources/drawable-hdpi/tab_thumbnail_shadow.png', + 'resources/drawable-hdpi/tabs_count.png', + 'resources/drawable-hdpi/tabs_count_foreground.png', + 'resources/drawable-hdpi/tabs_normal.png', + 'resources/drawable-hdpi/tabs_private.png', + 'resources/drawable-hdpi/tabs_synced.png', + 'resources/drawable-hdpi/tip_addsearch.png', + 'resources/drawable-hdpi/top_site_add.png', + 'resources/drawable-hdpi/url_bar_entry_default.9.png', + 'resources/drawable-hdpi/url_bar_entry_default_pb.9.png', + 'resources/drawable-hdpi/url_bar_entry_pressed.9.png', + 'resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png', + 'resources/drawable-hdpi/urlbar_stop.png', + 'resources/drawable-hdpi/validation_arrow.png', + 'resources/drawable-hdpi/validation_arrow_inverted.png', + 'resources/drawable-hdpi/validation_bg.9.png', + 'resources/drawable-hdpi/warning.png', + 'resources/drawable-hdpi/warning_doorhanger.png', + 'resources/drawable-large-hdpi-v11/arrow_popup_bg.9.png', + 'resources/drawable-large-hdpi-v11/ic_menu_forward.png', + 'resources/drawable-large-hdpi-v11/ic_menu_reload.png', + 'resources/drawable-large-hdpi-v11/menu.png', + 'resources/drawable-large-land-v11/home_history_tabs_indicator.xml', + 'resources/drawable-large-mdpi-v11/arrow_popup_bg.9.png', + 'resources/drawable-large-mdpi-v11/ic_menu_forward.png', + 'resources/drawable-large-mdpi-v11/ic_menu_reload.png', + 'resources/drawable-large-mdpi-v11/menu.png', + 'resources/drawable-large-xhdpi-v11/arrow_popup_bg.9.png', + 'resources/drawable-large-xhdpi-v11/ic_menu_forward.png', + 'resources/drawable-large-xhdpi-v11/ic_menu_reload.png', + 'resources/drawable-large-xhdpi-v11/menu.png', + 'resources/drawable-mdpi-v11/alert_addon.png', + 'resources/drawable-mdpi-v11/alert_app.png', + 'resources/drawable-mdpi-v11/alert_camera.png', + 'resources/drawable-mdpi-v11/alert_download.png', + 'resources/drawable-mdpi-v11/alert_mic.png', + 'resources/drawable-mdpi-v11/alert_mic_camera.png', + 'resources/drawable-mdpi-v11/firefox_settings_alert.png', + 'resources/drawable-mdpi-v11/ic_menu_addons.png', + 'resources/drawable-mdpi-v11/ic_menu_apps.png', + 'resources/drawable-mdpi-v11/ic_menu_back.png', + 'resources/drawable-mdpi-v11/ic_menu_bookmark_add.png', + 'resources/drawable-mdpi-v11/ic_menu_bookmark_remove.png', + 'resources/drawable-mdpi-v11/ic_menu_desktop_mode_off.png', + 'resources/drawable-mdpi-v11/ic_menu_desktop_mode_on.png', + 'resources/drawable-mdpi-v11/ic_menu_downloads.png', + 'resources/drawable-mdpi-v11/ic_menu_find_in_page.png', + 'resources/drawable-mdpi-v11/ic_menu_forward.png', + 'resources/drawable-mdpi-v11/ic_menu_new_private_tab.png', + 'resources/drawable-mdpi-v11/ic_menu_new_tab.png', + 'resources/drawable-mdpi-v11/ic_menu_quit.png', + 'resources/drawable-mdpi-v11/ic_menu_reload.png', + 'resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png', + 'resources/drawable-mdpi-v11/ic_menu_settings.png', + 'resources/drawable-mdpi-v11/ic_menu_share.png', + 'resources/drawable-mdpi-v11/ic_menu_tools.png', + 'resources/drawable-mdpi-v11/ic_status_logo.png', + 'resources/drawable-mdpi/abouthome_thumbnail.png', + 'resources/drawable-mdpi/alert_addon.png', + 'resources/drawable-mdpi/alert_app.png', + 'resources/drawable-mdpi/alert_camera.png', + 'resources/drawable-mdpi/alert_download.png', + 'resources/drawable-mdpi/alert_mic.png', + 'resources/drawable-mdpi/alert_mic_camera.png', + 'resources/drawable-mdpi/arrow_popup_bg.9.png', + 'resources/drawable-mdpi/autocomplete_list_bg.9.png', + 'resources/drawable-mdpi/blank.png', + 'resources/drawable-mdpi/bookmark_folder_closed.png', + 'resources/drawable-mdpi/bookmark_folder_opened.png', + 'resources/drawable-mdpi/bookmarkdefaults_favicon_addons.png', + 'resources/drawable-mdpi/bookmarkdefaults_favicon_support.png', + 'resources/drawable-mdpi/close.png', + 'resources/drawable-mdpi/desktop_notification.png', + 'resources/drawable-mdpi/favicon.png', + 'resources/drawable-mdpi/find_close.png', + 'resources/drawable-mdpi/find_next.png', + 'resources/drawable-mdpi/find_prev.png', + 'resources/drawable-mdpi/folder.png', + 'resources/drawable-mdpi/grid_icon_bg_activated.9.png', + 'resources/drawable-mdpi/grid_icon_bg_focused.9.png', + 'resources/drawable-mdpi/handle_end.png', + 'resources/drawable-mdpi/handle_middle.png', + 'resources/drawable-mdpi/handle_start.png', + 'resources/drawable-mdpi/history_tabs_indicator_selected.9.png', + 'resources/drawable-mdpi/home_tab_menu_strip.9.png', + 'resources/drawable-mdpi/ic_menu_addons_filler.png', + 'resources/drawable-mdpi/ic_menu_bookmark_add.png', + 'resources/drawable-mdpi/ic_menu_bookmark_remove.png', + 'resources/drawable-mdpi/ic_menu_character_encoding.png', + 'resources/drawable-mdpi/ic_menu_forward.png', + 'resources/drawable-mdpi/ic_menu_guest.png', + 'resources/drawable-mdpi/ic_menu_new_private_tab.png', + 'resources/drawable-mdpi/ic_menu_new_tab.png', + 'resources/drawable-mdpi/ic_menu_reload.png', + 'resources/drawable-mdpi/ic_status_logo.png', + 'resources/drawable-mdpi/ic_url_bar_go.png', + 'resources/drawable-mdpi/ic_url_bar_reader.png', + 'resources/drawable-mdpi/ic_url_bar_search.png', + 'resources/drawable-mdpi/ic_url_bar_star.png', + 'resources/drawable-mdpi/ic_url_bar_tab.png', + 'resources/drawable-mdpi/icon_bookmarks_empty.png', + 'resources/drawable-mdpi/icon_last_tabs.png', + 'resources/drawable-mdpi/icon_last_tabs_empty.png', + 'resources/drawable-mdpi/icon_most_recent.png', + 'resources/drawable-mdpi/icon_most_recent_empty.png', + 'resources/drawable-mdpi/icon_most_visited.png', + 'resources/drawable-mdpi/icon_openinapp.png', + 'resources/drawable-mdpi/icon_pageaction.png', + 'resources/drawable-mdpi/icon_reading_list_empty.png', + 'resources/drawable-mdpi/larry.png', + 'resources/drawable-mdpi/lock_identified.png', + 'resources/drawable-mdpi/lock_verified.png', + 'resources/drawable-mdpi/marketplace.png', + 'resources/drawable-mdpi/menu.png', + 'resources/drawable-mdpi/menu_item_check.png', + 'resources/drawable-mdpi/menu_item_more.png', + 'resources/drawable-mdpi/menu_item_uncheck.png', + 'resources/drawable-mdpi/menu_panel_bg.9.png', + 'resources/drawable-mdpi/menu_pb.png', + 'resources/drawable-mdpi/menu_popup_arrow_bottom.png', + 'resources/drawable-mdpi/menu_popup_arrow_top.png', + 'resources/drawable-mdpi/menu_popup_bg.9.png', + 'resources/drawable-mdpi/pause.png', + 'resources/drawable-mdpi/pin.png', + 'resources/drawable-mdpi/play.png', + 'resources/drawable-mdpi/progress_spinner.png', + 'resources/drawable-mdpi/reader.png', + 'resources/drawable-mdpi/reader_active.png', + 'resources/drawable-mdpi/reader_cropped.png', + 'resources/drawable-mdpi/reading_list.png', + 'resources/drawable-mdpi/scrollbar.png', + 'resources/drawable-mdpi/shadow.png', + 'resources/drawable-mdpi/shield.png', + 'resources/drawable-mdpi/shield_doorhanger.png', + 'resources/drawable-mdpi/spinner_default.9.png', + 'resources/drawable-mdpi/spinner_focused.9.png', + 'resources/drawable-mdpi/spinner_pressed.9.png', + 'resources/drawable-mdpi/start.png', + 'resources/drawable-mdpi/tab_close.png', + 'resources/drawable-mdpi/tab_indicator_divider.9.png', + 'resources/drawable-mdpi/tab_indicator_selected.9.png', + 'resources/drawable-mdpi/tab_indicator_selected_focused.9.png', + 'resources/drawable-mdpi/tab_new.png', + 'resources/drawable-mdpi/tab_new_pb.png', + 'resources/drawable-mdpi/tab_thumbnail_default.png', + 'resources/drawable-mdpi/tab_thumbnail_shadow.png', + 'resources/drawable-mdpi/tabs_count.png', + 'resources/drawable-mdpi/tabs_count_foreground.png', + 'resources/drawable-mdpi/tabs_normal.png', + 'resources/drawable-mdpi/tabs_private.png', + 'resources/drawable-mdpi/tabs_synced.png', + 'resources/drawable-mdpi/tip_addsearch.png', + 'resources/drawable-mdpi/toast.9.png', + 'resources/drawable-mdpi/toast_button_focused.9.png', + 'resources/drawable-mdpi/toast_button_pressed.9.png', + 'resources/drawable-mdpi/toast_divider.9.png', + 'resources/drawable-mdpi/top_site_add.png', + 'resources/drawable-mdpi/url_bar_entry_default.9.png', + 'resources/drawable-mdpi/url_bar_entry_default_pb.9.png', + 'resources/drawable-mdpi/url_bar_entry_pressed.9.png', + 'resources/drawable-mdpi/url_bar_entry_pressed_pb.9.png', + 'resources/drawable-mdpi/urlbar_stop.png', + 'resources/drawable-mdpi/validation_arrow.png', + 'resources/drawable-mdpi/validation_arrow_inverted.png', + 'resources/drawable-mdpi/validation_bg.9.png', + 'resources/drawable-mdpi/warning.png', + 'resources/drawable-mdpi/warning_doorhanger.png', + 'resources/drawable-xhdpi-v11/alert_addon.png', + 'resources/drawable-xhdpi-v11/alert_app.png', + 'resources/drawable-xhdpi-v11/alert_camera.png', + 'resources/drawable-xhdpi-v11/alert_download.png', + 'resources/drawable-xhdpi-v11/alert_mic.png', + 'resources/drawable-xhdpi-v11/alert_mic_camera.png', + 'resources/drawable-xhdpi-v11/firefox_settings_alert.png', + 'resources/drawable-xhdpi-v11/ic_menu_addons.png', + 'resources/drawable-xhdpi-v11/ic_menu_apps.png', + 'resources/drawable-xhdpi-v11/ic_menu_back.png', + 'resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png', + 'resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png', + 'resources/drawable-xhdpi-v11/ic_menu_desktop_mode_off.png', + 'resources/drawable-xhdpi-v11/ic_menu_desktop_mode_on.png', + 'resources/drawable-xhdpi-v11/ic_menu_downloads.png', + 'resources/drawable-xhdpi-v11/ic_menu_find_in_page.png', + 'resources/drawable-xhdpi-v11/ic_menu_forward.png', + 'resources/drawable-xhdpi-v11/ic_menu_new_private_tab.png', + 'resources/drawable-xhdpi-v11/ic_menu_new_tab.png', + 'resources/drawable-xhdpi-v11/ic_menu_quit.png', + 'resources/drawable-xhdpi-v11/ic_menu_reload.png', + 'resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png', + 'resources/drawable-xhdpi-v11/ic_menu_settings.png', + 'resources/drawable-xhdpi-v11/ic_menu_share.png', + 'resources/drawable-xhdpi-v11/ic_menu_tools.png', + 'resources/drawable-xhdpi-v11/ic_status_logo.png', + 'resources/drawable-xhdpi/abouthome_thumbnail.png', + 'resources/drawable-xhdpi/alert_addon.png', + 'resources/drawable-xhdpi/alert_app.png', + 'resources/drawable-xhdpi/alert_camera.png', + 'resources/drawable-xhdpi/alert_download.png', + 'resources/drawable-xhdpi/alert_mic.png', + 'resources/drawable-xhdpi/alert_mic_camera.png', + 'resources/drawable-xhdpi/arrow_popup_bg.9.png', + 'resources/drawable-xhdpi/blank.png', + 'resources/drawable-xhdpi/bookmark_folder_closed.png', + 'resources/drawable-xhdpi/bookmark_folder_opened.png', + 'resources/drawable-xhdpi/close.png', + 'resources/drawable-xhdpi/favicon.png', + 'resources/drawable-xhdpi/find_close.png', + 'resources/drawable-xhdpi/find_next.png', + 'resources/drawable-xhdpi/find_prev.png', + 'resources/drawable-xhdpi/folder.png', + 'resources/drawable-xhdpi/grid_icon_bg_activated.9.png', + 'resources/drawable-xhdpi/grid_icon_bg_focused.9.png', + 'resources/drawable-xhdpi/handle_end.png', + 'resources/drawable-xhdpi/handle_middle.png', + 'resources/drawable-xhdpi/handle_start.png', + 'resources/drawable-xhdpi/history_tabs_indicator_selected.9.png', + 'resources/drawable-xhdpi/home_tab_menu_strip.9.png', + 'resources/drawable-xhdpi/ic_menu_addons_filler.png', + 'resources/drawable-xhdpi/ic_menu_bookmark_add.png', + 'resources/drawable-xhdpi/ic_menu_bookmark_remove.png', + 'resources/drawable-xhdpi/ic_menu_character_encoding.png', + 'resources/drawable-xhdpi/ic_menu_forward.png', + 'resources/drawable-xhdpi/ic_menu_guest.png', + 'resources/drawable-xhdpi/ic_menu_new_private_tab.png', + 'resources/drawable-xhdpi/ic_menu_new_tab.png', + 'resources/drawable-xhdpi/ic_menu_reload.png', + 'resources/drawable-xhdpi/ic_status_logo.png', + 'resources/drawable-xhdpi/ic_url_bar_go.png', + 'resources/drawable-xhdpi/ic_url_bar_reader.png', + 'resources/drawable-xhdpi/ic_url_bar_search.png', + 'resources/drawable-xhdpi/ic_url_bar_star.png', + 'resources/drawable-xhdpi/ic_url_bar_tab.png', + 'resources/drawable-xhdpi/icon_bookmarks_empty.png', + 'resources/drawable-xhdpi/icon_last_tabs.png', + 'resources/drawable-xhdpi/icon_last_tabs_empty.png', + 'resources/drawable-xhdpi/icon_most_recent.png', + 'resources/drawable-xhdpi/icon_most_recent_empty.png', + 'resources/drawable-xhdpi/icon_most_visited.png', + 'resources/drawable-xhdpi/icon_openinapp.png', + 'resources/drawable-xhdpi/icon_pageaction.png', + 'resources/drawable-xhdpi/icon_reading_list_empty.png', + 'resources/drawable-xhdpi/larry.png', + 'resources/drawable-xhdpi/lock_identified.png', + 'resources/drawable-xhdpi/lock_verified.png', + 'resources/drawable-xhdpi/menu.png', + 'resources/drawable-xhdpi/menu_item_check.png', + 'resources/drawable-xhdpi/menu_item_more.png', + 'resources/drawable-xhdpi/menu_item_uncheck.png', + 'resources/drawable-xhdpi/menu_panel_bg.9.png', + 'resources/drawable-xhdpi/menu_pb.png', + 'resources/drawable-xhdpi/menu_popup_arrow_bottom.png', + 'resources/drawable-xhdpi/menu_popup_arrow_top.png', + 'resources/drawable-xhdpi/menu_popup_bg.9.png', + 'resources/drawable-xhdpi/pause.png', + 'resources/drawable-xhdpi/pin.png', + 'resources/drawable-xhdpi/play.png', + 'resources/drawable-xhdpi/reader.png', + 'resources/drawable-xhdpi/reader_active.png', + 'resources/drawable-xhdpi/reader_cropped.png', + 'resources/drawable-xhdpi/reading_list.png', + 'resources/drawable-xhdpi/shield.png', + 'resources/drawable-xhdpi/shield_doorhanger.png', + 'resources/drawable-xhdpi/spinner_default.9.png', + 'resources/drawable-xhdpi/spinner_focused.9.png', + 'resources/drawable-xhdpi/spinner_pressed.9.png', + 'resources/drawable-xhdpi/tab_close.png', + 'resources/drawable-xhdpi/tab_indicator_divider.9.png', + 'resources/drawable-xhdpi/tab_indicator_selected.9.png', + 'resources/drawable-xhdpi/tab_indicator_selected_focused.9.png', + 'resources/drawable-xhdpi/tab_new.png', + 'resources/drawable-xhdpi/tab_new_pb.png', + 'resources/drawable-xhdpi/tab_thumbnail_default.png', + 'resources/drawable-xhdpi/tab_thumbnail_shadow.png', + 'resources/drawable-xhdpi/tabs_count.png', + 'resources/drawable-xhdpi/tabs_count_foreground.png', + 'resources/drawable-xhdpi/tabs_normal.png', + 'resources/drawable-xhdpi/tabs_private.png', + 'resources/drawable-xhdpi/tabs_synced.png', + 'resources/drawable-xhdpi/tip_addsearch.png', + 'resources/drawable-xhdpi/top_site_add.png', + 'resources/drawable-xhdpi/url_bar_entry_default.9.png', + 'resources/drawable-xhdpi/url_bar_entry_default_pb.9.png', + 'resources/drawable-xhdpi/url_bar_entry_pressed.9.png', + 'resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png', + 'resources/drawable-xhdpi/urlbar_stop.png', + 'resources/drawable-xhdpi/validation_arrow.png', + 'resources/drawable-xhdpi/validation_arrow_inverted.png', + 'resources/drawable-xhdpi/validation_bg.9.png', + 'resources/drawable-xhdpi/warning.png', + 'resources/drawable-xhdpi/warning_doorhanger.png', + 'resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png', + 'resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png', + 'resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png', + 'resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png', + 'resources/drawable-xlarge-v11/home_history_tabs_indicator.xml', + 'resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png', + 'resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png', + 'resources/drawable/action_bar_button.xml', + 'resources/drawable/action_bar_button_inverse.xml', + 'resources/drawable/bookmark_folder.xml', + 'resources/drawable/divider_horizontal.xml', + 'resources/drawable/divider_vertical.xml', + 'resources/drawable/handle_end_level.xml', + 'resources/drawable/handle_start_level.xml', + 'resources/drawable/home_banner.xml', + 'resources/drawable/home_history_tabs_indicator.xml', + 'resources/drawable/home_page_title_background.xml', + 'resources/drawable/ic_menu_back.xml', + 'resources/drawable/ic_menu_desktop_mode_off.xml', + 'resources/drawable/ic_menu_desktop_mode_on.xml', + 'resources/drawable/ic_menu_quit.xml', + 'resources/drawable/icon_grid_item_bg.xml', + 'resources/drawable/menu_item_state.xml', + 'resources/drawable/menu_level.xml', + 'resources/drawable/remote_tabs_child_divider.xml', + 'resources/drawable/shaped_button.xml', + 'resources/drawable/site_security_level.xml', + 'resources/drawable/spinner.xml', + 'resources/drawable/suggestion_selector.xml', + 'resources/drawable/tab_new_level.xml', + 'resources/drawable/tab_row.xml', + 'resources/drawable/tab_thumbnail.xml', + 'resources/drawable/tabs_panel_indicator.xml', + 'resources/drawable/textbox_bg.xml', + 'resources/drawable/toast_button.xml', + 'resources/drawable/top_sites_thumbnail_bg.xml', + 'resources/drawable/url_bar_bg.xml', + 'resources/drawable/url_bar_entry.xml', + 'resources/drawable/url_bar_nav_button.xml', + 'resources/drawable/url_bar_right_edge.xml', + 'resources/drawable/webapp_titlebar_bg.xml', + 'resources/layout-large-land-v11/home_history_list.xml', + 'resources/layout-large-land-v11/home_history_page.xml', + 'resources/layout-large-land-v11/home_history_tabs_indicator.xml', + 'resources/layout-large-land-v11/tabs_panel.xml', + 'resources/layout-large-land-v11/tabs_panel_footer.xml', + 'resources/layout-large-land-v11/tabs_panel_header.xml', + 'resources/layout-large-v11/browser_toolbar.xml', + 'resources/layout-large-v11/home_pager.xml', + 'resources/layout-xlarge-v11/font_size_preference.xml', + 'resources/layout-xlarge-v11/home_history_list.xml', + 'resources/layout-xlarge-v11/home_history_page.xml', + 'resources/layout-xlarge-v11/home_history_tabs_indicator.xml', + 'resources/layout-xlarge-v11/remote_tabs_child.xml', + 'resources/layout-xlarge-v11/remote_tabs_group.xml', + 'resources/layout/arrow_popup.xml', + 'resources/layout/autocomplete_list.xml', + 'resources/layout/autocomplete_list_item.xml', + 'resources/layout/bookmark_edit.xml', + 'resources/layout/bookmark_folder_row.xml', + 'resources/layout/bookmark_item_row.xml', + 'resources/layout/browser_search.xml', + 'resources/layout/browser_toolbar.xml', + 'resources/layout/datetime_picker.xml', + 'resources/layout/doorhanger.xml', + 'resources/layout/doorhanger_button.xml', + 'resources/layout/find_in_page_content.xml', + 'resources/layout/font_size_preference.xml', + 'resources/layout/gecko_app.xml', + 'resources/layout/home_banner.xml', + 'resources/layout/home_bookmarks_page.xml', + 'resources/layout/home_empty_page.xml', + 'resources/layout/home_empty_reading_page.xml', + 'resources/layout/home_header_row.xml', + 'resources/layout/home_history_list.xml', + 'resources/layout/home_history_page.xml', + 'resources/layout/home_history_tabs_indicator.xml', + 'resources/layout/home_item_row.xml', + 'resources/layout/home_last_tabs_page.xml', + 'resources/layout/home_most_recent_page.xml', + 'resources/layout/home_pager.xml', + 'resources/layout/home_reading_list_page.xml', + 'resources/layout/home_search_item_row.xml', + 'resources/layout/home_suggestion_prompt.xml', + 'resources/layout/home_top_sites_page.xml', + 'resources/layout/icon_grid.xml', + 'resources/layout/icon_grid_item.xml', + 'resources/layout/launch_app_list.xml', + 'resources/layout/launch_app_listitem.xml', + 'resources/layout/list_item_header.xml', + 'resources/layout/menu_action_bar.xml', + 'resources/layout/menu_item_action_view.xml', + 'resources/layout/menu_popup.xml', + 'resources/layout/notification_icon_text.xml', + 'resources/layout/notification_progress.xml', + 'resources/layout/notification_progress_text.xml', + 'resources/layout/pin_site_dialog.xml', + 'resources/layout/preference_rightalign_icon.xml', + 'resources/layout/preference_search_engine.xml', + 'resources/layout/preference_search_tip.xml', + 'resources/layout/remote_tabs_child.xml', + 'resources/layout/remote_tabs_group.xml', + 'resources/layout/search_engine_row.xml', + 'resources/layout/select_dialog_list.xml', + 'resources/layout/select_dialog_multichoice.xml', + 'resources/layout/select_dialog_singlechoice.xml', + 'resources/layout/shared_ui_components.xml', + 'resources/layout/simple_dropdown_item_1line.xml', + 'resources/layout/site_identity.xml', + 'resources/layout/site_setting_item.xml', + 'resources/layout/site_setting_title.xml', + 'resources/layout/suggestion_item.xml', + 'resources/layout/tab_menu_strip.xml', + 'resources/layout/tabs_counter.xml', + 'resources/layout/tabs_item_cell.xml', + 'resources/layout/tabs_item_row.xml', + 'resources/layout/tabs_panel.xml', + 'resources/layout/tabs_panel_header.xml', + 'resources/layout/tabs_panel_indicator.xml', + 'resources/layout/text_selection_handles.xml', + 'resources/layout/top_sites_grid_item_view.xml', + 'resources/layout/two_line_page_row.xml', + 'resources/layout/validation_message.xml', + 'resources/layout/videoplayer.xml', + 'resources/layout/web_app.xml', + 'resources/menu-large-v11/browser_app_menu.xml', + 'resources/menu-v11/browser_app_menu.xml', + 'resources/menu-xlarge-v11/browser_app_menu.xml', + 'resources/menu/browser_app_menu.xml', + 'resources/menu/gecko_app_menu.xml', + 'resources/menu/home_contextmenu.xml', + 'resources/menu/titlebar_contextmenu.xml', + 'resources/menu/top_sites_contextmenu.xml', + 'resources/values-land/integers.xml', + 'resources/values-land/layout.xml', + 'resources/values-land/styles.xml', + 'resources/values-large-land-v11/dimens.xml', + 'resources/values-large-land-v11/styles.xml', + 'resources/values-large-v11/dimens.xml', + 'resources/values-large-v11/layout.xml', + 'resources/values-large-v11/styles.xml', + 'resources/values-large-v11/themes.xml', + 'resources/values-v11/colors.xml', + 'resources/values-v11/dimens.xml', + 'resources/values-v11/styles.xml', + 'resources/values-v11/themes.xml', + 'resources/values-v14/styles.xml', + 'resources/values-v16/styles.xml', + 'resources/values-xlarge-land-v11/dimens.xml', + 'resources/values-xlarge-land-v11/styles.xml', + 'resources/values-xlarge-v11/dimens.xml', + 'resources/values-xlarge-v11/integers.xml', + 'resources/values-xlarge-v11/styles.xml', + 'resources/values/arrays.xml', + 'resources/values/attrs.xml', + 'resources/values/colors.xml', + 'resources/values/dimens.xml', + 'resources/values/integers.xml', + 'resources/values/layout.xml', + 'resources/values/styles.xml', + 'resources/values/themes.xml', + 'resources/xml-v11/preference_headers.xml', + 'resources/xml-v11/preferences.xml', + 'resources/xml-v11/preferences_customize.xml', + 'resources/xml-v11/preferences_customize_tablet.xml', + 'resources/xml/preferences.xml', + 'resources/xml/preferences_customize.xml', + 'resources/xml/preferences_devtools.xml', + 'resources/xml/preferences_display.xml', + 'resources/xml/preferences_privacy.xml', + 'resources/xml/preferences_search.xml', + 'resources/xml/preferences_vendor.xml', + 'resources/xml/searchable.xml', +] + +if CONFIG['MOZ_CRASHREPORTER']: + ANDROID_RESFILES += [ + 'resources/drawable-mdpi/crash_reporter.png', + 'resources/layout/crash_reporter.xml', + ] diff --git a/mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png b/mobile/android/base/resources/drawable-mdpi/crash_reporter.png similarity index 100% rename from mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png rename to mobile/android/base/resources/drawable-mdpi/crash_reporter.png diff --git a/mobile/android/base/crashreporter/res/layout/crash_reporter.xml b/mobile/android/base/resources/layout/crash_reporter.xml similarity index 100% rename from mobile/android/base/crashreporter/res/layout/crash_reporter.xml rename to mobile/android/base/resources/layout/crash_reporter.xml diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png b/mobile/android/branding/aurora/content/fennec_144x144.png similarity index 100% rename from mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png rename to mobile/android/branding/aurora/content/fennec_144x144.png diff --git a/mobile/android/branding/aurora/res/drawable-mdpi/icon.png b/mobile/android/branding/aurora/content/fennec_48x48.png similarity index 100% rename from mobile/android/branding/aurora/res/drawable-mdpi/icon.png rename to mobile/android/branding/aurora/content/fennec_48x48.png diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/icon.png b/mobile/android/branding/aurora/content/fennec_72x72.png similarity index 100% rename from mobile/android/branding/aurora/res/drawable-hdpi/icon.png rename to mobile/android/branding/aurora/content/fennec_72x72.png diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/icon.png b/mobile/android/branding/aurora/content/fennec_96x96.png similarity index 100% rename from mobile/android/branding/aurora/res/drawable-xhdpi/icon.png rename to mobile/android/branding/aurora/content/fennec_96x96.png diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/icon.png b/mobile/android/branding/beta/content/fennec_144x144.png similarity index 100% rename from mobile/android/branding/beta/res/drawable-xxhdpi/icon.png rename to mobile/android/branding/beta/content/fennec_144x144.png diff --git a/mobile/android/branding/beta/res/drawable-mdpi/icon.png b/mobile/android/branding/beta/content/fennec_48x48.png similarity index 100% rename from mobile/android/branding/beta/res/drawable-mdpi/icon.png rename to mobile/android/branding/beta/content/fennec_48x48.png diff --git a/mobile/android/branding/beta/res/drawable-hdpi/icon.png b/mobile/android/branding/beta/content/fennec_72x72.png similarity index 100% rename from mobile/android/branding/beta/res/drawable-hdpi/icon.png rename to mobile/android/branding/beta/content/fennec_72x72.png diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/icon.png b/mobile/android/branding/beta/content/fennec_96x96.png similarity index 100% rename from mobile/android/branding/beta/res/drawable-xhdpi/icon.png rename to mobile/android/branding/beta/content/fennec_96x96.png diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png b/mobile/android/branding/nightly/content/fennec_144x144.png similarity index 100% rename from mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png rename to mobile/android/branding/nightly/content/fennec_144x144.png diff --git a/mobile/android/branding/nightly/res/drawable-mdpi/icon.png b/mobile/android/branding/nightly/content/fennec_48x48.png similarity index 100% rename from mobile/android/branding/nightly/res/drawable-mdpi/icon.png rename to mobile/android/branding/nightly/content/fennec_48x48.png diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/icon.png b/mobile/android/branding/nightly/content/fennec_72x72.png similarity index 100% rename from mobile/android/branding/nightly/res/drawable-hdpi/icon.png rename to mobile/android/branding/nightly/content/fennec_72x72.png diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png b/mobile/android/branding/nightly/content/fennec_96x96.png similarity index 100% rename from mobile/android/branding/nightly/res/drawable-xhdpi/icon.png rename to mobile/android/branding/nightly/content/fennec_96x96.png diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/icon.png b/mobile/android/branding/official/content/fennec_144x144.png similarity index 100% rename from mobile/android/branding/official/res/drawable-xxhdpi/icon.png rename to mobile/android/branding/official/content/fennec_144x144.png diff --git a/mobile/android/branding/official/res/drawable-mdpi/icon.png b/mobile/android/branding/official/content/fennec_48x48.png similarity index 100% rename from mobile/android/branding/official/res/drawable-mdpi/icon.png rename to mobile/android/branding/official/content/fennec_48x48.png diff --git a/mobile/android/branding/official/res/drawable-hdpi/icon.png b/mobile/android/branding/official/content/fennec_72x72.png similarity index 100% rename from mobile/android/branding/official/res/drawable-hdpi/icon.png rename to mobile/android/branding/official/content/fennec_72x72.png diff --git a/mobile/android/branding/official/res/drawable-xhdpi/icon.png b/mobile/android/branding/official/content/fennec_96x96.png similarity index 100% rename from mobile/android/branding/official/res/drawable-xhdpi/icon.png rename to mobile/android/branding/official/content/fennec_96x96.png diff --git a/mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png b/mobile/android/branding/unofficial/content/fennec_144x144.png similarity index 100% rename from mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png rename to mobile/android/branding/unofficial/content/fennec_144x144.png diff --git a/mobile/android/branding/unofficial/res/drawable-mdpi/icon.png b/mobile/android/branding/unofficial/content/fennec_48x48.png similarity index 100% rename from mobile/android/branding/unofficial/res/drawable-mdpi/icon.png rename to mobile/android/branding/unofficial/content/fennec_48x48.png diff --git a/mobile/android/branding/unofficial/res/drawable-hdpi/icon.png b/mobile/android/branding/unofficial/content/fennec_72x72.png similarity index 100% rename from mobile/android/branding/unofficial/res/drawable-hdpi/icon.png rename to mobile/android/branding/unofficial/content/fennec_72x72.png diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png b/mobile/android/branding/unofficial/content/fennec_96x96.png similarity index 100% rename from mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png rename to mobile/android/branding/unofficial/content/fennec_96x96.png diff --git a/mobile/android/tests/background/junit3/android-services.mozbuild b/mobile/android/tests/background/junit3/android-services.mozbuild index 895d11993cfb..514869f1b920 100644 --- a/mobile/android/tests/background/junit3/android-services.mozbuild +++ b/mobile/android/tests/background/junit3/android-services.mozbuild @@ -4,3 +4,10 @@ # 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_RESFILES += [ + 'res/drawable-hdpi/icon.png', + 'res/drawable-ldpi/icon.png', + 'res/drawable-mdpi/icon.png', + 'res/layout/main.xml', + 'res/values/strings.xml', +] diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index 6c9115f32d74..697f52a32233 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -191,7 +191,7 @@ class TreeMetadataEmitter(LoggingMixin): varmap = dict( # Makefile.in : moz.build ANDROID_GENERATED_RESFILES='ANDROID_GENERATED_RESFILES', - ANDROID_RES_DIRS='ANDROID_RES_DIRS', + ANDROID_RESFILES='ANDROID_RESFILES', CPP_UNIT_TESTS='CPP_UNIT_TESTS', EXPORT_LIBRARY='EXPORT_LIBRARY', EXTRA_COMPONENTS='EXTRA_COMPONENTS', diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py index 67214e6e50b0..2a5ea2e67188 100644 --- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py +++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py @@ -64,11 +64,10 @@ VARIABLES = { file. """, 'export'), - 'ANDROID_RES_DIRS': (list, list, [], - """Android resource directories. + 'ANDROID_RESFILES': (StrictOrderingOnAppendList, list, [], + """Android resource files. - This variable contains a list of directories, each relative to - the srcdir, containing static files to package into a 'res' + This variable contains a list of files to package into a 'res' directory and merge into an APK file. """, 'export'), From 56cce399d2a84a3276dea2a1b8e27f3c5066179b Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Wed, 20 Nov 2013 15:16:17 +0100 Subject: [PATCH 2/3] Backed out changeset 4ae3d82562fa (bug 934646) Android Nighly Build Bustage --- mobile/android/base/tests/testReaderMode.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mobile/android/base/tests/testReaderMode.java b/mobile/android/base/tests/testReaderMode.java index e52273d0475d..137901bbada0 100644 --- a/mobile/android/base/tests/testReaderMode.java +++ b/mobile/android/base/tests/testReaderMode.java @@ -21,9 +21,6 @@ public class testReaderMode extends AboutHomeTest { static final int EVENT_CLEAR_DELAY_MS = 3000; static final int READER_ICON_MAX_WAIT_MS = 15000; - // IDs for UI views. - private static final String PAGE_ACTION_LAYOUT_ID = "page_action_layout"; - @Override protected int getTestType() { return TEST_MOCHITEST; @@ -156,7 +153,7 @@ public class testReaderMode extends AboutHomeTest { // Get the reader icon method protected View getReaderIcon() { - View pageActionLayout = mSolo.getView(PAGE_ACTION_LAYOUT_ID); + View pageActionLayout = mSolo.getView(0x7f070025); final ViewGroup actionLayoutEntry = (ViewGroup)pageActionLayout; View icon = actionLayoutEntry.getChildAt(1); if (icon == null || icon.getVisibility() != View.VISIBLE) { From d2242582b2681f1be7429bb884dc11759e6d7f28 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Wed, 20 Nov 2013 15:16:32 +0100 Subject: [PATCH 3/3] Backed out changeset 5dd946b1f29b (bug 934646) Android Nightly Build Bustage --- .../drawable-hdpi/awesomebar_sep_left.9.png | Bin 0 -> 216 bytes .../drawable-hdpi/awesomebar_sep_right.9.png | Bin 0 -> 206 bytes .../drawable-hdpi/awesomebar_tab_center.9.png | Bin 0 -> 599 bytes .../drawable-hdpi/awesomebar_tab_left.9.png | Bin 0 -> 372 bytes .../drawable-hdpi/awesomebar_tab_right.9.png | Bin 0 -> 347 bytes .../drawable-hdpi/ic_notif_button_cancel.png | Bin 0 -> 763 bytes .../drawable-hdpi/ic_notif_button_pause.png | Bin 0 -> 362 bytes .../drawable-hdpi/ic_notif_button_resume.png | Bin 0 -> 670 bytes .../drawable-mdpi/awesomebar_sep_left.9.png | Bin 0 -> 208 bytes .../drawable-mdpi/awesomebar_sep_right.9.png | Bin 0 -> 202 bytes .../drawable-mdpi/awesomebar_tab_center.9.png | Bin 0 -> 442 bytes .../drawable-mdpi/awesomebar_tab_left.9.png | Bin 0 -> 278 bytes .../drawable-mdpi/awesomebar_tab_right.9.png | Bin 0 -> 261 bytes .../drawable-mdpi/ic_notif_button_cancel.png | Bin 0 -> 497 bytes .../drawable-mdpi/ic_notif_button_pause.png | Bin 0 -> 252 bytes .../drawable-mdpi/ic_notif_button_resume.png | Bin 0 -> 463 bytes .../drawable-xhdpi/awesomebar_sep_left.9.png | Bin 0 -> 220 bytes .../drawable-xhdpi/awesomebar_sep_right.9.png | Bin 0 -> 207 bytes .../drawable-xhdpi/awesomebar_tab_center.9.png | Bin 0 -> 794 bytes .../drawable-xhdpi/awesomebar_tab_left.9.png | Bin 0 -> 462 bytes .../drawable-xhdpi/awesomebar_tab_right.9.png | Bin 0 -> 432 bytes .../drawable-xhdpi/ic_notif_button_cancel.png | Bin 0 -> 1261 bytes .../drawable-xhdpi/ic_notif_button_pause.png | Bin 0 -> 389 bytes .../drawable-xhdpi/ic_notif_button_resume.png | Bin 0 -> 853 bytes .../awesomebar_sep_left.9.png | Bin 0 -> 221 bytes .../awesomebar_sep_right.9.png | Bin 0 -> 208 bytes .../awesomebar_tab_center.9.png | Bin 0 -> 841 bytes .../awesomebar_tab_left.9.png | Bin 0 -> 504 bytes .../awesomebar_tab_right.9.png | Bin 0 -> 445 bytes .../awesomebar_sep_left.9.png | Bin 0 -> 213 bytes .../awesomebar_sep_right.9.png | Bin 0 -> 205 bytes .../awesomebar_tab_center.9.png | Bin 0 -> 589 bytes .../awesomebar_tab_left.9.png | Bin 0 -> 351 bytes .../awesomebar_tab_right.9.png | Bin 0 -> 320 bytes .../awesomebar_sep_left.9.png | Bin 0 -> 225 bytes .../awesomebar_sep_right.9.png | Bin 0 -> 212 bytes .../awesomebar_tab_center.9.png | Bin 0 -> 1145 bytes .../awesomebar_tab_left.9.png | Bin 0 -> 638 bytes .../awesomebar_tab_right.9.png | Bin 0 -> 561 bytes 39 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_sep_left.9.png create mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_sep_right.9.png create mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_tab_center.9.png create mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_tab_left.9.png create mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_tab_right.9.png create mode 100644 mobile/android/base/resources/drawable-hdpi/ic_notif_button_cancel.png create mode 100644 mobile/android/base/resources/drawable-hdpi/ic_notif_button_pause.png create mode 100644 mobile/android/base/resources/drawable-hdpi/ic_notif_button_resume.png create mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_sep_left.9.png create mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_sep_right.9.png create mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_tab_center.9.png create mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_tab_left.9.png create mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_tab_right.9.png create mode 100644 mobile/android/base/resources/drawable-mdpi/ic_notif_button_cancel.png create mode 100644 mobile/android/base/resources/drawable-mdpi/ic_notif_button_pause.png create mode 100644 mobile/android/base/resources/drawable-mdpi/ic_notif_button_resume.png create mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_left.9.png create mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_right.9.png create mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_center.9.png create mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_left.9.png create mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_right.9.png create mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_notif_button_cancel.png create mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_notif_button_pause.png create mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_notif_button_resume.png create mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_left.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_right.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_center.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_left.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_right.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_sep_left.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_sep_right.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_left.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_left.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_right.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_center.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_left.9.png create mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_right.9.png diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_sep_left.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_sep_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9efdd76be3eee2d49c62b9d6a8559412afa0bb83 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^EI@3^!3HGLu6vb%1kxRS9T^xl_H+M9WCij$3p^r= z85sBuf-vKbiP>*~g6t)pzOL+d8F^TY%-z|teglQ1N?apKg7ec#$`gxH83GbB^Gfvm zTtgJfjP*?Q3=Isv6fFd*a`bd@46*P}PH<@WZ=g1ZQG{VLC%3_$|NYD6sxg(8mKtO$ zd|7cIqoP5WsqcxymdKI;Vst E0O{gCIRF3v literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_sep_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..ce36b7407eda5dc0c954d1526c1f70c25c58c4e3 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^EI@3^!3HGLu6vb%1kxRS9T^xl_H+M9WCij$3p^r= z85sBufG}g$wN6f;AbW|YuPggqMjjR;b9c6^-#{U$64!{5;QX|b^2DN4hJeJ(yb?V> z*ARs=V?9$nLj!{^MGJwd%spKkLoEE08=C$HNbyXtOfZ|s^#8x|kxcb~@NjlP~7J3O*yW>|l9vqeFP=1ZUv44$rjF6*2UngFGVI5_|S literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_center.9.png new file mode 100644 index 0000000000000000000000000000000000000000..f05ac804f9bb77cba81612c5bce2ee0dffa22a40 GIT binary patch literal 599 zcmV-d0;v6oP)I{{lA!2c0^I z)Lt&ROVXlf{GAr7wrU?at=DhhONTy^`y`i3dT_DW-xl)=sfbcB4T)$mKn8MjkV7q; zr#f6ukGMiDxLj>9p^g|==kywwB1Al@{r&K-l_FP19bK-EdU&hET9y#dQ%tgdhSrp@PmIhc|sK|sn zPL-vr5I7r8pC+Viv5p+{9#ybW)wmyXlN74o8uBZ!-T`b*BFd`8z$ds;s9XfK+CmnkvUhr^uZ@!m6ep^=(aDBnUK3cvXb?@ z$ahM$(wh$evU4Ng-Q1i-4sH(t$Kp!ElhZlKSQlH*#Rp_Z=pmrk4=p76-jHeYu?&<@ z{(D}^A`5*9lrW+%-ys7etN0Wy$*i~t$P l2#|psZRB5i7ErY&_6(|u1!p(z#i#%P002ovPDHLkV1nL#0E++s literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d0f69846570720f6882f6bc4aa390a6b8140750e GIT binary patch literal 372 zcmV-)0gL{LP)q!% SBox*F00002N!sI>@=9QUOP%uW4PjN7sACWM|91mbHrE4UNQ5fyx zU^G9N*&+(YSer8#Old?h?x0}WUSf>vD44dp!N8VKFkhe$!Ws(3YE93~c^3ln-5W{j zm22NY!2I;Yp*bq31q94^bQID>xp5nF$4vBI#&=t~6v=xtj`80xzaLD^_bmCUJ!7ot tL?j*#W8ALmW>Z8~iD>z+Pn-c%eF6tM{#xwB$v*%9002ovPDHLkV1jH`kq`g? literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-hdpi/ic_notif_button_cancel.png b/mobile/android/base/resources/drawable-hdpi/ic_notif_button_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..b1bcd06079dc098921ce1501daf086a839a050ac GIT binary patch literal 763 zcmV>AT0EM$o z9CP3=uqtc*0mhyhp2a=@ziZ~BZW7ENm9kx^2D(lK-gk1RhAge1`xhDv}#-YwhkadET$aJCN;(G&H+SvJXTeW+r0yb z5R<7|kucq2DsjV`8ve$E&vL`3zpYV3dEA|;@BEML3p+G8hIxCM=TN{=4}8JgiA$=`D#3R z<90>3M9p#mrU~X(G{>Shb|b_f2cS>5SX(ajmN@jp?~>3^=;Z*2(AubX<2ISM#GoaH zW0!97Qax)5jo93ki-*n=f7{|XcIQkjM(ctiwEODax!BV*$6jSL#d7S*wcc8cW6Zis z7Y~^!?ixlto?|!8)KW|Z5aGFe!WeS~h#1rN7+Q(-Q9#mn;+~}Ul73~s&xh{|A0_>e t^yr?P2=Hq3X1|fW8XW+-)&Zbv{R1#$Nns?;kY)e?002ovPDHLkV1gB0Q;7fo literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-hdpi/ic_notif_button_pause.png b/mobile/android/base/resources/drawable-hdpi/ic_notif_button_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..5f635fc10aba60c7360e69170c69507a1f4df38c GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq zL=J;6qiBJz6HrjH#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWIa~o-U3d z8I5meI&vK{5OGmYTB-g~>XEHY%id1w{0F8k{-H!Sq>y#pus7`&)UF z9E5Z?2bzD-7Yj&cG(F3m6MjX8QHJX$$Ad}F^2->`WuE)UP_X`0Tguyti9IUI&nTQs zT$tw(xlV6cdidAP&v;8R`DWTMy%4|ld&*S1+v_IiUixF7z-S6K4G*#TS&3DW-OO`$ z&*y!pHfLZ6K9#ggkD=na*=Dx~ED7-^+!?O7ewBWv{O!`b^S9EP^miSNaOh>dVxs?n ZQ7LXG$Haem)<7>ac)I$ztaD0e0ssbzf=~be literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-hdpi/ic_notif_button_resume.png b/mobile/android/base/resources/drawable-hdpi/ic_notif_button_resume.png new file mode 100644 index 0000000000000000000000000000000000000000..ac69ea59a43370a3d777570c7e8d5a882a32cf13 GIT binary patch literal 670 zcmV;P0%84$P)WIW$s*yGZ)<%&79|ZzV~}4^R8QWbDrn(>3Qxs z&pEf%?RG6>Mw%8-l|=(hvuL1cA_ku00+trm5~3B@Mtch;un(__D#|2Mfu4c2c#6?- za`LJ28)#z%ZsI(a6j78(q=h_UpHV!)hAKgtG%$iS zc!c9sg5*;28KW&7ikEOr8V<8)+5msfheMKyEQZ0r-!Wh0E^K6m@1ryQIf*N|iz5a~ zR-l9T(vCC{3D9&4jbojlc$zWLnT~N5JMpPXutB%bB)&=aggX`D{AQ2_y3+k%58ec0 z%wQ1HXwUFvY*tV_^;cjLQ#gUEfn0M^r-3QF!)|G4tA#pSXbkJsD4z1$Xm5)=gI)L> z5tT#97V1cslLNRLR+LF816@4EUJLALvG@HVwivK@s#TyPz0w`S^R|DNig)We7;j%q!9J za}7}_GuAWJGc+*xQnV1L%F@%tF+?LcIl-afzk%8uMiGY1hAa~Q{<{bJwmHPc%AOJ6 wu+?&C|Dd3}$Y4u?w@Jql<{-YSOyBq!UOuZ*W~;fF12lxe)78&qol`;+0F=r)U;qFB literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-mdpi/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-mdpi/awesomebar_sep_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..716ad8e91c5e680cde9d76119a925c7efc63251e GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^EI_Qn!3HGP#m@Es38XvvIx;Y9?C1WI$O`0h7I;J! zGcfQS0Aa?gYn_}xLG}_)Usv|Kj65uQdPk+^rvZheN?apKg7ec#$`gxH83GbB^Gfvm zTtgJfjP*?Q3=Isv6fFd*GWK+F4ABTqZfN=+AjLDmGQq5@@&A9pM^Ct}T)leG)s6Lq pszdJ#XEq5Y1%@jh@9rIQjqp literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_center.9.png new file mode 100644 index 0000000000000000000000000000000000000000..94e9de61b6253d08d3724371d09f7361af175ef1 GIT binary patch literal 442 zcmV;r0Y(0aP)Yruu?{86IXD+Sb|3$fl`a1GCNF~BkY<9 z^MqFqlNjWvg)!`f$>R1HUjJ4)6!QIo6J=mn?#kb&ORR#-t3$$MP0>(Y;%u+DmB7D*ZPEJ$CS}^{X zJrAaPU_6L#S&aSMrew6;1IK%o?ch+DtJE)y%eUp=*q8>xI7DCq6PUmRCNO~sOke^N kn7{-c2rl?Bg(~NK0D5@*h3x;J*Z=?k07*qoM6N<$g44Xqwg3PC literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..ef913b716afdbe708f0d4bcd6888bc045b709b55 GIT binary patch literal 278 zcmV+x0qOpUP)2O7R{uC|+0HBrsRK;=6m}ICN&cLK|Fv*qH6-aTuOrU_H zY6}MVnllfOfaq&lL4jBWQ9VQgF?)Sc9V8%soQscuxWG%Tq=f^TlsoTz9|&l4%5C8J zkA3+9c;;9TFY-{2P{3;rmUvT8m1(bL-t#yPX}nIYwEOPE5m3wxWU_KZMJ|pL00000 LNkvXXu0mjfw}oYV literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-mdpi/ic_notif_button_cancel.png b/mobile/android/base/resources/drawable-mdpi/ic_notif_button_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..64e7c9a3c200c669ee311ddc1452453e46c9020c GIT binary patch literal 497 zcmVb93~CooM2v0`B;fAv8Ps(6~}U&Kt+|FE{-7) zt#7Xzay1z6v_9PbYRS5}ReksVn_N10)N#&~T^3Uoy;vafkkv@VW>)^%PQ##0s}@~n z{lTrk@Y?gY%42<_hrA7}uhxhkP?aoy^Jz{k^M_1Mg$4#D4lr@S=ENC?`ER2VJf3mB mXwW^~Ti!2SdzM9m_XgvIUy_Znsh%MJF?hQAxvXBie0SW?WX~1==y@V#T0Jx0!Y#W-5A6v=86DljPJuXHpG?5q$CkE>jhVs z#(i3VEZeXLLpaAo5dhGMe(YgA&3aiPXjTPhn8jl#K%OUIFGg{R@ge|-D>Z;4tfACu zLY@&ctAb<9e>bSzm(fM50U=+O^uCz?uv1kxRS9T^xl_H+M9WCij$3p^r= z85sBuf-vKbiP>*~g6t)pzOL+d8F^StMOG>F`T>QcN?apKg7ec#$`gxH83GbB^Gfvm zTtgJfjP*?Q3=Isv6fFd*a`kj^46*P}PH<@WZ=g1ZQG{XhNr8kP|K-o_VH8@idUdlU zi&H;WPaC_1BG3LO1`d%thof>@xwai*mEu+StC6O_*`UnHpp*T{J@47JK%jvPp00i_ I>zopr0Cy5TrvLx| literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0a9aa330ddb611d01cf5da1b16a2a68321b68e23 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^EI{nW!3HE>Cz?uv1kxRS9T^xl_H+M9WCij$3p^r= z85sBufG}g$wN6f;AbW|YuPggqMjjSZkyQ%4en26q64!{5;QX|b^2DN4hJeJ(yb?V> z*ARs=V?9$nLj!{^MGJwdEIeHtLoEE08=C$HNbyXtOfcKY^#8x|5%!=3>(=q<8EF}4 v8O&kLnACVez=6$$tKp1;A-mFt`HT$l!JphE8ft$4&0z3!^>bP0l+XkK(*HQ} literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_center.9.png new file mode 100644 index 0000000000000000000000000000000000000000..812f6a380e949649ab1265784151535a11b1144d GIT binary patch literal 794 zcmV+#1LgdQP)Cbq1RKRdu(1)eP*Cv;v=AFB{{RaMD;u#8EEELAN|9hCh=|%)h=mHqUc^cW zg4$@IvGKCI^Kmm970vpNo*^Wjcgf}McJ`iuhb0``?f#zKcV=e>Qmd7}6(u677TpQc zI&+Fx#L^H;qkGj_ug&b_!PNQ_sqvRG9B-t?9g!TCS3+#kXl#`Wx-J)%4wcLngit1k$%WN3e`E3skClpssVkHqAA z79_Ur+y+W;sh`@{Qc+jTTkP*$00da>^ zQ?11s|CW%Vokt$~r`WJNpMWBNYL(wHM{L;0OgOP`NOvQ1#L5RB2`BnjpU=&epW<&B z-bpakATfUTv{+^Q1wyF|m#4+bAFl|cI;%c2#WIChA!dpt5X1sv0kMEsKrCVj1hIfv zKrA2@5Q|s>K`bB^5DSO}#3GhJ5DSO}!~$Xgv4|xQ!~$Xgv4B`W?2wDCmFpkeL-*8v Y0Zwdd2m))=(EtDd07*qoM6N<$f|NsVPXGV_ literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..80b413d6f07d3097e8a032bceb34fb12313e6ca1 GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^dO+;P!3HEZ%Pj+vj8i>b978H@y}fRz@8T%H@W9)p zm1AjNho9oafG+t3BK8g%szQ66mVab6QPN_qYi_e&5We%y=H15c@4c~gxn`k0QT&|j z^Sga#R4%`(x#^Qurag5#N2`cn(gN4bheZF`-;RFB6~5z;=(>Vd?HFv#?#`ABCzU%( zw&)4vO+0t>VD?snoW?yCI~ez$GM77YFxG4NqX!HI$6mz9%&D&aEUL@jSE9<7cR_#O zV%LMZzk~}58jh(X%O5!?d*Pw`77mLfyR#S63k%%hL@r)DTGmp?0Um=Ed#I7i<-`6T zLk*6%Qco0{zu0$ZvdR3!1F72|>^nGnf5{TtbI1HIEzMU;@8xiQ z_#JcR3)7$FAJojwmdRWy)!%5_`Z-0Sr0-c&_OBIp53dl}v9(M@@Hpcq&Dp7&&t0AV y~@JUo1W4}{iH;pluo&V6LPfV;L44yu(e_aH|5QC?ypUXO@geCxkrqQqf literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_right.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..5d5b36266edca44315ce672b0a4a8afef78af0c7 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^dO+;P!3HEZ%Pj+vjOCs#jv*Dd-rnBrb;LpB*vAzL zaSmHVjvRBEf8f|9ae-*oc;ih$rcdN`B3ShmK|)I*X4Q*lRFCL8f5Ydzk8g0dwHcx#k*zf z)6cAbu(Nos5p&0fJBnI1*Bx5Bc|WdTpLW*%!TjudmgbEd=kHpF>nj~9&c9U`8u~cn zgWpo#uVJfI7Xw+j(wEj1pEm}w-e0>a{;Oh7=G)6ALVI>=zdi7)YAH`**zrtxu06Y> zc3)w(y!iW2-@fO0PxLc)oe{gGc;@NqDaUg+Ybx6x>V9wU|E20EdzJO&4;7rYDZn^j N@O1TaS?83{1OSQ5#nAu& literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_cancel.png b/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..f00e43782fcc7b279bcc8dd7ffedbf495c55045b GIT binary patch literal 1261 zcmVCn6F=#I^CU%t8<) zD#1WdaFdOHM79nDg9*{lF(E`EAxqzjVVI0DCcbsZN|XpjP~64&T%0cK?&-&^s?$?Q z`h$XL=H7G8_uZ;n=bkz>N!-mCD;+>-j07khKxvEwC>=m)j07khKxvEwC>=m)cnL58 zG=NLMvXjkTI0766W?ZaE${mxER`nllO4{RKx7%20@pE0$bgs?ZfbNsDrtR32wB$&< zCh1ty_Ew9ZYm(}v1lTQUy$kt(pCm0hkw4yre85#nQ#&odl%$P5uL?7}2 z8?pzoBLdWAs#nE#lI9cqj7d6GfqcNaY)KAPfN9yfi^VsR<|4_TjvybfCVMFlMSvOE zn>Q6-Nt&(TXIxUFc~1=afK^Eo75qdCa5N#9P7K<*#wDF?UYkNbpwY)i+lWboehsNZ zM%u9#_zTVh~zvSY5Uf-OVR}=+czaGt0JdZ0Z{jZ zBn4sXx<}H*Oj`k)ip)Z5QuK_j0dE4Yl0Q|i0Jnhs88!kofqlTwF*l_M07m*P;4t|j zc;H8j{4cRLrhW|ycm;SHBcJnP%srU+9(bGt@{m3Q0>&^A4pL?&d<#5*Eu$pl)&sVH zL%X2U~*> zGR*_PJ2=FjYhWJu1b8SnkO%}3Ucx@avN+`2ya0R(JeXl4HAe^{90X31vDKyuu!xa= zAk}dbIXOZQ;Sg4wNwSq9z!LBoaDR%!4qV2vyi^1c4r67ycoAX>h|PlIrc(j)qO2gg zTh-1P`ymu)k14Xq8*}lptmNzw=ml9RJlLL6+<9X^+bbH90GFHsJg;{0Vbqm&?%2)8 zkuLVLPlo=CUSBOM4O^e*fETbY#!lSEK6h_q_zCZTh3b)2p8*qUZ-t3{Dh=7$-ylD; zvV+uAT$df>4&`KMQr%l(dLfWMEj#kA>Ss=Nq#lcFitHPT6#!WiLci9SPV%QB$%ip7 zYp$q@t4in>N)Z4J-ns($6S6j!R6h%{Hk(1%P-34@YGA1M))mMf&m7 zACxNq+P-zQCL|u@!&p-H1Z+(SeL4nJ zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&nLJ$_ zLn`LHon^?^I4>+V0=D)I5h5WIr3jw=V)YoM7gR#A8d7-rAlleDKTk}z3zOcu sKl>5#ZT&|vpv5o?3>kDCHveMqmr>R5lze6;0Sqz*Pgg&ebxsLQ095geRsaA1 literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_resume.png b/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_resume.png new file mode 100644 index 0000000000000000000000000000000000000000..2ce52f803941cc582a296542acddb3c94c9ccc7b GIT binary patch literal 853 zcmV-b1FHOqP)_*~G?7_cPi$#-j0(cdPuQ7=o0rf)3 zZ9p&UrE7-6L3Kljh`=m9T;g|r#}9Z|wRlzPoPb_-Nxu@?0_sW#i7?<1)>ai+CO7eA6@j)zU@;R_1=?!B3mg(~ z*}SrPFSQ%+pY(k3a)el04Cp>wy&`RVQ&GZgiNF9(V7tJ@(~b#vf_*Z*b8NZ+xA5J< z-z+pa0^`^s|D{P2a7nu3t8MW#!+;KsVJ99` zZ)a&lL}0$ccOPRfE(G+kEK2SHH}EZP2lTLPN=0A{TNPeB^&2pUpD}``0ktbrX9Vs^ z2dAzE)C?o{1a$v*5npN8;;APBN2K!r#ScTgiJTFbmQI2E7EmJ_xeS<;?&9tQ=w~HI z1kOlDUmCx7Vhxy;9#W1cwv8A!=JXfe1l>F|QHNfLaA!}t=l`zI`7+%GnPHz4}JMm7e;)*oK?-s{EyO=R$N L^>bP0l+XkKR%k=p literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..2469120423dbb5b8f1726c0b067bb1bd2bd0112c GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^EI{nV!3HGfEdH7V5=eLSb!1@J*w6hZkrl}2Ebxdd zW?1(}1qHS8r?C?h4A|IfC05bKLP10{rG=FiqJ<#-U}58T0VJG{@$x8Lo~_Vg5Mq&cLJqp%Za zwC)?}NM|6Ofpmr+(sMJ$o!cB3yElm3ac$f=9lD#!xCg>p;j=I3KuF-w5{;c zjhWc0B6mZCCx~s5&_2z2fx=18nwKDSw`B5Dh-{f*>38-^>0g#>=`z6;L6n@530tJK z3;SHf@s3PHbTQ?8)pVnVkfp@w z$R6#A^dJb<);di@bcgG*=z5n-y4HHV9P|yrcNgjI?}+%79hW{blCG8mz9RJ8aK8od z=|axoy>gIy1f9FTb+;E->YJDT_l5x>=d#p?$*~APdJ-#kgH9NzX3w z6JRk3jCDhUK(2Bm=?Z<47LsQa!TDy@|?#uQoH_()H zZQNM`^M+4zoZHj?wmiuPzY~^McjNjSN)N*1AVGOXlngbLE+2YCQ2z1H<=GkO+2b}P ze(J>c)qZhK>DnYG3CLIJ?ps|$m)4i|mjvW-L#N|Cv!vHbdzEm!zF0FjOL`EwV+7+p zUuH>Hp}R{cCBWLg8R^Ewgi?y9Vo%pgCy;XR0_i2(V1e`!f^?(<(gEp!bU->F9gq%4 z2c!ei0qKBrKsq2DkPb)(q$8a`kPb)(qyy3c>40=VIv^d84oHX2Nw2+ta?tY!0sETe Tf(LY100000NkvXXu0mjfnMs{^ literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..6d98383b5b36c10f17748c2aa624b4734d88d2a3 GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^MnLSv!3HFM`mxJ0Ffi`-ba4!+xb^nNUVRov3APWP z1qJ86P*Kt9Z0qn_KIy^-dkxp6A}asbyo9O(CuNv;b@nx7_!Zuq+kg9}@`;LXdO}AZ zy}NUK-|X~Bp4)EK*4><0e($c+LbIAvBIYh_e#Qb$9Ev;dJ#PWgc!*19Kfd^zpr^2~ z(7UqnO?P|6`)YO7?|dS?Sep|YINl+(eSPIgCj#C{YASslk9cf^@V zShr5m#o6ht-%;l+>wFac%&y>QlCN>^Xqhrc+Vz9@#|c}uEAlN0F=@W=ev#rd+vTC`QpZNq0bftk%2Z=YS5ci+701P_aMri0}6UWfH(6^s}I&Ef*pc4doQ z2=(}Ce05hU%Z`8g3$!N~tm#?2|Ks9)

XXn zgAOs?CIyL{NAnfjW^-tD9L+PC{YE@TZQ~7=Zn4=HbGCF9%sX@L%(;D$N97;)R8?;; zSTLie|NQ}RF}2!?!?Vp3H}~A=~&AC{EkTViSl#K9L_=tFOS`y%((H( zx~=h(8Gg>`o2ofo)!~xh=SoNIKZv2N(Y=6-^%JjZZmpESYt_$HmM_Bbn*};o~_5+&0;OXk;vd$@?2>=|rIu8H< literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png new file mode 100644 index 0000000000000000000000000000000000000000..461ca3049580a4adcad918a79ff12dcc953c6619 GIT binary patch literal 589 zcmV-T0g1$?pg1T# z-Q_OHB?wCVr_^ArZB3J=ZTbs*DIMB7J~X}K3QZ)Uznq9F*;UfPV|FXG7*d91DGDgv2K6+^ zdUZgip}iiOBmAGGQ3%?+xn3qbj5Gb^ZO*h2vF-TSLj9e;wlhXDX8XdAVh z0s8dhG*{0lQs~{%VqTL5%7irqm;fujZVjY?((S$jm;ecD#RGMJOGzG40VdG7sRt^A zIRcR2d7$)U4Itry-UB3DP=Ejwpa4Yx1t>rfKmiI+1W zR9M8Xpzhn^4NN)n|G}Gi1LJw?kz}UYPz}!-3{tSF7{nk3F^EA7Vi1EE#2^MSh(WF+ zNRqokK!{wm5D=iKrw);_l#t!8I>e{w9oVUV5P5?5Qios=*HeT#L;#=a5a6)6MW{iT z`PpaprwU2Cs05F*2o;F*jE`MJ?hqi?me8dt#OJ6Zfs1{JTp)5L9wexL2#^azUe%g} ze4j$x3<40Bk=)=|DQ*Ul65LNIY)GRT%Et3^0at+lz$4Dw+vW`X{5Sk8NE$*!Pl#~^ xg5U))cts9d(hlp_ED literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d307e7994d030d3caf67c8102d2e47ee6d3d7aac GIT binary patch literal 320 zcmV-G0l)rXM%Tf*zAYy&I1%dE03gkV6aE1U8OFYDYc%Gv`geYD?KvFL#5OIO8At0$m zRaHj_5HZ9P2uNRZ4+7zjgttU-7PI52YDgeUQ?rg z+@YNz>*_T8rY^+0GRE_qkZ*%9^^}fq+~K-=%hvU!bISn{omy*8etS+x=86^CRe*f~ Szk!lvI6;>1s;*b z3=Dh+K$tP>S|=w^kiEpy*OmP)BM*x;V`QC+Hc&{a#5JNMI6tkVJh3R1As{g`uSCz! zHAJDzSkF|?(7@nJ(L$gqFHaZ85DWk0AOHW`GjlLA&TvRP!1B;2MA%`ISkhww@fE9A zH?s;I(O=B8_#xw2pT#E=E1t7ue6-X#Wf&pKpg;MffP$4x1J{3J28NsYsVla7Z*c*d O%HZkh=d#Wzp$Pz5u0cis literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..cb5d678fa1c880c284c667369bdfad28792a4992 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^EI^#Z!3HGDV~Q+60_l#vjtmSN`?>!lvI6;>1s;*b z3=DkxL735kHCP2G$X?><>&kwYk%z^aF|y7@8z>}I;u=vBoS#-wo>-L15RjOeSEA?V z8lq5UtY@lcXkhTAXdzIQt*47)h=qT0L(_i;1|@xlA*?HH`?Vlb|?=jCmTlyUL^d~=8 znLW&}yvF*UBl5@}>#ysC-|N1&|7d%Nwenv~WPOD6|9#v3@jkuuHCfT7cSh>I+-bHk ztFOtucKYRmUvq)r@q%dIoC6KohxE@DQqW*li==H5`_peGdrr!m8uigQ>u{g3-A!4J_gW_31jJm)lkxS#$G?>b32P_aD!S_#Y;c z6lML7=dAf1{pH*0+*c+&+kNb*>%S!i3BTk5Bsb=3x}K>y8y)u`or^I|@riqEmEN+l zhb$-CcP^iFD0k_lR9j)=^~*eMOit+Q&a=+)JM+h6-k*(9ob75B*Fp`C{%P;}tfV46 z>sHO3LkTMi4YzVydm3#yv7-3h$-eGLAKpwMp4<4VVHa@B%xa)}Q(o0X*c4i*76yk_YS(0fOy7wQGy3E4c=~th>$WGgQb(*pY|E~Mj zdE`xWo~@0(snqA?(7(g*^t;75ZJLV=d=4!r|6wjIRQza~z7X49;m^w}kD8>_s5Z;J z_$u{lhIDJnLhq3WwKhE3ZGZB#-K>TcG9{ zaBa@Bf09S9=>6?uaqNt#b2xMI^@_u`lbBQc&b{CL+E#m-!e2fiX2CV{_Z$2A=)G^( zumIBk(v^>Fe7wR!*hE#$v(ZEC_FwG|PQ$KB7DGk1e-1t!LPuDRusHZQ_%J{iPzpQW s1)&bC07)M@f5ny=N0}XTc>eO&-kAQuzw4C;ut;I>boFyt=akR{0C_1BDF6Tf literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..3faaa5de7634e9bcfc9a5efedf30ef9d6416556c GIT binary patch literal 638 zcmeAS@N?(olHy`uVBq!ia0vp^PC%T*!3HFs{9wJuz`*3{>EaktaqI1^^V%(r66_yb z75(~(3e>y;_57w36;5mxac4hy)m78$qkBPUUfw719S@!m<2r@5V zQ{hs|vL~O3#Z>TqKf@x1hh~g|3R|qx`2|%y*I&4{xqZT|bxey4blz}QcRbpVz%Lla z{Y@am#Z>5kX*I{vGZBJ~rY#rJ`fXj#-SXr5e?m^_QrTXSMpYKyNxC97$K{+fc7G6S zls)qLcEM4(CMNxT?FYCXUHTm+C1(CcvBgOHslW|~Cv#sf+Q3=OA$j|6zd(e8%PHU5 zwh2`o*MqE%ODWw6^~mMl-!vhMgKPW8(3UGs7sRTk9kSin7N8}$G=cxVqlc_Z-0noK zrTe-kXm#9ISi;uSraBs6SJG;APZoJD~mzPR>bFFqBo$#dc z-Mf=_C*N50{QXJOK<>trmk(v zGGDCJ`qb~xl6CL5yF5UVFCckGE+~qavEUUtyFF$x(Ui4pEo2lSr?a&hCwRKqo z$6H3hT~nTZQ59I2d^6XM#i{E7Ted+*l4b6UKdb_Cmmm7KD(r8>7lH3J$1QbS3eywq z89sgwm?rgGtmDGYQ=h^eTI$rT>X}_$IF-$N?ND<1&byW07dy20y^5^n>zEL%7C(9O z$>tl1yZ&CdWy}63ZU4u$6H`BLbpGmzUZLej#sOzq{YUCgyFKU`KP-S6!@ literal 0 HcmV?d00001