diff --git a/.gitignore b/.gitignore index 2c6cd49a5..ee894014f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,13 +14,16 @@ default.properties doc gen liblinphone-junit-report.xml +liblinphone-sdk liblinphonetester_*.zip libs +libs-debug linphone-android.iml linphone-junit-report*.xml linphonetester_*.zip lint.xml local.properties +Makefile obj proguard-project.txt project.properties @@ -38,3 +41,8 @@ tests/*$py.class tests/build.xml tests/project.properties ant_password.properties +liblinphone_tester/liblinphonetester_* +liblinphone_tester/tests.output +tests/linphonetester_* +tests/tests.output +WORK diff --git a/.gitmodules b/.gitmodules index c925cb431..263d8ce9b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,12 @@ [submodule "linphone"] path = submodules/linphone - url = git://git.linphone.org/linphone + url = git://git.linphone.org/linphone.git [submodule "submodules/externals/gsm"] path = submodules/externals/gsm url = git://git.linphone.org/gsm.git [submodule "submodules/externals/speex"] path = submodules/externals/speex - url = git://git.linphone.org/speex -[submodule "submodules/msilbc"] - path = submodules/msilbc - url = git://git.linphone.org/msilbc.git -[submodule "submodules/libilbc-rfc3951"] - path = submodules/libilbc-rfc3951 - url = git://git.linphone.org/libilbc-rfc3951.git + url = git://git.linphone.org/speex.git [submodule "submodules/externals/ffmpeg"] path = submodules/externals/ffmpeg url = git://git.linphone.org/ffmpeg.git @@ -26,14 +20,14 @@ url = git://git.linphone.org/msx264.git [submodule "submodules/externals/opencore-amr"] path = submodules/externals/opencore-amr - url = git://git.code.sf.net/p/opencore-amr/code + url = git://git.linphone.org/opencore-amr.git ignore = dirty [submodule "submodules/msamr"] path = submodules/msamr - url = git://git.linphone.org/msamr + url = git://git.linphone.org/msamr.git [submodule "submodules/externals/libvpx"] path = submodules/externals/libvpx - url = https://chromium.googlesource.com/webm/libvpx + url = git://git.linphone.org/libvpx.git ignore = dirty [submodule "submodules/bzrtp"] path = submodules/bzrtp @@ -46,34 +40,34 @@ url = git://git.linphone.org/mssilk.git [submodule "submodules/externals/vo-amrwbenc"] path = submodules/externals/vo-amrwbenc - url = git://git.code.sf.net/p/opencore-amr/vo-amrwbenc + url = git://git.linphone.org/vo-amrwbenc.git [submodule "submodules/bcg729"] path = submodules/bcg729 url = git://git.linphone.org/bcg729.git [submodule "submodules/belle-sip"] path = submodules/belle-sip - url = git://git.linphone.org/belle-sip + url = git://git.linphone.org/belle-sip.git [submodule "submodules/externals/antlr3"] path = submodules/externals/antlr3 url = git://git.linphone.org/antlr3.git + ignore = dirty [submodule "submodules/externals/libxml2"] path = submodules/externals/libxml2 - url = git://git.gnome.org/libxml2 + url = git://git.gnome.org/libxml2.git + ignore = dirty [submodule "submodules/externals/libupnp"] path = submodules/externals/libupnp - url = git://git.code.sf.net/p/pupnp/code + url = git://git.linphone.org/libupnp.git [submodule "submodules/externals/cunit"] path = submodules/externals/cunit url = git://git.linphone.org/cunit.git [submodule "submodules/externals/axmlrpc"] path = submodules/externals/axmlrpc url = git://git.linphone.org/axmlrpc.git -[submodule "submodules/externals/polarssl"] - path = submodules/externals/polarssl - url = git://git.linphone.org/polarssl.git [submodule "submodules/externals/opus"] path = submodules/externals/opus - url = git://git.opus-codec.org/opus.git + url = git://git.linphone.org/opus.git + ignore = dirty [submodule "submodules/mswebrtc"] path = submodules/mswebrtc url = git://git.linphone.org/mswebrtc.git @@ -85,9 +79,28 @@ url = https://github.com/cisco/openh264 ignore = dirty [submodule "submodules/externals/libmatroska"] - path = submodules/externals/libmatroska - url = https://github.com/Matroska-Org/foundation-source.git + path = submodules/externals/libmatroska-c + url = git://git.linphone.org/libmatroska-c.git ignore = dirty -[submodule "submodules/externals/webrtc"] - path = submodules/externals/webrtc - url = git://git.linphone.org/webrtc.git +[submodule "submodules/mscodec2"] + path = submodules/mscodec2 + url = git://git.linphone.org/mscodec2.git +[submodule "submodules/bctoolbox"] + path = submodules/bctoolbox + url = git://git.linphone.org/bctoolbox.git +[submodule "submodules/externals/mbedtls"] + path = submodules/externals/mbedtls + url = git://git.linphone.org/mbedtls.git + ignore = dirty +[submodule "submodules/cmake-builder"] + path = submodules/cmake-builder + url = git://git.linphone.org/linphone-cmake-builder.git +[submodule "submodules/externals/bv16-floatingpoint"] + path = submodules/externals/bv16-floatingpoint + url = git://git.linphone.org/bv16-floatingpoint.git +[submodule "submodules/belr"] + path = submodules/belr + url = git://git.linphone.org/belr.git +[submodule "submodules/belcard"] + path = submodules/belcard + url = git://git.linphone.org/belcard.git diff --git a/.tx/config b/.tx/config index a1399b7b7..5c0e0fe80 100644 --- a/.tx/config +++ b/.tx/config @@ -8,8 +8,3 @@ type = ANDROID file_filter = res/values-/strings.xml source_file = res/values/strings.xml source_lang = en - -[linphone-android.customxml] -file_filter = res/values-/custom.xml -source_file = res/values/custom.xml -source_lang = en diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5d5b516f8..7d99c6672 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,9 @@ - + + android:versionCode="3100" android:installLocation="auto"> + @@ -45,7 +46,7 @@ - + - + @@ -91,7 +92,7 @@ - - + + + + + + @@ -117,19 +127,9 @@ --> - - - - - - - + android:screenOrientation="behind"> @@ -143,7 +143,7 @@ - @@ -151,7 +151,7 @@ - @@ -199,6 +199,7 @@ + @@ -253,6 +254,13 @@ + + + + + + diff --git a/Makefile b/Makefile deleted file mode 100644 index 08ed199c8..000000000 --- a/Makefile +++ /dev/null @@ -1,529 +0,0 @@ -NDK_PATH=$(shell dirname `which ndk-build`) -NDK_MAJOR_VERSION=$(shell cat $(NDK_PATH)/RELEASE.TXT | sed "s/r\([0-9]\{1,2\}\).*/\1/") -SDK_PATH=$(shell dirname `which android`) -SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`) -ARM_COMPILER_PATH=`find "$(NDK_PATH)" -name "arm-linux-androideabi-gcc-4*" -print | tail -1` -ARM_TOOLCHAIN_PATH=$(shell dirname $(ARM_COMPILER_PATH))/arm-linux-androideabi- -X86_COMPILER_PATH=`find "$(NDK_PATH)" -name "i686-linux-android-gcc-4*" -print | tail -1` -X86_TOOLCHAIN_PATH=$(shell dirname $(X86_COMPILER_PATH))/i686-linux-android- -NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo 2>/dev/null || echo "4" ) -TOPDIR=$(shell pwd) -LIBLINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always) -LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always) -BELLESIP_VERSION_SCRIPT:=cat submodules/belle-sip/configure.ac | grep "AC_INIT(" | sed -e "s/.*belle-sip\]//" | sed -e "s/].*//" | sed -e "s/.*\[//" -BELLESIP_VERSION=$(shell $(BELLESIP_VERSION_SCRIPT)) -ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep -E 'android-[0-9]+' | tail -n1) -#We force target 19 because 21 creates binaries incompatible with older versions due to rand() function no longer inline (congrats to Google's developers) -NDKBUILD_TARGET=android-19 -#The NDK target used to compile external third parties (ffmpeg, x264) -EXTERNAL_MAKE_TARGET=14 -ARM_SYSROOT=${NDK_PATH}/platforms/android-$(EXTERNAL_MAKE_TARGET)/arch-arm -X86_SYSROOT=${NDK_PATH}/platforms/android-$(EXTERNAL_MAKE_TARGET)/arch-x86 -SQLITE_VERSION=3071700 -SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION) -SQLITE_URL=http://www.sqlite.org/2013/$(SQLITE_BASENAME).zip -ENABLE_GPL_THIRD_PARTIES=1 -#override CC variable to disable compiler specific FLAGS in configure using the system compiler instead of the android one -CC= -PACKAGE_NAME=$(shell sed -nE 's||\1|p' custom_rules.xml) -#default options, can be overidden using make OPTION=value . - -ifeq ($(ENABLE_GPL_THIRD_PARTIES),1) -BUILD_G729=1 -else -#x264 and g729 requires additional licensing agreements. -BUILD_X264=0 -BUILD_G729=0 -endif - -NDK_DEBUG=0 -BUILD_VIDEO=1 -BUILD_OPENH264=1 -BUILD_NON_FREE_CODECS=1 -ENABLE_OPENH264_DECODER=1 -BUILD_UPNP=1 -BUILD_AMRNB=full # 0, light or full -BUILD_AMRWB=1 -BUILD_ZRTP=1 -BUILD_SILK=1 -BUILD_TUNNEL=0 -BUILD_WEBRTC_AECM=1 -BUILD_OPUS=1 -BUILD_MATROSKA=1 -BUILD_WEBRTC_ISAC=1 -BUILD_FOR_X86=1 -BUILD_FOR_ARM=1 -USE_JAVAH=1 -BUILD_TLS=1 -BUILD_SQLITE=1 -BUILD_CONTACT_HEADER=0 -BUILD_RTP_MAP=0 -BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0 -BUILD_ILBC=1 -LIBLINPHONE_EXTENDED_SRC_FILES= -LIBLINPHONE_EXTENDED_C_INCLUDES= -LIBLINPHONE_EXTENDED_CFLAGS= -APP_STL=stlport_static -ANT_SILENT=$(shell ant -h | grep -q -- -S && echo 1 || echo 0) - -# Checks -CHECK_MSG=$(shell ./check_tools.sh) - -ifneq ($(CHECK_MSG),) - $(error Some tools are missing.) -else - ifeq ($(BUILD_OPENH264),1) - ifneq ($(shell echo $(NDK_MAJOR_VERSION)\>=10 | bc),1) -$(error ndk version [$(NDK_MAJOR_VERSION)] not compatible with openh264.) - endif - endif - include check_tools.mk -endif - -OPENSSL_DIR=$(shell openssl version -d | sed "s/OPENSSLDIR: \"\(.*\)\"/\1/") -ifneq ($(shell ls $(OPENSSL_DIR)/certs),) - HTTPS_CA_DIR=$(OPENSSL_DIR)/certs -else - HTTPS_CA_DIR=$(OPENSSL_DIR) -endif - -ifeq ($(ANT_SILENT), 1) - ANT=ant -e -S -else - ANT=ant -e -endif - -# Temporary check: in case of MediastreamActivity.java file existing while it should not anymore, print an error message -# and abort build since otherwise java compilation will fail. -ifneq ($(shell ls ./submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java 2>/dev/null),) -$(error ./submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java found: please either remove it or move it to MediastreamActivity.java.ignored before continuing.) -endif - -ifeq ($(BUILD_NON_FREE_CODECS), 0) -BUILD_OPENH264=0 -ENABLE_OPENH264_DECODER=0 -BUILD_AMRNB=0 -BUILD_AMRWB=0 -BUILD_G729=0 -BUILD_X264=0 -endif - -all: update-project generate-apk -ifeq ($(ENABLE_GPL_THIRD_PARTIES),1) - @echo "***************************************************************************" - @echo "***** CAUTION, this liblinphone SDK is built using 3rd party GPL code *****" - @echo "***** Even if you acquired a proprietary license from Belledonne *****" - @echo "***** Communications, this SDK is GPL and GPL only. *****" - @echo "***** To disable 3rd party gpl code, please use: *****" - @echo "***** $$ make ENABLE_GPL_THIRD_PARTIES=0 *****" - @echo "***************************************************************************" -else - @echo - @echo "*****************************************************************" - @echo "***** Linphone SDK without 3rd party GPL software *****" - @echo "***** If you acquired a proprietary license from Belledonne *****" - @echo "***** Communications, this SDK can be used to create *****" - @echo "***** a proprietary linphone-based application. *****" - @echo "*****************************************************************" -endif - -install: install-apk run-linphone - -#libilbc -LIBILBC_SRC_DIR=$(TOPDIR)/submodules/libilbc-rfc3951 -LIBILBC_BUILD_DIR=$(LIBILBC_SRC_DIR) -$(LIBILBC_SRC_DIR)/configure: - cd $(LIBILBC_SRC_DIR) && ./autogen.sh - -$(LIBILBC_BUILD_DIR)/Makefile: $(LIBILBC_SRC_DIR)/configure - cd $(LIBILBC_BUILD_DIR) && \ - ./configure \ - -$(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile - cd $(LIBILBC_BUILD_DIR)/downloads && make \ - || ( echo "iLBC prepare stage failed" ; exit 1 ) - -ifeq ($(BUILD_ILBC),1) -prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c -else -prepare-ilbc: -endif - -#ffmpeg -ifeq ($(BUILD_VIDEO),1) -BUILD_FFMPEG_DEPS=$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt $(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so -ifeq ($(BUILD_FOR_X86), 1) - BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libffmpeg-linphone-x86.so -endif -endif -FFMPEG_SRC_DIR=$(TOPDIR)/submodules/externals/ffmpeg -FFMPEG_BUILD_DIR=$(TOPDIR)/submodules/externals/build/ffmpeg -FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runtime-cpudetect \ - --disable-everything --disable-doc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver \ - --disable-avdevice --disable-avfilter --disable-avformat --disable-swresample --disable-network \ - --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 \ - --enable-decoder=h263p --enable-encoder=h263p --enable-decoder=h263 --enable-encoder=h263 --extra-cflags="-w" \ - --disable-static --enable-shared --disable-symver -FFMPEG_ARM_CONFIGURE_OPTIONS=--build-suffix=-linphone-arm --arch=arm --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic -FFMPEG_X86_CONFIGURE_OPTIONS=--build-suffix=-linphone-x86 --arch=x86 --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH) --disable-mmx --disable-sse2 --disable-ssse3 --extra-cflags='-O3' - -$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt: - @patch -p0 < $(TOPDIR)/patches/ffmpeg_non_versioned_soname.patch - touch $@ - -$(FFMPEG_BUILD_DIR)/arm/config.h: - mkdir -p $(FFMPEG_BUILD_DIR)/arm && \ - cd $(FFMPEG_BUILD_DIR)/arm && \ - $(FFMPEG_SRC_DIR)/configure $(FFMPEG_CONFIGURE_OPTIONS) $(FFMPEG_ARM_CONFIGURE_OPTIONS) - sed -i.bak 's/#define HAVE_SYSCTL 1/#define HAVE_SYSCTL 0/g' $(FFMPEG_BUILD_DIR)/arm/config.h - sed -i.bak 's/#define HAVE_GETHRTIME 1/#define HAVE_GETHRTIME 0/g' $(FFMPEG_BUILD_DIR)/arm/config.h - -$(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so: $(FFMPEG_BUILD_DIR)/arm/config.h - cd $(FFMPEG_BUILD_DIR)/arm && \ - make -j${NUMCPUS} \ - || ( echo "Build of ffmpeg for arm failed." ; exit 1 ) - -$(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so: $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so - cd $(FFMPEG_BUILD_DIR)/arm && \ - rm libavcodec/log2_tab.o && \ - $(ARM_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(ARM_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/arm/*.o libavcodec/*.o libavcodec/arm/*.o libswscale/*.o -o libffmpeg-linphone-arm.so - -$(FFMPEG_BUILD_DIR)/x86/config.h: - mkdir -p $(FFMPEG_BUILD_DIR)/x86 && \ - cd $(FFMPEG_BUILD_DIR)/x86 && \ - $(FFMPEG_SRC_DIR)/configure $(FFMPEG_CONFIGURE_OPTIONS) $(FFMPEG_X86_CONFIGURE_OPTIONS) - sed -i.bak 's/#define HAVE_SYSCTL 1/#define HAVE_SYSCTL 0/g' $(FFMPEG_BUILD_DIR)/x86/config.h - sed -i.bak 's/#define HAVE_GETHRTIME 1/#define HAVE_GETHRTIME 0/g' $(FFMPEG_BUILD_DIR)/x86/config.h - -$(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so: $(FFMPEG_BUILD_DIR)/x86/config.h - cd $(FFMPEG_BUILD_DIR)/x86 && \ - make -j${NUMCPUS} \ - || ( echo "Build of ffmpeg for x86 failed." ; exit 1 ) - -$(FFMPEG_BUILD_DIR)/x86/libffmpeg-linphone-x86.so: $(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so - cd $(FFMPEG_BUILD_DIR)/x86 && \ - rm libavcodec/log2_tab.o && \ - $(X86_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(X86_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/x86/*.o libavcodec/*.o libavcodec/x86/*.o libswscale/*.o -o libffmpeg-linphone-x86.so - -build-ffmpeg: $(BUILD_FFMPEG_DEPS) - -clean-ffmpeg: - rm -rf $(FFMPEG_BUILD_DIR)/arm && \ - rm -rf $(FFMPEG_BUILD_DIR)/x86 - -#x264 -ifeq ($(BUILD_VIDEO),1) -ifeq ($(BUILD_X264), 1) -BUILD_X264_DEPS=$(X264_SRC_DIR)/log2f_fix_patch_applied.txt $(X264_BUILD_DIR)/arm/libx264.a -ifeq ($(BUILD_FOR_X86), 1) - BUILD_X264_DEPS+=$(X264_BUILD_DIR)/x86/libx264.a -endif -endif - -X264_SRC_DIR=$(TOPDIR)/submodules/externals/x264 -X264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/x264 -X264_CONFIGURE_OPTIONS=--enable-static -X264_ARM_CONFIGURE_OPTIONS=--host=arm-none-linux-gnueabi --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic -X264_X86_CONFIGURE_OPTIONS=--host=i686-linux-gnueabi --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH) - -$(X264_SRC_DIR)/log2f_fix_patch_applied.txt: - @patch -p0 < $(TOPDIR)/patches/x264_log2f_fix.patch - touch $@ - -$(X264_BUILD_DIR)/arm/libx264.a: - mkdir -p $(X264_BUILD_DIR)/arm && \ - cd $(X264_SRC_DIR) && \ - $(X264_SRC_DIR)/configure $(X264_CONFIGURE_OPTIONS) $(X264_ARM_CONFIGURE_OPTIONS) && \ - make -j$(NUMCPUS) STRIP= && \ - cp libx264.a $(X264_BUILD_DIR)/arm/libx264.a && \ - make clean \ - || ( echo "Build of x264 for arm failed." ; exit 1 ) - -$(X264_BUILD_DIR)/x86/libx264.a: - mkdir -p $(X264_BUILD_DIR)/x86 && \ - cd $(X264_SRC_DIR) && \ - $(X264_SRC_DIR)/configure $(X264_CONFIGURE_OPTIONS) $(X264_X86_CONFIGURE_OPTIONS) && \ - make -j$(NUMCPUS) STRIP= && \ - cp libx264.a $(X264_BUILD_DIR)/x86/libx264.a && \ - make clean \ - || ( echo "Build of x264 for x86 failed." ; exit 1 ) - -endif -build-x264: $(BUILD_X264_DEPS) - -clean-x264: - rm -rf $(X264_BUILD_DIR)/arm && \ - rm -rf $(X264_BUILD_DIR)/x86 - -#openh264 -ifeq ($(BUILD_VIDEO),1) -ifeq ($(BUILD_OPENH264), 1) -BUILD_OPENH264_DEPS=build-openh264-arm -ifeq ($(BUILD_FOR_X86), 1) - BUILD_OPENH264_DEPS+=build-openh264-x86 -endif -endif -endif - -OPENH264_SRC_DIR=$(TOPDIR)/submodules/externals/openh264 -OPENH264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/openh264 -OPENH264_BUILD_DIR_ARM=$(OPENH264_BUILD_DIR)/arm -OPENH264_BUILD_DIR_X86=$(OPENH264_BUILD_DIR)/x86 - -$(OPENH264_SRC_DIR)/patch.stamp: $(TOPDIR)/patches/openh264-permissive.patch - cd $(OPENH264_SRC_DIR) && patch -p1 < $(TOPDIR)/patches/openh264-permissive.patch && touch $(OPENH264_SRC_DIR)/patch.stamp - -openh264-patch: $(OPENH264_SRC_DIR)/patch.stamp - -openh264-install-headers: - mkdir -p $(OPENH264_SRC_DIR)/include/wels - rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/codec/api/svc/* $(OPENH264_SRC_DIR)/include/wels/. - -copy-openh264-x86: openh264-patch openh264-install-headers - mkdir -p $(OPENH264_BUILD_DIR) - mkdir -p $(OPENH264_BUILD_DIR_X86) - cd $(OPENH264_BUILD_DIR_X86) \ - && rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* . - -copy-openh264-arm: openh264-patch openh264-install-headers - mkdir -p $(OPENH264_BUILD_DIR) - mkdir -p $(OPENH264_BUILD_DIR_ARM) - cd $(OPENH264_BUILD_DIR_ARM) \ - && rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* . - -build-openh264-x86: copy-openh264-x86 - cd $(OPENH264_BUILD_DIR_X86) && \ - make libraries -j$(NUMCPUS) OS=android ARCH=x86 NDKROOT=$(NDK_PATH) TARGET=$(NDKBUILD_TARGET) - -build-openh264-arm: copy-openh264-arm - cd $(OPENH264_BUILD_DIR_ARM) && \ - make libraries -j$(NUMCPUS) OS=android ARCH=arm NDKROOT=$(NDK_PATH) TARGET=$(NDKBUILD_TARGET) - -build-openh264: $(BUILD_OPENH264_DEPS) - -clean-openh264: - cd $(OPENH264_SRC_DIR) && git clean -dfx && git reset --hard - rm -rf $(OPENH264_BUILD_DIR_ARM) - rm -rf $(OPENH264_BUILD_DIR_X86) - -#libvpx -ifeq ($(BUILD_VIDEO),1) -BUILD_VPX_DEPS=$(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt $(LIBVPX_BUILD_DIR)/arm/libvpx.a -ifeq ($(BUILD_FOR_X86), 1) - BUILD_VPX_DEPS+=$(LIBVPX_BUILD_DIR)/x86/libvpx.a -endif -endif -LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx -LIBVPX_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libvpx -LIBVPX_CONFIGURE_OPTIONS=--disable-vp9 --disable-examples --disable-unit-tests --disable-postproc --enable-error-concealment --enable-debug - -$(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt: - @patch -p1 < $(TOPDIR)/patches/libvpx_configure_android_x86.patch - touch $@ - -$(LIBVPX_BUILD_DIR)/arm/libvpx.a: - mkdir -p $(LIBVPX_BUILD_DIR)/arm && \ - cd $(LIBVPX_BUILD_DIR)/arm && \ - $(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \ - make -j${NUMCPUS} \ - || ( echo "Build of libvpx for arm failed." ; exit 1 ) - -$(LIBVPX_BUILD_DIR)/x86/libvpx.a: - mkdir -p $(LIBVPX_BUILD_DIR)/x86 && \ - cd $(LIBVPX_BUILD_DIR)/x86 && \ - $(LIBVPX_SRC_DIR)/configure --target=x86-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \ - make -j${NUMCPUS} \ - || ( echo "Build of libvpx for x86 failed." ; exit 1 ) - -build-vpx: $(BUILD_VPX_DEPS) - -clean-vpx: - cd $(LIBVPX_SRC_DIR) && git clean -dfx && git reset --hard - rm -rf submodules/externals/build/libvpx/arm && \ - rm -rf submodules/externals/build/libvpx/x86 - - - - -#srtp -$(TOPDIR)/submodules/externals/srtp/config.h : $(TOPDIR)/submodules/externals/build/srtp/config.h - @cd $(TOPDIR)/submodules/externals/srtp/ && \ - cp ../build/srtp/config.h . \ - || ( echo "SRTP prepare state failed." ; exit 1 ) - -prepare-srtp: $(TOPDIR)/submodules/externals/srtp/config.h - -#ms2 -prepare-mediastreamer2: - @cd $(TOPDIR)/submodules/linphone/mediastreamer2/src/ && \ - eval `cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/\$$(abs_builddir)/./'` && \ - eval `cat Makefile.am | grep xxd | grep yuv2rgb.fs | sed 's/\$$(abs_builddir)/./'` && \ - if ! [ -e yuv2rgb.vs.h ]; then echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi && \ - if ! [ -e yuv2rgb.fs.h ]; then echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi - -#antlr3 -ANLTR3_SRC_DIR=$(TOPDIR)/submodules/externals/antlr3/runtime/C/include/ -ANTLR3_BUILD_DIR=$(ANTLR3_SRC_DIR) -$(ANLTR3_SRC_DIR)/antlr3config.h: $(TOPDIR)/submodules/externals/build/antlr3/antlr3config.h - cp $(TOPDIR)/submodules/externals/build/antlr3/antlr3config.h $(ANLTR3_SRC_DIR) -prepare-antlr3: $(ANLTR3_SRC_DIR)/antlr3config.h - -%.tokens: %.g - $(ANTLR) -make -fo $(dir $^) $^ - -#Belle-sip -BELLESIP_SRC_DIR=$(TOPDIR)/submodules/belle-sip -BELLESIP_BUILD_DIR=$(BELLESIP_SRC_DIR) -prepare-belle-sip: $(BELLESIP_SRC_DIR)/src/grammars/belle_sip_message.tokens $(BELLESIP_SRC_DIR)/src/grammars/belle_sdp.tokens - -#CUnit -prepare-cunit: $(TOPDIR)/submodules/externals/cunit/CUnit/Headers/*.h - [ -d $(TOPDIR)/submodules/externals/build/cunit/CUnit ] || mkdir $(TOPDIR)/submodules/externals/build/cunit/CUnit - cp $^ $(TOPDIR)/submodules/externals/build/cunit/CUnit - -$(TOPDIR)/res/raw/rootca.pem: - HTTPS_CA_DIR=$(HTTPS_CA_DIR) $(TOPDIR)/submodules/linphone/scripts/mk-ca-bundle.pl $@ - -prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/tester_hosts $(TOPDIR)/res/raw/rootca.pem $(TOPDIR)/submodules/linphone/tester/messages.db - rm -rf liblinphone_tester/assets/config_files - mkdir -p liblinphone_tester/assets/config_files - for file in $^; do \ - cp -rf $$file $(TOPDIR)/liblinphone_tester/assets/config_files/. \ - ;done - cp -rf $(TOPDIR)/submodules/linphone/tester/certificates $(TOPDIR)/liblinphone_tester/assets/config_files - cp -rf $(TOPDIR)/submodules/linphone/tester/sounds $(TOPDIR)/liblinphone_tester/assets/config_files - cp -rf $(TOPDIR)/submodules/linphone/tester/images $(TOPDIR)/liblinphone_tester/assets/config_files - cp -rf $(TOPDIR)/submodules/linphone/tester/rcfiles $(TOPDIR)/liblinphone_tester/assets/config_files - - -#Matroska2 -MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska -MATROSKA_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libmatroska -ifeq ($(BUILD_MATROSKA), 1) -prepare-matroska2: $(MATROSKA_SRC_DIR)/patch_applied.txt -else -prepare-matroska2: -endif - -$(MATROSKA_SRC_DIR)/patch_applied.txt: $(MATROSKA_BUILD_DIR)/fix_libmatroska2.patch - cd $(MATROSKA_SRC_DIR); patch -p1 < $<; touch $@ - -#Build targets -prepare-sources: build-ffmpeg build-x264 build-openh264 prepare-ilbc build-vpx prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip $(TOPDIR)/res/raw/rootca.pem prepare-matroska2 - -GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \ - BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \ - BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) BUILD_OPENH264=$(BUILD_OPENH264) ENABLE_OPENH264_DECODER=$(ENABLE_OPENH264_DECODER) BUILD_MATROSKA=$(BUILD_MATROSKA) \ - BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) BUILD_ILBC=$(BUILD_ILBC) \ - BUILD_FOR_ARM=$(BUILD_FOR_ARM) BUILD_NON_FREE_CODECS=$(BUILD_NON_FREE_CODECS) - - -LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \ - LIBLINPHONE_VERSION=$(LIBLINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \ - BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) \ - BUILD_CONTACT_HEADER=$(BUILD_CONTACT_HEADER) BUILD_RTP_MAP=$(BUILD_RTP_MAP) \ - LIBLINPHONE_EXTENDED_SRC_FILES="$(LIBLINPHONE_EXTENDED_SRC_FILES)" \ - LIBLINPHONE_EXTENDED_C_INCLUDES="$(LIBLINPHONE_EXTENDED_C_INCLUDES)" \ - LIBLINPHONE_EXTENDED_CFLAGS="$(LIBLINPHONE_EXTENDED_CFLAGS)" \ - APP_STL="$(APP_STL)" \ - BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=$(BUILD_DONT_CHECK_HEADERS_IN_MESSAGE) - -MEDIASTREAMER2_OPTIONS = $(GENERATE_OPTIONS) BUILD_MEDIASTREAMER2_SDK=1 - - -generate-libs: prepare-sources javah - $(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=$(NDKBUILD_TARGET) - ./bsed.sh # Fix path to libffmpeg library in linphone.so because of Android M Preview issue: https://code.google.com/p/android-developer-preview/issues/detail?id=2239 - -generate-mediastreamer2-libs: prepare-sources - @cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \ - $(NDK_PATH)/ndk-build $(MEDIASTREAMER2_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=$(NDKBUILD_TARGET) - -update-project: $(TOPDIR)/res/raw/rootca.pem - $(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET) - $(SDK_PATH)/android update test-project --path tests -m . - $(SDK_PATH)/android update project --path liblinphone_tester --target $(ANDROID_MOST_RECENT_TARGET) - -update-mediastreamer2-project: - @cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \ - $(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET) - -liblinphone_tester: update-project prepare-sources prepare-cunit prepare-liblinphone_tester javah - $(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=$(NDKBUILD_TARGET) - $(MAKE) -C liblinphone_tester - -javah: - $(ANT) javah - -generate-apk: java-clean generate-libs - echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties - $(ANT) debug - -generate-mediastreamer2-apk: java-clean generate-mediastreamer2-libs - @cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \ - echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties && \ - $(ANT) debug - -uninstall: - adb uninstall $(PACKAGE_NAME) - -install-apk: - ant installd - -release: update-project - $(ANT) clean - patch -p1 < release.patch - cat ant.properties | grep version.name > default.properties - $(ANT) release - patch -Rp1 < release.patch - -run-linphone: - ant run - -run-liblinphone-tests: liblinphone_tester - $(MAKE) -C liblinphone_tester run-all-tests - -run-basic-tests: update-project - $(ANT) partial-clean - $(MAKE) -C tests run-basic-tests ANT_SILENT=$(ANT_SILENT) - -run-all-tests: update-project - $(ANT) partial-clean - $(MAKE) -C tests run-all-tests ANT_SILENT=$(ANT_SILENT) - -clean-ndk-build: - - $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS) - $(ANT) clean - @if [ -f $(TOPDIR)/submodules/linphone/mediastreamer2/java/project.properties ]; then \ - cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && $(ANT) clean; \ - fi - -.NOTPARALLEL clean-native: clean-ndk-build clean-ffmpeg clean-x264 clean-openh264 clean-vpx - - -java-clean: - $(ANT) clean - -clean: clean-native java-clean - -veryclean: clean - -.PHONY: clean install-apk run-linphone - -generate-sdk: liblinphone-android-sdk - -liblinphone-android-sdk: generate-apk - $(ANT) liblinphone-android-sdk - -linphone-android-sdk: generate-apk - $(ANT) linphone-android-sdk - -mediastreamer2-sdk: update-mediastreamer2-project generate-mediastreamer2-apk - @cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \ - $(ANT) mediastreamer2-sdk - -pull-transifex: - tx pull -af - -push-transifex: - tx push -s -t -f --no-interactive diff --git a/README b/README index 1ceb2271b..1693d40d6 100644 --- a/README +++ b/README @@ -8,22 +8,24 @@ COMPILATION INSTRUCTIONS To build liblinphone for Android, you must: ------------------------------------------- 0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path. -1) download the Android ndk (=r10c) from google and add it to your path (no symlink !!!). -2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig +1) download the Android ndk (version r11) from google and add it to your path (no symlink !!!). +2) install yasm, nasm, ant, python, cmake and vim-common On 64 bits linux systems you'll need the ia32-libs package With the latest Debian (multiarch), you need this: dpkg --add-architecture i386 aptitude update aptitude install libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386 -3) run the Makefile script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project. +3) run `./prepare.py` in the top level directory. This will configure the build and generate a Makefile in the top level directory. + Some options can be passed to choose what you want to include in the build and the platforms for which you want to build. Use `./prepare.py --help` to see what these options are. +4) run the Makefile script in the top level directory. $ make -4) (Optional) To install the generated apk into a plugged device, run +5) (Optional) To install the generated apk into a plugged device, run $ make install -5) (Optional) To generate a liblinphone SDK zip containing a full jar and native libraries, run +6) (Optional) To generate a liblinphone SDK zip containing a full jar and native libraries, run $ make liblinphone-android-sdk -6) (Optional) To generate a libmediastreamer2 SDK zip containing a full jar and native libraries, run +7) (Optional) To generate a libmediastreamer2 SDK zip containing a full jar and native libraries, run $ make mediastreamer2-sdk -7) (Optional) To generate a signed apk to publish on the Google Play, run +8) (Optional) To generate a signed apk to publish on the Google Play, run $ make release Make sure you filled the ant.properties values for version.name, key.store and key.alias in order to correctly sign the generated apk. You also may want to create a file name ant_password.properties with the following: @@ -42,7 +44,7 @@ To create an apk with a different package name You need to edit the custom_rules.xml file: 1) look for the property named "linphone.package.name" and change it value accordingly 2) also update the values in the AndroidManifest file where the comment appears -3) update the path to the sounds in the linphonerc-factory files in the res folders and optionally change default sip account on linphonerc-default +3) change the package name also in the files: res/xml/syncadapter.xml, res/xml/contacts.xml and res/values/non_localizable_custom where appears 4) run again the Makefile script by calling "make" To run the liblinphone test suite on android @@ -51,8 +53,7 @@ Simply run $ make liblinphone_tester This will be build everything, generate an apk, and install it on the connected device if any. -You can speed up the compilation by using ccache (compiler cache, see https://ccache.samba.org/). Simply export: -export NDK_CCACHE=ccache +You can speed up the compilation by using ccache (compiler cache, see https://ccache.samba.org/). Give the "-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" options to the prepare.py script. TROUBLESHOOTING *************** @@ -73,74 +74,7 @@ Caused by: java.lang.UnsatisfiedLinkError: Couldn't load linphone-armeabi-v7a: f BUILD OPTIONS ************* -Some options can be passed to make, like "make SOME_OPTION=SOME_VALUE". +The build options are to be passed to the prepare.py script. +For example to enable the x264 encoder give the "-DENABLE_X264=YES" to prepare.py. -ENABLE_GPL_THIRD_PARTIES - values: 0 (GPL third parties disabled) or 1 (GPL third parties enabled), default value: 1 - GPL third parties are: X264 and G729 - -BUILD_VIDEO - values: 0 (no video) or 1 (video enabled), default value: 1 - -BUILD_OPENH264 - values: 0 (don't build openH264) or 1 (build openH264), default value: 1 - -ENABLE_OPENH264_DECODER - values: 0 (disable openh264 decoder) or 1 (enable openh264 decoder), default value: 1 - -BUILD_X264 - values: 0 (don't build x264) or 1 (build x264), default value: 0 - -BUILD_AMRNB - values: 0 (don't build amrnb codec), light (try to use amrnb codec from android), full (build your own amrnb codec), default value: full - -BUILD_AMRWB - values: 0 (don't build amrwb codec), 1 (build your own amrwb codec): default value: 1 - -BUILD_ZRTP - values: 0 (don't support ZRTP), 1 (support ZRTP), default value: 1 - -BUILD_SILK - values: 0 (don't build silk plugin), 1 (build silk) [silk is Skype nonfree patented audio codec], default value: 1 - -BUILD_G729 - values: 0 (don't build g729 plugin), 1 (build g729) [g729 is nonfree patented audio codec, contact Sipro lab for more details] - default value: 1 - -BUILD_TUNNEL - values: 0 (don't build tunnel), 1 (build tunnel) [requires a non-free tunnel implementation in submodules/linphone/tunnel] - default value: 0 - -BUILD_WEBRTC_AECM - values: 0 (don't build echo canceler), 1 (build echo canceler) - default value: 1 - -USE_JAVAH - values: 0 (don't generate header), 1 (generate header for linphone_core_jni) [used to check errors at liblinphone compilation] - default value: 1 - -BUILD_FOR_X86 - values: 0 (don't generate liblinphone libraries for x86 architecture), 1 (build liblinphone libraries for x86 architecture) - default value: 1 - -BUILD_SQLITE - values: 0 (don't build sqlite3), 1 (build sqlite3) [used to store chat messages inside liblinphone] - default value: 1 - -BUILD_TLS - values: 0 (don't build tls), 1 (do build tls), default value: 1 - -BUILD_WEBRTC_ISAC - values: 0 (don't build isac), 1 (do build isac), default value: 1 - -BUILD_OPUS - values: 0 (don't build opus), 1 (do build opus), default value: 1 - -BUILD_UPNP - values: 0 (don't build upnp), 1 (do build upnp), default value: 1 - -BUILD_MATROSKA - values: 0 (don't build matroska and ebml), 1 (do build matroska and ebml), default value: 0 - -BUILD_ILBC - values: 0 (don't build iLBC), 1 (do build iLBC), default value: 1 +The available options can be listed with the `./prepare.py --list-features` diff --git a/ant.properties b/ant.properties index d2cc146d1..41ee35579 100644 --- a/ant.properties +++ b/ant.properties @@ -1,4 +1,4 @@ source.dir=src:submodules/linphone/mediastreamer2/java/src:submodules/linphone/java/j2se:submodules/linphone/java/common:submodules/linphone/java/impl:submodules/linphone/coreapi/help/java:submodules/externals/axmlrpc/src/main/java key.store=bc-android.keystore key.alias=nw8000 -version.name=2.4.0 +version.name=2.5.0 diff --git a/build.gradle b/build.gradle index c341bf0f5..1bad48fd3 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.3.0' } } apply plugin: 'android' @@ -13,7 +13,7 @@ dependencies { } android { - compileSdkVersion 22 + compileSdkVersion 23 buildToolsVersion "20.0.0" sourceSets { diff --git a/check_tools.sh b/check_tools.sh index cba82f787..0c19fb138 100755 --- a/check_tools.sh +++ b/check_tools.sh @@ -18,7 +18,11 @@ check_installed() { for prog in automake autoconf pkg-config java ant yasm nasm wget; do check_installed "$prog" "it" done -check_installed "libtoolize" "libtool" +if [ $(uname) = "Darwin" ]; then + check_installed "libtool" "libtool" +else + check_installed "libtoolize" "libtool" +fi check_installed "ndk-build" "android NDK" if check_installed "android" "android SDK"; then check_installed "adb" "android SDK platform tools" diff --git a/custom_rules.xml b/custom_rules.xml index bbf9ae858..8eb805335 100644 --- a/custom_rules.xml +++ b/custom_rules.xml @@ -36,6 +36,7 @@ + @@ -126,24 +127,28 @@ + + - Creating library output jar file... - - - - - - - - + Creating library output jar file... + + + + + + + + - - - - + + + + + + diff --git a/jni/Android.mk b/jni/Android.mk index c1951fdde..f44ba5cc0 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -15,7 +15,6 @@ endif ifeq ($(_BUILD_VIDEO),0) ifeq (,$(DUMP_VAR)) -$(info $(TARGET_ARCH_ABI): Video is disabled for targets other than armeabi-v7a and x86) endif endif @@ -54,10 +53,19 @@ include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk # Matroska ifeq ($(BUILD_MATROSKA), 1) -include $(linphone-root-dir)/submodules/externals/build/libmatroska/Android.mk +include $(linphone-root-dir)/submodules/externals/build/libmatroska-c/Android.mk endif +ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1) +include $(linphone-root-dir)/submodules/externals/build/mbedtls/Android.mk +include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-mbedtls.mk +else include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk +include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-polarssl.mk +endif + +include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-tester.mk + ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0) include $(linphone-root-dir)/submodules/externals/build/antlr3/Android.mk include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk @@ -77,20 +85,19 @@ endif ifeq ($(BUILD_SILK), 1) ifeq (,$(DUMP_VAR)) -$(info $(TARGET_ARCH_ABI): Build proprietary SILK plugin for mediastreamer2) endif include $(linphone-root-dir)/submodules/mssilk/Android.mk endif -ifeq ($(BUILD_ILBC), 1) -include $(linphone-root-dir)/submodules/msilbc/Android.mk +ifeq ($(BUILD_CODEC2), 1) +include $(linphone-root-dir)/submodules/mscodec2/Android.mk +include $(linphone-root-dir)/submodules/externals/build/codec2/Android.mk endif ifeq ($(_BUILD_VIDEO),1) ifeq ($(_BUILD_X264),1) ifeq (,$(DUMP_VAR)) -$(info $(TARGET_ARCH_ABI): Build X264 plugin for mediastreamer2) endif include $(linphone-root-dir)/submodules/msx264/Android.mk include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk @@ -98,7 +105,6 @@ endif ifeq ($(_BUILD_OPENH264),1) ifeq (,$(DUMP_VAR)) -$(info $(TARGET_ARCH_ABI): Build OpenH264 plugin for mediastreamer2) endif include $(linphone-root-dir)/submodules/msopenh264/Android.mk include $(linphone-root-dir)/submodules/externals/build/openh264/Android.mk @@ -113,7 +119,6 @@ endif #_BUILD_VIDEO ifeq ($(BUILD_ZRTP), 1) ifeq (,$(DUMP_VAR)) -$(info $(TARGET_ARCH_ABI): Build ZRTP support) endif include $(linphone-root-dir)/submodules/bzrtp/Android.mk endif @@ -156,31 +161,27 @@ WEBRTC_BUILD_NEON_LIBS=false # AECM ifneq ($(BUILD_WEBRTC_AECM),0) ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) -$(info $(TARGET_ARCH_ABI): Build NEON modules for AECM) WEBRTC_BUILD_NEON_LIBS=true endif -$(info $(TARGET_ARCH_ABI): Build AECM from WebRTC) -include $(linphone-root-dir)/submodules/externals/build/webrtc/system_wrappers/Android.mk -include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/utility/Android.mk -include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/aecm/Android.mk +include $(linphone-root-dir)/submodules/mswebrtc/build/android/system_wrappers/Android.mk +include $(linphone-root-dir)/submodules/mswebrtc/build/android/modules/audio_processing/utility/Android.mk +include $(linphone-root-dir)/submodules/mswebrtc/build/android/modules/audio_processing/aecm/Android.mk endif # iSAC ifneq ($(BUILD_WEBRTC_ISAC),0) # don't build for neon in x86 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) -$(info $(TARGET_ARCH_ABI): Build NEON modules for ISAC) WEBRTC_BUILD_NEON_LIBS=true endif -$(info $(TARGET_ARCH_ABI): Build iSAC plugin for mediastreamer2) -include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk +include $(linphone-root-dir)/submodules/mswebrtc/build/android/modules/audio_coding/codecs/isac/fix/source/Android.mk +include $(linphone-root-dir)/submodules/mswebrtc/build/android/modules/audio_coding/codecs/ilbc/Android.mk endif # common modules for ISAC and AECM -ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00) -$(info $(TARGET_ARCH_ABI): Build common modules for iSAC and AECM ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC))) -include $(linphone-root-dir)/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk +ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)$(BUILD_ILBC),000) +include $(linphone-root-dir)/submodules/mswebrtc/build/android/common_audio/signal_processing/Android.mk include $(linphone-root-dir)/submodules/mswebrtc/Android.mk endif diff --git a/jni/Application.mk b/jni/Application.mk index 62337407e..5119f4c76 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -36,6 +36,10 @@ ifeq ($(BUILD_G729),) BUILD_G729=0 endif +ifeq ($(BUILD_CODEC2),) +BUILD_CODEC2=0 +endif + ifeq ($(BUILD_VIDEO),) BUILD_VIDEO=1 endif @@ -51,10 +55,15 @@ ifeq ($(BUILD_UPNP),1) APP_MODULES += libupnp endif +APP_MODULES +=bctoolbox bctoolbox_tester ifeq ($(BUILD_TLS),1) +ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1) +APP_MODULES +=mbedtls +else APP_MODULES +=polarssl endif endif +endif ifeq ($(BUILD_VIDEO),1) APP_MODULES += libffmpeg-linphone @@ -99,6 +108,13 @@ ifneq ($(BUILD_OPUS), 0) APP_MODULES += libopus endif +ifeq ($(BUILD_ILBC), 1) +APP_MODULES += libwebrtc_spl libwebrtc_ilbc libmswebrtc +ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI))) +APP_MODULES += libwebrtc_spl_neon +endif +endif + ifneq ($(BUILD_WEBRTC_AECM), 0) APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm libmswebrtc ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI))) @@ -127,8 +143,8 @@ ifeq ($(BUILD_ZRTP), 1) APP_MODULES += libbzrtp endif -ifeq ($(BUILD_ILBC), 1) -APP_MODULES +=libmsilbc +ifeq ($(BUILD_CODEC2), 1) +APP_MODULES +=libcodec2 libmscodec2 endif ifeq ($(BUILD_SRTP), 1) diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile index 42b2637c1..c209ffefc 100644 --- a/liblinphone_tester/Makefile +++ b/liblinphone_tester/Makefile @@ -1,5 +1,62 @@ -all: +ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep -E 'android-[0-9]+' | tail -n1) + +all: update-project copy-files ant debug install run-all-tests: all ant test + +update-project: + android update project --path . --target $(ANDROID_MOST_RECENT_TARGET) + +copy-libs: + rm -rf libs/armeabi + mkdir -p assets/config_files + if test -d "../liblinphone-sdk/android-arm"; then \ + mkdir -p libs/armeabi && \ + cp -f ../liblinphone-sdk/android-arm/lib/libgnustl_shared.so libs/armeabi && \ + cp -f ../liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \ + cp -f ../liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \ + cp -f ../liblinphone-sdk/android-arm/share/linphone/rootca.pem assets/config_files; \ + fi + if test -f "../liblinphone-sdk/android-arm/bin/gdbserver"; then \ + cp -f ../liblinphone-sdk/android-arm/bin/gdbserver libs/armeabi && \ + cp -f ../liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \ + fi + rm -rf libs/armeabi-v7a + if test -d "../liblinphone-sdk/android-armv7"; then \ + mkdir -p libs/armeabi-v7a && \ + cp -f ../liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs/armeabi-v7a && \ + cp -f ../liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \ + cp -f ../liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \ + cp -f ../liblinphone-sdk/android-armv7/share/linphone/rootca.pem assets/config_files; \ + fi + if test -f "../liblinphone-sdk/android-armv7/bin/gdbserver"; then \ + cp -f ../liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \ + cp -f ../liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \ + fi + rm -rf libs/x86 + if test -d "../liblinphone-sdk/android-x86"; then \ + mkdir -p libs/x86 && \ + cp -f ../liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs/x86 && \ + cp -f ../liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \ + cp -f ../liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \ + cp -f ../liblinphone-sdk/android-x86/share/linphone/rootca.pem assets/config_files; \ + fi + if test -f "../liblinphone-sdk/android-x86/bin/gdbserver"; then \ + cp -f ../liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \ + cp -f ../liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \ + fi + +copy-files: ../submodules/linphone/tester/tester_hosts ../submodules/linphone/tester/messages.db + $(MAKE) copy-libs + rm -rf assets/config_files + mkdir -p assets/config_files + for file in $^; do \ + cp -rf $$file assets/config_files/. ; \ + done + cp -rf ../submodules/linphone/tester/certificates assets/config_files + cp -rf ../submodules/linphone/tester/images assets/config_files + cp -rf ../submodules/linphone/tester/rcfiles assets/config_files + cp -rf ../submodules/linphone/tester/sounds assets/config_files + cp -rf ../submodules/linphone/tester/vcards assets/config_files diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml index 9adcb8c2f..da0216dc5 100644 --- a/liblinphone_tester/custom_rules.xml +++ b/liblinphone_tester/custom_rules.xml @@ -43,6 +43,7 @@ + @@ -72,7 +73,7 @@ - + diff --git a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java index 02df05446..40c7062cf 100644 --- a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java @@ -23,9 +23,10 @@ public class LogsActivity extends Activity { @Override public void run() { - String path = mLogsActivity.getFilesDir().getAbsolutePath()+"/config_files"; + String res_path = mLogsActivity.getFilesDir().getAbsolutePath()+"/config_files"; + String write_path = mLogsActivity.getCacheDir().getPath(); tester = new TesterLogger(mLogsActivity); - List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--config", path})); + List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", res_path, "--writable-dir", write_path})); list.addAll(Arrays.asList(mArgs)); String[] array = list.toArray(new String[list.size()]); tester.run(array); @@ -37,7 +38,7 @@ public class LogsActivity extends Activity { }); } } - + private static String join(String [] array, String separator) { String ret = ""; for(int i = 0; i < array.length; ++i) { @@ -48,7 +49,7 @@ public class LogsActivity extends Activity { } return ret; } - + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -75,7 +76,7 @@ public class LogsActivity extends Activity { getMenuInflater().inflate(R.menu.activity_logs, menu); return true; } - + public void addLog(int level, String message) { mLogs += message; ((TextView)findViewById(R.id.textView1)).append(message); @@ -86,7 +87,7 @@ public class LogsActivity extends Activity { finish(); } } - + public void done() { } } diff --git a/liblinphone_tester/src/org/linphone/tester/TestUnit.java b/liblinphone_tester/src/org/linphone/tester/TestUnit.java index d33211495..2e2f00707 100644 --- a/liblinphone_tester/src/org/linphone/tester/TestUnit.java +++ b/liblinphone_tester/src/org/linphone/tester/TestUnit.java @@ -16,28 +16,28 @@ public class TestUnit extends AndroidTestCase { private String mSuite; private String mTest; static Boolean isAssetCopied=false; - + public TestUnit(String suite, String test) { mSuite = suite; mTest = test; setName(suite + "/" + test); } - + public TestUnit(String name) { - String[] tab = name.split("/"); + String[] tab = name.split("/"); mSuite = tab[0]; mTest = tab[1]; setName(name); } - + static public void copyAssetsFromPackage(Context ctx) throws IOException { copyAssetsFromPackage(ctx,"config_files"); } - - + + public static void copyAssetsFromPackage(Context ctx,String fromPath) throws IOException { new File(ctx.getFilesDir().getPath()+"/"+fromPath).mkdir(); - + for (String f :ctx.getAssets().list(fromPath)) { String current_name=fromPath+"/"+f; InputStream lInputStream; @@ -50,8 +50,8 @@ public class TestUnit extends AndroidTestCase { continue; } FileOutputStream lOutputStream = new FileOutputStream(new File(ctx.getFilesDir().getPath()+"/"+current_name));//ctx.openFileOutput (fromPath+"/"+f, 0); - - + + int readByte; byte[] buff = new byte[8048]; while (( readByte = lInputStream.read(buff)) != -1) { @@ -75,13 +75,15 @@ public class TestUnit extends AndroidTestCase { protected void tearDown() throws Exception { super.tearDown(); } - + @Override protected void runTest() { - String path = getContext().getFilesDir().getPath()+"/config_files"; + String res_path = getContext().getFilesDir().getPath()+"/config_files"; + String write_path = getContext().getCacheDir().getPath(); Tester tester = new Tester(); - List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--config", path, "--suite", mSuite, "--test", mTest})); + + List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", res_path, "--writable-dir", write_path, "--suite", mSuite, "--test", mTest})); String[] array = list.toArray(new String[list.size()]); Assert.assertTrue(tester.run(array) == 0); } -} \ No newline at end of file +} diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java index 59c3887b3..049c4405e 100644 --- a/liblinphone_tester/src/org/linphone/tester/Tester.java +++ b/liblinphone_tester/src/org/linphone/tester/Tester.java @@ -25,23 +25,22 @@ public class Tester { } static { - System.loadLibrary("cunit"); List cpuabis=Version.getCpuAbis(); String ffmpegAbi; boolean libLoaded=false; Throwable firstException=null; for (String abi : cpuabis){ Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi); - ffmpegAbi=abi; - // FFMPEG (audio/video) - if (abi.startsWith("armeabi")) { - ffmpegAbi="arm"; - } - loadOptionalLibrary("ffmpeg-linphone-"+ffmpegAbi); + loadOptionalLibrary("ffmpeg-linphone-" + abi); //Main library try { + System.loadLibrary("bctoolbox-" + abi); + System.loadLibrary("bctoolbox-tester-" + abi); + System.loadLibrary("ortp-" + abi); + System.loadLibrary("mediastreamer_base-" + abi); + System.loadLibrary("mediastreamer_voip-" + abi); System.loadLibrary("linphone-" + abi); - System.loadLibrary("linphone_tester-" + abi); + System.loadLibrary("linphonetester-" + abi); Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi); libLoaded=true; diff --git a/liblinphone_tester/src/org/linphone/tester/WrapperTester.java b/liblinphone_tester/src/org/linphone/tester/WrapperTester.java index f0c17300f..20ef7e782 100644 --- a/liblinphone_tester/src/org/linphone/tester/WrapperTester.java +++ b/liblinphone_tester/src/org/linphone/tester/WrapperTester.java @@ -6,6 +6,8 @@ import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreListenerBase; import org.linphone.core.LinphoneFriend; import org.linphone.core.PayloadType; +import org.linphone.mediastream.MediastreamerAndroidContext; +import org.linphone.mediastream.Factory; import android.test.AndroidTestCase; import junit.framework.Assert; @@ -31,7 +33,7 @@ public class WrapperTester extends AndroidTestCase { mCore.enableVideoMulticast(false); Assert.assertEquals(false, mCore.videoMulticastEnabled()); - LinphoneCallParams params = mCore.createDefaultCallParameters(); + LinphoneCallParams params = mCore.createCallParams(null); params.enableAudioMulticast(true); Assert.assertEquals(true, params.audioMulticastEnabled()); params.enableAudioMulticast(false); @@ -85,13 +87,20 @@ public class WrapperTester extends AndroidTestCase { LinphoneFriend friend = LinphoneCoreFactory.instance().createLinphoneFriend("sip:lala@test.linphone.org"); friend.setRefKey(key); Assert.assertEquals(friend.getRefKey(),key); + + //Test filter enablement + Factory factory = mCore.getMSFactory(); + factory.enableFilterFromName("MSUlawEnc", false); + Assert.assertFalse(factory.filterFromNameEnabled("MSUlawEnc")); + factory.enableFilterFromName("MSUlawEnc", true); } @Override protected void setUp() throws Exception { // TODO Auto-generated method stub super.setUp(); - mCore = LinphoneCoreFactory.instance().createLinphoneCore(new LinphoneCoreListenerBase(),null); + LinphoneCoreFactory.instance().setDebugMode(true, "WrapperTester"); + mCore = LinphoneCoreFactory.instance().createLinphoneCore(new LinphoneCoreListenerBase(),getContext()); } @Override diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar index e74b0d77d..f8fe3331b 100644 Binary files a/libs/android-support-v4.jar and b/libs/android-support-v4.jar differ diff --git a/patches/libvpx_configure_android_x86.patch b/patches/libvpx_configure_android_x86.patch index 3496853dd..fa1004599 100644 --- a/patches/libvpx_configure_android_x86.patch +++ b/patches/libvpx_configure_android_x86.patch @@ -1,36 +1,37 @@ ---- a/submodules/externals/libvpx/build/make/configure.sh -+++ b/submodules/externals/libvpx/build/make/configure.sh -@@ -1037,6 +1037,33 @@ EOF - os2) - AS=${AS:-nasm} - ;; -+ android*) -+ SDK_PATH=${sdk_path} -+ COMPILER_LOCATION=`find "${SDK_PATH}" \ -+ -name "i686-linux-android-gcc*" -print -quit` -+ TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android- -+ CC=${TOOLCHAIN_PATH}gcc -+ CXX=${TOOLCHAIN_PATH}g++ -+ AR=${TOOLCHAIN_PATH}ar -+ LD=${TOOLCHAIN_PATH}gcc -+ STRIP=${TOOLCHAIN_PATH}strip -+ NM=${TOOLCHAIN_PATH}nm +diff --git a/build/make/configure.sh b/build/make/configure.sh +index c592b63..e4998d7 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1132,6 +1132,32 @@ EOF + AS=${AS:-nasm} + add_ldflags -Zhigh-mem + ;; ++ android*) ++ SDK_PATH=${sdk_path} ++ COMPILER_LOCATION=`find "${SDK_PATH}" \ ++ -name "i686-linux-android-gcc*" -print -quit` ++ TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android- ++ CC=${TOOLCHAIN_PATH}gcc ++ CXX=${TOOLCHAIN_PATH}g++ ++ AR=${TOOLCHAIN_PATH}ar ++ LD=${TOOLCHAIN_PATH}gcc ++ STRIP=${TOOLCHAIN_PATH}strip ++ NM=${TOOLCHAIN_PATH}nm + -+ if [ -z "${alt_libc}" ]; then -+ alt_libc=`find "${SDK_PATH}" -name arch-x86 -print | \ -+ awk '{n = split($0,a,"/"); \ -+ split(a[n-1],b,"-"); \ -+ print $0 " " b[2]}' | \ -+ sort -g -k 2 | \ -+ awk '{ print $1 }' | tail -1` -+ fi ++ if [ -z "${alt_libc}" ]; then ++ alt_libc=`find "${SDK_PATH}" -name arch-x86 -print | \ ++ awk '{n = split($0,a,"/"); \ ++ split(a[n-1],b,"-"); \ ++ print $0 " " b[2]}' | \ ++ sort -g -k 2 | \ ++ awk '{ print $1 }' | tail -1` ++ fi + -+ add_cflags "--sysroot=${alt_libc}" -+ add_ldflags "--sysroot=${alt_libc}" ++ add_cflags "--sysroot=${alt_libc}" ++ add_ldflags "--sysroot=${alt_libc}" + -+ soft_enable realtime_only -+ ;; -+ - esac ++ soft_enable realtime_only ++ ;; + esac - AS="${alt_as:-${AS:-auto}}" + AS="${alt_as:-${AS:-auto}}" diff --git a/prepare.py b/prepare.py new file mode 100755 index 000000000..1e2316165 --- /dev/null +++ b/prepare.py @@ -0,0 +1,375 @@ +#!/usr/bin/env python + +############################################################################ +# prepare.py +# Copyright (C) 2016 Belledonne Communications, Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ + +import fnmatch +import os +import re +import sys +from distutils.spawn import find_executable +from logging import error, warning, info +from subprocess import Popen +sys.dont_write_bytecode = True +sys.path.insert(0, 'submodules/cmake-builder') +try: + import prepare +except Exception as e: + error( + "Could not find prepare module: {}, probably missing submodules/cmake-builder? Try running:\n" + "git submodule sync && git submodule update --init --recursive".format(e)) + exit(1) + + + +class AndroidTarget(prepare.Target): + + def __init__(self, arch): + prepare.Target.__init__(self, 'android-' + arch) + current_path = os.path.dirname(os.path.realpath(__file__)) + self.config_file = 'configs/config-android.cmake' + self.toolchain_file = 'toolchains/toolchain-android-' + arch + '.cmake' + self.output = 'liblinphone-sdk/android-' + arch + self.external_source_path = os.path.join(current_path, 'submodules') + + +class AndroidArmTarget(AndroidTarget): + + def __init__(self): + AndroidTarget.__init__(self, 'arm') + self.additional_args += ['-DENABLE_VIDEO=NO'] + + +class AndroidArmv7Target(AndroidTarget): + + def __init__(self): + AndroidTarget.__init__(self, 'armv7') + + +class AndroidX86Target(AndroidTarget): + + def __init__(self): + AndroidTarget.__init__(self, 'x86') + + + + +android_targets = { + 'arm': AndroidArmTarget(), + 'armv7': AndroidArmv7Target(), + 'x86': AndroidX86Target() +} + +class AndroidPreparator(prepare.Preparator): + + def __init__(self, targets=android_targets): + prepare.Preparator.__init__(self, targets) + self.min_supported_ndk = 10 + self.max_supported_ndk = 12 + self.unsupported_ndk_version = None + self.release_with_debug_info = True + self.veryclean = True + self.show_gpl_disclaimer = True + self.argparser.add_argument('-ac', '--all-codecs', help="Enable all codecs, including the non-free ones", action='store_true') + + def parse_args(self): + prepare.Preparator.parse_args(self) + + if self.args.all_codecs: + self.additional_args += ["-DENABLE_GPL_THIRD_PARTIES=YES"] + self.additional_args += ["-DENABLE_NON_FREE_CODECS=YES"] + self.additional_args += ["-DENABLE_AMRNB=YES"] + self.additional_args += ["-DENABLE_AMRWB=YES"] + self.additional_args += ["-DENABLE_BV16=YES"] + self.additional_args += ["-DENABLE_CODEC2=YES"] + self.additional_args += ["-DENABLE_G729=YES"] + self.additional_args += ["-DENABLE_GSM=YES"] + self.additional_args += ["-DENABLE_ILBC=YES"] + self.additional_args += ["-DENABLE_ISAC=YES"] + self.additional_args += ["-DENABLE_OPUS=YES"] + self.additional_args += ["-DENABLE_SILK=YES"] + self.additional_args += ["-DENABLE_SPEEX=YES"] + self.additional_args += ["-DENABLE_FFMPEG=YES"] + self.additional_args += ["-DENABLE_H263=YES"] + self.additional_args += ["-DENABLE_H263P=YES"] + self.additional_args += ["-DENABLE_MPEG4=YES"] + self.additional_args += ["-DENABLE_OPENH264=YES"] + self.additional_args += ["-DENABLE_VPX=YES"] + # self.additional_args += ["-DENABLE_X264=YES"] # Do not activate x264 because it has text relocation issues + + def list_feature_target(self): + return android_targets['armv7'] + + def check_ndk_version(self): + retval = True + ndk_build = find_executable('ndk-build') + ndk_path = os.path.dirname(ndk_build) + # NDK prior to r11 had a RELEASE.TXT file holding the version number + release_file = os.path.join(ndk_path, 'RELEASE.TXT') + if os.path.isfile(release_file): + version = open(release_file).read().strip() + res = re.match('^r(\d+)(.*)$', version) + version = int(res.group(1)) + retval = False + else: + # Hack to find the NDK version since the RELEASE.TXT file is no longer there + python_config_files = [] + for root, dirnames, filenames in os.walk(ndk_path): + for filename in fnmatch.filter(filenames, 'python-config'): + python_config_files.append(os.path.join(root, filename)) + if len(python_config_files) > 0: + version = open(python_config_files[0]).readlines()[0] + res = re.match('^.*/(aosp-)?ndk-r(\d+).*$', version) + version = int(res.group(2)) + retval = False + else: + error("Could not get Android NDK version!") + sys.exit(-1) + if retval == False and (version < self.min_supported_ndk or version > self.max_supported_ndk): + self.unsupported_ndk_version = version + retval = True + return retval + + def check_environment(self): + ret = 0 + ret_sdk = not self.check_is_installed('android', 'Android SDK tools') + ret_ndk = not self.check_is_installed('ndk-build', 'Android NDK r{}'.format(self.max_supported_ndk)) + if not ret_ndk: + ret_ndk = self.check_ndk_version() + ret |= ret_sdk + ret |= ret_ndk + ret |= prepare.Preparator.check_environment(self) + return ret + + def show_environment_errors(self): + if self.unsupported_ndk_version is not None: + error("Unsupported Android NDK r{}. Please install version r{}.".format(self.unsupported_ndk_version, self.max_supported_ndk)) + else: + prepare.Preparator.show_environment_errors(self) + + def clean(self): + prepare.Preparator.clean(self) + if os.path.isfile('Makefile'): + os.remove('Makefile') + if os.path.isdir('WORK') and not os.listdir('WORK'): + os.rmdir('WORK') + if os.path.isdir('liblinphone-sdk') and not os.listdir('liblinphone-sdk'): + os.rmdir('liblinphone-sdk') + + def generate_makefile(self, generator, project_file=''): + platforms = self.args.target + arch_targets = "" + for arch in platforms: + arch_targets += """ +{arch}: {arch}-build + +{arch}-build: +\t{generator} WORK/android-{arch}/cmake +\t@echo "Done" +""".format(arch=arch, generator=generator) + makefile = """ +archs={archs} +TOPDIR=$(shell pwd) +LINPHONE_ANDROID_VERSION=$(shell git describe --always) +ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep -E 'android-[0-9]+' | tail -n1) +ANT_SILENT=$(shell ant -h | grep -q -- -S && echo 1 || echo 0) +PACKAGE_NAME=$(shell sed -nE 's||\\1|p' custom_rules.xml) + +.PHONY: all +.NOTPARALLEL: all generate-apk generate-mediastreamer2-apk install release + +all: update-project generate-apk + +build: $(addsuffix -build, $(archs)) + +clean: java-clean + +install: install-apk run-linphone + +java-clean: +\tant clean + +$(TOPDIR)/res/raw/rootca.pem: +\tcp liblinphone-sdk/android-{first_arch}/share/linphone/rootca.pem $@ + +copy-libs: +\trm -rf libs-debug/armeabi +\trm -rf libs/armeabi +\tif test -d "liblinphone-sdk/android-arm"; then \\ +\t\tmkdir -p libs-debug/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/libgnustl_shared.so libs-debug/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs-debug/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs-debug/armeabi && \\ +\t\tmkdir -p libs/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/libgnustl_shared.so libs/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \\ +\t\tsh WORK/android-arm/strip.sh libs/armeabi/*.so; \\ +\tfi +\tif test -f "liblinphone-sdk/android-arm/bin/gdbserver"; then \\ +\t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs-debug/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs-debug/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\ +\tfi +\trm -rf libs-debug/armeabi-v7a +\trm -rf libs/armeabi-v7a +\tif test -d "liblinphone-sdk/android-armv7"; then \\ +\t\tmkdir -p libs-debug/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs-debug/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs-debug/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs-debug/armeabi-v7a && \\ +\t\tmkdir -p libs/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \\ +\t\tsh WORK/android-armv7/strip.sh libs/armeabi-v7a/*.so; \\ +\tfi +\tif test -f "liblinphone-sdk/android-armv7/bin/gdbserver"; then \\ +\t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs-debug/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs-debug/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\ +\tfi +\trm -rf libs-debug/x86 +\trm -rf libs/x86 +\tif test -d "liblinphone-sdk/android-x86"; then \\ +\t\tmkdir -p libs-debug/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs-debug/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs-debug/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs-debug/x86 && \\ +\t\tmkdir -p libs/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \\ +\t\tsh WORK/android-x86/strip.sh libs/x86/*.so; \\ +\tfi +\tif test -f "liblinphone-sdk/android-x86/bin/gdbserver"; then \\ +\t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs-debug/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs-debug/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\ +\tfi + +update-project: +\tandroid update project --path . --target $(ANDROID_MOST_RECENT_TARGET) +\tandroid update test-project --path tests -m . + +update-mediastreamer2-project: +\t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\ +\tandroid update project --path . --target $(ANDROID_MOST_RECENT_TARGET) + +generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem update-project +\techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\ +\tant debug + +generate-mediastreamer2-apk: java-clean build copy-libs update-mediastreamer2-project +\t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\ +\techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\ +\tant debug + +install-apk: +\tant installd + +uninstall: +\tadb uninstall $(PACKAGE_NAME) + +release: java-clean build copy-libs update-project +\tpatch -p1 < release.patch +\tcat ant.properties | grep version.name > default.properties +\tant release +\tpatch -Rp1 < release.patch + +generate-sdk: liblinphone-android-sdk + +liblinphone-android-sdk: generate-apk +\tant liblinphone-android-sdk + +linphone-android-sdk: generate-apk +\tant linphone-android-sdk + +mediastreamer2-sdk: generate-mediastreamer2-apk +\t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\ +\tant mediastreamer2-sdk + +liblinphone_tester: +\t$(MAKE) -C liblinphone_tester + +run-linphone: +\tant run + +run-liblinphone-tests: +\t$(MAKE) -C liblinphone_tester run-all-tests + +run-basic-tests: update-project +\tant partial-clean +\t$(MAKE) -C tests run-basic-tests ANT_SILENT=$(ANT_SILENT) + +run-all-tests: update-project +\tant partial-clean +\t$(MAKE) -C tests run-all-tests ANT_SILENT=$(ANT_SILENT) + + +pull-transifex: +\ttx pull -af + +push-transifex: +\ttx push -s -f --no-interactive + +{arch_targets} + +help-prepare-options: +\t@echo "prepare.py was previously executed with the following options:" +\t@echo " {options}" + +help: help-prepare-options +\t@echo "" +\t@echo "(please read the README.md file first)" +\t@echo "" +\t@echo "Available architectures: {archs}" +\t@echo "" +\t@echo "Available targets:" +\t@echo "" +\t@echo " * all or generate-apk: builds all architectures and creates the linphone application APK" +\t@echo " * generate-sdk: builds all architectures and creates the liblinphone SDK" +\t@echo " * install: install the linphone application APK (run this only after generate-apk)" +\t@echo " * uninstall: uninstall the linphone application" +\t@echo "" +""".format(archs=' '.join(platforms), arch_opts='|'.join(platforms), + first_arch=platforms[0], options=' '.join(sys.argv), + arch_targets=arch_targets, generator=generator) + f = open('Makefile', 'w') + f.write(makefile) + f.close() + + + +def main(): + preparator = AndroidPreparator() + preparator.parse_args() + if preparator.check_environment() != 0: + preparator.show_environment_errors() + return 1 + return preparator.run() + +if __name__ == "__main__": + sys.exit(main()) diff --git a/release.patch b/release.patch index c6f3f3c2f..69c5a8620 100644 --- a/release.patch +++ b/release.patch @@ -6,8 +6,8 @@ index 5ef1374..86e13be 100644 -- -+ +- ++ - - - - \ No newline at end of file diff --git a/res/drawable-land-xhdpi/conference_default.png b/res/drawable-land-xhdpi/conference_default.png deleted file mode 100644 index c3f3c62b6..000000000 Binary files a/res/drawable-land-xhdpi/conference_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/conference_over.png b/res/drawable-land-xhdpi/conference_over.png deleted file mode 100644 index cb6ff9a91..000000000 Binary files a/res/drawable-land-xhdpi/conference_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/dialer_alt_back_default.png b/res/drawable-land-xhdpi/dialer_alt_back_default.png deleted file mode 100644 index 9adc1d2a5..000000000 Binary files a/res/drawable-land-xhdpi/dialer_alt_back_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/dialer_alt_back_over.png b/res/drawable-land-xhdpi/dialer_alt_back_over.png deleted file mode 100644 index 73606b5e6..000000000 Binary files a/res/drawable-land-xhdpi/dialer_alt_back_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/dialer_alt_default.png b/res/drawable-land-xhdpi/dialer_alt_default.png deleted file mode 100644 index f1b2d39cf..000000000 Binary files a/res/drawable-land-xhdpi/dialer_alt_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/dialer_alt_disabled.png b/res/drawable-land-xhdpi/dialer_alt_disabled.png deleted file mode 100644 index 00a72ac47..000000000 Binary files a/res/drawable-land-xhdpi/dialer_alt_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/dialer_alt_over.png b/res/drawable-land-xhdpi/dialer_alt_over.png deleted file mode 100644 index d07a14243..000000000 Binary files a/res/drawable-land-xhdpi/dialer_alt_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/hangup_default.png b/res/drawable-land-xhdpi/hangup_default.png deleted file mode 100644 index e7f49a1c6..000000000 Binary files a/res/drawable-land-xhdpi/hangup_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/hangup_over.png b/res/drawable-land-xhdpi/hangup_over.png deleted file mode 100644 index ffc1fb469..000000000 Binary files a/res/drawable-land-xhdpi/hangup_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/micro_off_default.png b/res/drawable-land-xhdpi/micro_off_default.png deleted file mode 100644 index 297071951..000000000 Binary files a/res/drawable-land-xhdpi/micro_off_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/micro_off_disabled.png b/res/drawable-land-xhdpi/micro_off_disabled.png deleted file mode 100644 index ef133210a..000000000 Binary files a/res/drawable-land-xhdpi/micro_off_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/micro_off_over.png b/res/drawable-land-xhdpi/micro_off_over.png deleted file mode 100644 index 772d734fb..000000000 Binary files a/res/drawable-land-xhdpi/micro_off_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/micro_on_default.png b/res/drawable-land-xhdpi/micro_on_default.png deleted file mode 100644 index 0f8be95ea..000000000 Binary files a/res/drawable-land-xhdpi/micro_on_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/micro_on_disabled.png b/res/drawable-land-xhdpi/micro_on_disabled.png deleted file mode 100644 index 9165841a8..000000000 Binary files a/res/drawable-land-xhdpi/micro_on_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/micro_on_over.png b/res/drawable-land-xhdpi/micro_on_over.png deleted file mode 100644 index 8afa26cee..000000000 Binary files a/res/drawable-land-xhdpi/micro_on_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_add_default.png b/res/drawable-land-xhdpi/options_add_default.png deleted file mode 100644 index 41606d99d..000000000 Binary files a/res/drawable-land-xhdpi/options_add_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_add_default_alt.png b/res/drawable-land-xhdpi/options_add_default_alt.png deleted file mode 100644 index a0cee4151..000000000 Binary files a/res/drawable-land-xhdpi/options_add_default_alt.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_add_disabled.png b/res/drawable-land-xhdpi/options_add_disabled.png deleted file mode 100644 index 71b166a62..000000000 Binary files a/res/drawable-land-xhdpi/options_add_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_add_disabled_alt.png b/res/drawable-land-xhdpi/options_add_disabled_alt.png deleted file mode 100644 index 8d6dbfb39..000000000 Binary files a/res/drawable-land-xhdpi/options_add_disabled_alt.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_add_over.png b/res/drawable-land-xhdpi/options_add_over.png deleted file mode 100644 index e97312e51..000000000 Binary files a/res/drawable-land-xhdpi/options_add_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_add_over_alt.png b/res/drawable-land-xhdpi/options_add_over_alt.png deleted file mode 100644 index 74338a55c..000000000 Binary files a/res/drawable-land-xhdpi/options_add_over_alt.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_default.png b/res/drawable-land-xhdpi/options_default.png deleted file mode 100644 index e835f0829..000000000 Binary files a/res/drawable-land-xhdpi/options_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_default_alt.png b/res/drawable-land-xhdpi/options_default_alt.png deleted file mode 100644 index 251d184e7..000000000 Binary files a/res/drawable-land-xhdpi/options_default_alt.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_disabled.png b/res/drawable-land-xhdpi/options_disabled.png deleted file mode 100644 index 25bee610a..000000000 Binary files a/res/drawable-land-xhdpi/options_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_disabled_alt.png b/res/drawable-land-xhdpi/options_disabled_alt.png deleted file mode 100644 index c63a4cddd..000000000 Binary files a/res/drawable-land-xhdpi/options_disabled_alt.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_over.png b/res/drawable-land-xhdpi/options_over.png deleted file mode 100644 index dc2bb8404..000000000 Binary files a/res/drawable-land-xhdpi/options_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_over_alt.png b/res/drawable-land-xhdpi/options_over_alt.png deleted file mode 100644 index 487b47905..000000000 Binary files a/res/drawable-land-xhdpi/options_over_alt.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_selected.png b/res/drawable-land-xhdpi/options_selected.png deleted file mode 100644 index 4de39f880..000000000 Binary files a/res/drawable-land-xhdpi/options_selected.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_selected_alt.png b/res/drawable-land-xhdpi/options_selected_alt.png deleted file mode 100644 index e03a70dc3..000000000 Binary files a/res/drawable-land-xhdpi/options_selected_alt.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_transfer_default.png b/res/drawable-land-xhdpi/options_transfer_default.png deleted file mode 100644 index b42022c4f..000000000 Binary files a/res/drawable-land-xhdpi/options_transfer_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_transfer_disabled.png b/res/drawable-land-xhdpi/options_transfer_disabled.png deleted file mode 100644 index 31462adc6..000000000 Binary files a/res/drawable-land-xhdpi/options_transfer_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/options_transfer_over.png b/res/drawable-land-xhdpi/options_transfer_over.png deleted file mode 100644 index 6d3ecd1cb..000000000 Binary files a/res/drawable-land-xhdpi/options_transfer_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/pause_off_default.png b/res/drawable-land-xhdpi/pause_off_default.png deleted file mode 100644 index 4c73470f8..000000000 Binary files a/res/drawable-land-xhdpi/pause_off_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/pause_off_disabled.png b/res/drawable-land-xhdpi/pause_off_disabled.png deleted file mode 100644 index 11b619fb3..000000000 Binary files a/res/drawable-land-xhdpi/pause_off_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/pause_off_over.png b/res/drawable-land-xhdpi/pause_off_over.png deleted file mode 100644 index 66545c2d4..000000000 Binary files a/res/drawable-land-xhdpi/pause_off_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/pause_on_default.png b/res/drawable-land-xhdpi/pause_on_default.png deleted file mode 100644 index 58c98a583..000000000 Binary files a/res/drawable-land-xhdpi/pause_on_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/pause_on_over.png b/res/drawable-land-xhdpi/pause_on_over.png deleted file mode 100644 index 37b2875db..000000000 Binary files a/res/drawable-land-xhdpi/pause_on_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_bluetooth_off_default.png b/res/drawable-land-xhdpi/route_bluetooth_off_default.png deleted file mode 100644 index 84a001275..000000000 Binary files a/res/drawable-land-xhdpi/route_bluetooth_off_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_bluetooth_off_disabled.png b/res/drawable-land-xhdpi/route_bluetooth_off_disabled.png deleted file mode 100644 index f523bd6c3..000000000 Binary files a/res/drawable-land-xhdpi/route_bluetooth_off_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_bluetooth_off_over.png b/res/drawable-land-xhdpi/route_bluetooth_off_over.png deleted file mode 100644 index ebaffea54..000000000 Binary files a/res/drawable-land-xhdpi/route_bluetooth_off_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_bluetooth_on_default.png b/res/drawable-land-xhdpi/route_bluetooth_on_default.png deleted file mode 100644 index 9cbdf574d..000000000 Binary files a/res/drawable-land-xhdpi/route_bluetooth_on_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_phone_off_default.png b/res/drawable-land-xhdpi/route_phone_off_default.png deleted file mode 100644 index e9b944cc6..000000000 Binary files a/res/drawable-land-xhdpi/route_phone_off_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_phone_off_disabled.png b/res/drawable-land-xhdpi/route_phone_off_disabled.png deleted file mode 100644 index 1d58d39c8..000000000 Binary files a/res/drawable-land-xhdpi/route_phone_off_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_phone_off_over.png b/res/drawable-land-xhdpi/route_phone_off_over.png deleted file mode 100644 index f9b8f9734..000000000 Binary files a/res/drawable-land-xhdpi/route_phone_off_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_phone_on_default.png b/res/drawable-land-xhdpi/route_phone_on_default.png deleted file mode 100644 index b35b9aa64..000000000 Binary files a/res/drawable-land-xhdpi/route_phone_on_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_speaker_off_default.png b/res/drawable-land-xhdpi/route_speaker_off_default.png deleted file mode 100644 index d6c7eacde..000000000 Binary files a/res/drawable-land-xhdpi/route_speaker_off_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_speaker_off_disabled.png b/res/drawable-land-xhdpi/route_speaker_off_disabled.png deleted file mode 100644 index f750b1610..000000000 Binary files a/res/drawable-land-xhdpi/route_speaker_off_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_speaker_off_over.png b/res/drawable-land-xhdpi/route_speaker_off_over.png deleted file mode 100644 index 74bf86fa1..000000000 Binary files a/res/drawable-land-xhdpi/route_speaker_off_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/route_speaker_on_default.png b/res/drawable-land-xhdpi/route_speaker_on_default.png deleted file mode 100644 index 293e675e2..000000000 Binary files a/res/drawable-land-xhdpi/route_speaker_on_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/routes_default.png b/res/drawable-land-xhdpi/routes_default.png deleted file mode 100644 index cc68859a8..000000000 Binary files a/res/drawable-land-xhdpi/routes_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/routes_disabled.png b/res/drawable-land-xhdpi/routes_disabled.png deleted file mode 100644 index 437bdcb35..000000000 Binary files a/res/drawable-land-xhdpi/routes_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/routes_over.png b/res/drawable-land-xhdpi/routes_over.png deleted file mode 100644 index 958cdc28c..000000000 Binary files a/res/drawable-land-xhdpi/routes_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/routes_selected.png b/res/drawable-land-xhdpi/routes_selected.png deleted file mode 100644 index 54a0aa48c..000000000 Binary files a/res/drawable-land-xhdpi/routes_selected.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/speaker_off_default.png b/res/drawable-land-xhdpi/speaker_off_default.png deleted file mode 100644 index a8c06fa29..000000000 Binary files a/res/drawable-land-xhdpi/speaker_off_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/speaker_off_disabled.png b/res/drawable-land-xhdpi/speaker_off_disabled.png deleted file mode 100644 index 71e614e16..000000000 Binary files a/res/drawable-land-xhdpi/speaker_off_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/speaker_off_over.png b/res/drawable-land-xhdpi/speaker_off_over.png deleted file mode 100644 index 66d3c8992..000000000 Binary files a/res/drawable-land-xhdpi/speaker_off_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/speaker_on_default.png b/res/drawable-land-xhdpi/speaker_on_default.png deleted file mode 100644 index 5f9ffbbb1..000000000 Binary files a/res/drawable-land-xhdpi/speaker_on_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/speaker_on_disabled.png b/res/drawable-land-xhdpi/speaker_on_disabled.png deleted file mode 100644 index 7a8c6023a..000000000 Binary files a/res/drawable-land-xhdpi/speaker_on_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/speaker_on_over.png b/res/drawable-land-xhdpi/speaker_on_over.png deleted file mode 100644 index db44d5a07..000000000 Binary files a/res/drawable-land-xhdpi/speaker_on_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/splashscreen.png b/res/drawable-land-xhdpi/splashscreen.png deleted file mode 100644 index 6ef7aa0c1..000000000 Binary files a/res/drawable-land-xhdpi/splashscreen.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/statebar_background.png b/res/drawable-land-xhdpi/statebar_background.png deleted file mode 100644 index 26f042d99..000000000 Binary files a/res/drawable-land-xhdpi/statebar_background.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/transfer_default.png b/res/drawable-land-xhdpi/transfer_default.png deleted file mode 100644 index dc18399b4..000000000 Binary files a/res/drawable-land-xhdpi/transfer_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/transfer_over.png b/res/drawable-land-xhdpi/transfer_over.png deleted file mode 100644 index 17740ee06..000000000 Binary files a/res/drawable-land-xhdpi/transfer_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/video_off_default.png b/res/drawable-land-xhdpi/video_off_default.png deleted file mode 100644 index bdf806f04..000000000 Binary files a/res/drawable-land-xhdpi/video_off_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/video_off_disabled.png b/res/drawable-land-xhdpi/video_off_disabled.png deleted file mode 100644 index bba655b46..000000000 Binary files a/res/drawable-land-xhdpi/video_off_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/video_off_over.png b/res/drawable-land-xhdpi/video_off_over.png deleted file mode 100644 index f93047c62..000000000 Binary files a/res/drawable-land-xhdpi/video_off_over.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/video_on_default.png b/res/drawable-land-xhdpi/video_on_default.png deleted file mode 100644 index 3ca9fabdf..000000000 Binary files a/res/drawable-land-xhdpi/video_on_default.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/video_on_disabled.png b/res/drawable-land-xhdpi/video_on_disabled.png deleted file mode 100644 index f122718f0..000000000 Binary files a/res/drawable-land-xhdpi/video_on_disabled.png and /dev/null differ diff --git a/res/drawable-land-xhdpi/video_on_over.png b/res/drawable-land-xhdpi/video_on_over.png deleted file mode 100644 index 252f88441..000000000 Binary files a/res/drawable-land-xhdpi/video_on_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/add_call_more_default.png b/res/drawable-sw533dp-land-xhdpi/add_call_more_default.png deleted file mode 100644 index a3ddce2f2..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/add_call_more_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/add_call_more_disabled.png b/res/drawable-sw533dp-land-xhdpi/add_call_more_disabled.png deleted file mode 100644 index 374aacc0b..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/add_call_more_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/add_call_more_over.png b/res/drawable-sw533dp-land-xhdpi/add_call_more_over.png deleted file mode 100644 index 24fdabed5..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/add_call_more_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/add_contact_default.png b/res/drawable-sw533dp-land-xhdpi/add_contact_default.png deleted file mode 100644 index 82611c172..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/add_contact_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/add_contact_disabled.png b/res/drawable-sw533dp-land-xhdpi/add_contact_disabled.png deleted file mode 100644 index ff863911b..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/add_contact_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/add_contact_over.png b/res/drawable-sw533dp-land-xhdpi/add_contact_over.png deleted file mode 100644 index 4eb38dddd..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/add_contact_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/back_default.png b/res/drawable-sw533dp-land-xhdpi/back_default.png deleted file mode 100644 index 3dad47eb4..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/back_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/back_disabled.png b/res/drawable-sw533dp-land-xhdpi/back_disabled.png deleted file mode 100644 index da4d42006..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/back_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/back_over.png b/res/drawable-sw533dp-land-xhdpi/back_over.png deleted file mode 100644 index 4dea8f4c8..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/back_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/background_alt.png b/res/drawable-sw533dp-land-xhdpi/background_alt.png deleted file mode 100644 index 3e178844a..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/background_alt.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/background_logo.png b/res/drawable-sw533dp-land-xhdpi/background_logo.png deleted file mode 100644 index 749d70f30..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/background_logo.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/backspace_default.png b/res/drawable-sw533dp-land-xhdpi/backspace_default.png deleted file mode 100644 index 274330951..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/backspace_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/backspace_disabled.png b/res/drawable-sw533dp-land-xhdpi/backspace_disabled.png deleted file mode 100644 index 825232600..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/backspace_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/backspace_over.png b/res/drawable-sw533dp-land-xhdpi/backspace_over.png deleted file mode 100644 index 95e2137e7..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/backspace_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/bottom.png b/res/drawable-sw533dp-land-xhdpi/bottom.png deleted file mode 100644 index ba712ad0e..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/bottom.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/call_default.png b/res/drawable-sw533dp-land-xhdpi/call_default.png deleted file mode 100644 index bbfa08f38..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/call_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/call_disabled.png b/res/drawable-sw533dp-land-xhdpi/call_disabled.png deleted file mode 100644 index f178ee9a2..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/call_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/call_over.png b/res/drawable-sw533dp-land-xhdpi/call_over.png deleted file mode 100644 index f03e156d6..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/call_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_default.png b/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_default.png deleted file mode 100644 index 3dad47eb4..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_disabled.png b/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_disabled.png deleted file mode 100644 index da4d42006..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_over.png b/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_over.png deleted file mode 100644 index 4dea8f4c8..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/chat_default.png b/res/drawable-sw533dp-land-xhdpi/chat_default.png deleted file mode 100644 index 125d518fe..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/chat_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/chat_over.png b/res/drawable-sw533dp-land-xhdpi/chat_over.png deleted file mode 100644 index d6c952c2c..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/chat_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/chat_selected.png b/res/drawable-sw533dp-land-xhdpi/chat_selected.png deleted file mode 100644 index 0d37722c1..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/chat_selected.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/conference_default.png b/res/drawable-sw533dp-land-xhdpi/conference_default.png deleted file mode 100644 index 12f4072e6..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/conference_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/conference_over.png b/res/drawable-sw533dp-land-xhdpi/conference_over.png deleted file mode 100644 index edc71a961..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/conference_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/contacts_default.png b/res/drawable-sw533dp-land-xhdpi/contacts_default.png deleted file mode 100644 index 4ce5291c5..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/contacts_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/contacts_over.png b/res/drawable-sw533dp-land-xhdpi/contacts_over.png deleted file mode 100644 index eb6f805fa..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/contacts_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/contacts_selected.png b/res/drawable-sw533dp-land-xhdpi/contacts_selected.png deleted file mode 100644 index cf49531e0..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/contacts_selected.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_address_background.png b/res/drawable-sw533dp-land-xhdpi/dialer_address_background.png deleted file mode 100644 index 21bc36a51..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_address_background.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_default.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_default.png deleted file mode 100644 index 969dec7af..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_over.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_over.png deleted file mode 100644 index a2105442f..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_default.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_default.png deleted file mode 100644 index 335163e0f..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_disabled.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_disabled.png deleted file mode 100644 index 24441f3fe..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_over.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_over.png deleted file mode 100644 index 117a8614a..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_default.png b/res/drawable-sw533dp-land-xhdpi/dialer_default.png deleted file mode 100644 index 643d65dd0..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_over.png b/res/drawable-sw533dp-land-xhdpi/dialer_over.png deleted file mode 100644 index bd369513e..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_selected.png b/res/drawable-sw533dp-land-xhdpi/dialer_selected.png deleted file mode 100644 index 7bc91e28b..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_selected.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/hangup_default.png b/res/drawable-sw533dp-land-xhdpi/hangup_default.png deleted file mode 100644 index 0c88f12d7..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/hangup_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/hangup_over.png b/res/drawable-sw533dp-land-xhdpi/hangup_over.png deleted file mode 100644 index 00fd688b6..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/hangup_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/history_default.png b/res/drawable-sw533dp-land-xhdpi/history_default.png deleted file mode 100644 index 0d0af3db1..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/history_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/history_over.png b/res/drawable-sw533dp-land-xhdpi/history_over.png deleted file mode 100644 index e34562050..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/history_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/history_selected.png b/res/drawable-sw533dp-land-xhdpi/history_selected.png deleted file mode 100644 index 9c2d82238..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/history_selected.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/mark.png b/res/drawable-sw533dp-land-xhdpi/mark.png deleted file mode 100644 index 668a3fa9c..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/mark.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/micro_off_default.png b/res/drawable-sw533dp-land-xhdpi/micro_off_default.png deleted file mode 100644 index 45a5e3686..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/micro_off_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/micro_off_disabled.png b/res/drawable-sw533dp-land-xhdpi/micro_off_disabled.png deleted file mode 100644 index 1a890b399..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/micro_off_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/micro_off_over.png b/res/drawable-sw533dp-land-xhdpi/micro_off_over.png deleted file mode 100644 index 747f22b75..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/micro_off_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/micro_on_default.png b/res/drawable-sw533dp-land-xhdpi/micro_on_default.png deleted file mode 100644 index 29cdd5723..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/micro_on_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/micro_on_disabled.png b/res/drawable-sw533dp-land-xhdpi/micro_on_disabled.png deleted file mode 100644 index 9221d6277..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/micro_on_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/micro_on_over.png b/res/drawable-sw533dp-land-xhdpi/micro_on_over.png deleted file mode 100644 index 1f47f646c..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/micro_on_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_default.png b/res/drawable-sw533dp-land-xhdpi/options_add_default.png deleted file mode 100644 index 67790d85e..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_default_alt.png b/res/drawable-sw533dp-land-xhdpi/options_add_default_alt.png deleted file mode 100644 index 67790d85e..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_default_alt.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_disabled.png b/res/drawable-sw533dp-land-xhdpi/options_add_disabled.png deleted file mode 100644 index 14b6acd20..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_disabled_alt.png b/res/drawable-sw533dp-land-xhdpi/options_add_disabled_alt.png deleted file mode 100644 index 14b6acd20..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_disabled_alt.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_over.png b/res/drawable-sw533dp-land-xhdpi/options_add_over.png deleted file mode 100644 index c914c077b..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_over_alt.png b/res/drawable-sw533dp-land-xhdpi/options_add_over_alt.png deleted file mode 100644 index c914c077b..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_over_alt.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_default.png b/res/drawable-sw533dp-land-xhdpi/options_default.png deleted file mode 100644 index 77379da0e..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_default_alt.png b/res/drawable-sw533dp-land-xhdpi/options_default_alt.png deleted file mode 100644 index 77379da0e..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_default_alt.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_disabled.png b/res/drawable-sw533dp-land-xhdpi/options_disabled.png deleted file mode 100644 index c56fae1ca..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_disabled_alt.png b/res/drawable-sw533dp-land-xhdpi/options_disabled_alt.png deleted file mode 100644 index c56fae1ca..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_disabled_alt.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_over.png b/res/drawable-sw533dp-land-xhdpi/options_over.png deleted file mode 100644 index b32bd7274..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_over_alt.png b/res/drawable-sw533dp-land-xhdpi/options_over_alt.png deleted file mode 100644 index b32bd7274..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_over_alt.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_selected.png b/res/drawable-sw533dp-land-xhdpi/options_selected.png deleted file mode 100644 index 4dde52145..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_selected.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_selected_alt.png b/res/drawable-sw533dp-land-xhdpi/options_selected_alt.png deleted file mode 100644 index 4dde52145..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_selected_alt.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_transfer_default.png b/res/drawable-sw533dp-land-xhdpi/options_transfer_default.png deleted file mode 100644 index d6f917a49..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_transfer_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_transfer_disabled.png b/res/drawable-sw533dp-land-xhdpi/options_transfer_disabled.png deleted file mode 100644 index 5cc7423ad..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_transfer_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/options_transfer_over.png b/res/drawable-sw533dp-land-xhdpi/options_transfer_over.png deleted file mode 100644 index 7ba0428d6..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/options_transfer_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/pause_off_default.png b/res/drawable-sw533dp-land-xhdpi/pause_off_default.png deleted file mode 100644 index c7d17c130..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/pause_off_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/pause_off_disabled.png b/res/drawable-sw533dp-land-xhdpi/pause_off_disabled.png deleted file mode 100644 index cd7f9c520..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/pause_off_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/pause_off_over.png b/res/drawable-sw533dp-land-xhdpi/pause_off_over.png deleted file mode 100644 index 72cfef5e2..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/pause_off_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/pause_on_default.png b/res/drawable-sw533dp-land-xhdpi/pause_on_default.png deleted file mode 100644 index 2aba53412..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/pause_on_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/pause_on_over.png b/res/drawable-sw533dp-land-xhdpi/pause_on_over.png deleted file mode 100644 index 60eb8a551..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/pause_on_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/settings_default.png b/res/drawable-sw533dp-land-xhdpi/settings_default.png deleted file mode 100644 index 04bdd29e9..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/settings_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/settings_over.png b/res/drawable-sw533dp-land-xhdpi/settings_over.png deleted file mode 100644 index ca44f4597..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/settings_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/settings_selected.png b/res/drawable-sw533dp-land-xhdpi/settings_selected.png deleted file mode 100644 index b2b0f50bd..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/settings_selected.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_back_default.png b/res/drawable-sw533dp-land-xhdpi/setup_back_default.png deleted file mode 100644 index 24df95c3b..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_back_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_back_disabled.png b/res/drawable-sw533dp-land-xhdpi/setup_back_disabled.png deleted file mode 100644 index a3bf99b0a..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_back_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_back_over.png b/res/drawable-sw533dp-land-xhdpi/setup_back_over.png deleted file mode 100644 index b4b2cc8b7..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_back_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_cancel_default.png b/res/drawable-sw533dp-land-xhdpi/setup_cancel_default.png deleted file mode 100644 index a0557c5e9..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_cancel_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_cancel_disabled.png b/res/drawable-sw533dp-land-xhdpi/setup_cancel_disabled.png deleted file mode 100644 index e72f7b4d5..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_cancel_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_cancel_over.png b/res/drawable-sw533dp-land-xhdpi/setup_cancel_over.png deleted file mode 100644 index edf9a2624..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_cancel_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_start_default.png b/res/drawable-sw533dp-land-xhdpi/setup_start_default.png deleted file mode 100644 index 8d1af16b9..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_start_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_start_disabled.png b/res/drawable-sw533dp-land-xhdpi/setup_start_disabled.png deleted file mode 100644 index 20b0b5b73..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_start_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/setup_start_over.png b/res/drawable-sw533dp-land-xhdpi/setup_start_over.png deleted file mode 100644 index fc030704e..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/setup_start_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_off_default.png b/res/drawable-sw533dp-land-xhdpi/speaker_off_default.png deleted file mode 100644 index 4b611178c..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_off_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_off_disabled.png b/res/drawable-sw533dp-land-xhdpi/speaker_off_disabled.png deleted file mode 100644 index ebd857da7..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_off_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_off_over.png b/res/drawable-sw533dp-land-xhdpi/speaker_off_over.png deleted file mode 100644 index a68c3eb9b..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_off_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_on_default.png b/res/drawable-sw533dp-land-xhdpi/speaker_on_default.png deleted file mode 100644 index 75a192643..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_on_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_on_disabled.png b/res/drawable-sw533dp-land-xhdpi/speaker_on_disabled.png deleted file mode 100644 index d2447d870..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_on_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_on_over.png b/res/drawable-sw533dp-land-xhdpi/speaker_on_over.png deleted file mode 100644 index 28483bf59..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_on_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/splashscreen.png b/res/drawable-sw533dp-land-xhdpi/splashscreen.png deleted file mode 100644 index 6ef7aa0c1..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/splashscreen.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/statebar_background.png b/res/drawable-sw533dp-land-xhdpi/statebar_background.png deleted file mode 100644 index 3cef78053..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/statebar_background.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/unknown_small.png b/res/drawable-sw533dp-land-xhdpi/unknown_small.png deleted file mode 100644 index b4f451da6..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/unknown_small.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/video_off_default.png b/res/drawable-sw533dp-land-xhdpi/video_off_default.png deleted file mode 100644 index c479bf714..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/video_off_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/video_off_disabled.png b/res/drawable-sw533dp-land-xhdpi/video_off_disabled.png deleted file mode 100644 index 036ec556d..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/video_off_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/video_off_over.png b/res/drawable-sw533dp-land-xhdpi/video_off_over.png deleted file mode 100644 index 292042214..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/video_off_over.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/video_on_default.png b/res/drawable-sw533dp-land-xhdpi/video_on_default.png deleted file mode 100644 index fa3976e72..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/video_on_default.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/video_on_disabled.png b/res/drawable-sw533dp-land-xhdpi/video_on_disabled.png deleted file mode 100644 index 52a3515d3..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/video_on_disabled.png and /dev/null differ diff --git a/res/drawable-sw533dp-land-xhdpi/video_on_over.png b/res/drawable-sw533dp-land-xhdpi/video_on_over.png deleted file mode 100644 index 23abeffa5..000000000 Binary files a/res/drawable-sw533dp-land-xhdpi/video_on_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/about_chat_default.png b/res/drawable-xhdpi/about_chat_default.png deleted file mode 100644 index c5f697093..000000000 Binary files a/res/drawable-xhdpi/about_chat_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/about_chat_over.png b/res/drawable-xhdpi/about_chat_over.png deleted file mode 100644 index c05e4b14e..000000000 Binary files a/res/drawable-xhdpi/about_chat_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/about_chat_selected.png b/res/drawable-xhdpi/about_chat_selected.png deleted file mode 100644 index fb523a4bd..000000000 Binary files a/res/drawable-xhdpi/about_chat_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/about_settings_default.png b/res/drawable-xhdpi/about_settings_default.png deleted file mode 100644 index bf1a4c81d..000000000 Binary files a/res/drawable-xhdpi/about_settings_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/about_settings_over.png b/res/drawable-xhdpi/about_settings_over.png deleted file mode 100644 index 6a265b3e3..000000000 Binary files a/res/drawable-xhdpi/about_settings_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/about_settings_selected.png b/res/drawable-xhdpi/about_settings_selected.png deleted file mode 100644 index 66fcdb232..000000000 Binary files a/res/drawable-xhdpi/about_settings_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/add_call_more_default.png b/res/drawable-xhdpi/add_call_more_default.png deleted file mode 100644 index 0932c749d..000000000 Binary files a/res/drawable-xhdpi/add_call_more_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/add_call_more_disable.png b/res/drawable-xhdpi/add_call_more_disable.png deleted file mode 100644 index caee628d0..000000000 Binary files a/res/drawable-xhdpi/add_call_more_disable.png and /dev/null differ diff --git a/res/drawable-xhdpi/add_call_more_over.png b/res/drawable-xhdpi/add_call_more_over.png deleted file mode 100644 index 09e5b9197..000000000 Binary files a/res/drawable-xhdpi/add_call_more_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/add_contact_default.png b/res/drawable-xhdpi/add_contact_default.png deleted file mode 100644 index 5da115460..000000000 Binary files a/res/drawable-xhdpi/add_contact_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/add_contact_disabled.png b/res/drawable-xhdpi/add_contact_disabled.png deleted file mode 100644 index 337a99e51..000000000 Binary files a/res/drawable-xhdpi/add_contact_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/add_contact_over.png b/res/drawable-xhdpi/add_contact_over.png deleted file mode 100644 index 0230d7e76..000000000 Binary files a/res/drawable-xhdpi/add_contact_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/add_field_default.png b/res/drawable-xhdpi/add_field_default.png new file mode 100644 index 000000000..80291fd42 Binary files /dev/null and b/res/drawable-xhdpi/add_field_default.png differ diff --git a/res/drawable-xhdpi/add_field_over.png b/res/drawable-xhdpi/add_field_over.png new file mode 100644 index 000000000..2a2ce2f74 Binary files /dev/null and b/res/drawable-xhdpi/add_field_over.png differ diff --git a/res/drawable-xhdpi/arrow_accept.png b/res/drawable-xhdpi/arrow_accept.png new file mode 100644 index 000000000..c90817e48 Binary files /dev/null and b/res/drawable-xhdpi/arrow_accept.png differ diff --git a/res/drawable-xhdpi/arrow_hangup.png b/res/drawable-xhdpi/arrow_hangup.png new file mode 100644 index 000000000..8c113903c Binary files /dev/null and b/res/drawable-xhdpi/arrow_hangup.png differ diff --git a/res/drawable-xhdpi/avatar.png b/res/drawable-xhdpi/avatar.png new file mode 100644 index 000000000..d3a0bf331 Binary files /dev/null and b/res/drawable-xhdpi/avatar.png differ diff --git a/res/drawable-xhdpi/avatar_chat_mask.png b/res/drawable-xhdpi/avatar_chat_mask.png new file mode 100644 index 000000000..43d40040e Binary files /dev/null and b/res/drawable-xhdpi/avatar_chat_mask.png differ diff --git a/res/drawable-xhdpi/avatar_mask.png b/res/drawable-xhdpi/avatar_mask.png new file mode 100644 index 000000000..0ab25721f Binary files /dev/null and b/res/drawable-xhdpi/avatar_mask.png differ diff --git a/res/drawable-xhdpi/avatar_mask_border.png b/res/drawable-xhdpi/avatar_mask_border.png new file mode 100644 index 000000000..606d9012e Binary files /dev/null and b/res/drawable-xhdpi/avatar_mask_border.png differ diff --git a/res/drawable-xhdpi/avatar_shadow.png b/res/drawable-xhdpi/avatar_shadow.png deleted file mode 100644 index 7a8aac483..000000000 Binary files a/res/drawable-xhdpi/avatar_shadow.png and /dev/null differ diff --git a/res/drawable-xhdpi/avatar_shadow_left.png b/res/drawable-xhdpi/avatar_shadow_left.png deleted file mode 100644 index a8733f7a0..000000000 Binary files a/res/drawable-xhdpi/avatar_shadow_left.png and /dev/null differ diff --git a/res/drawable-xhdpi/avatar_shadow_right.png b/res/drawable-xhdpi/avatar_shadow_right.png deleted file mode 100644 index 96c8327bf..000000000 Binary files a/res/drawable-xhdpi/avatar_shadow_right.png and /dev/null differ diff --git a/res/drawable-xhdpi/back.png b/res/drawable-xhdpi/back.png new file mode 100644 index 000000000..b81b9fb89 Binary files /dev/null and b/res/drawable-xhdpi/back.png differ diff --git a/res/drawable-xhdpi/back_default.png b/res/drawable-xhdpi/back_default.png deleted file mode 100644 index d7088080a..000000000 Binary files a/res/drawable-xhdpi/back_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/back_disabled.png b/res/drawable-xhdpi/back_disabled.png deleted file mode 100644 index d6e641fa5..000000000 Binary files a/res/drawable-xhdpi/back_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/back_over.png b/res/drawable-xhdpi/back_over.png deleted file mode 100644 index d06321994..000000000 Binary files a/res/drawable-xhdpi/back_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/backspace_default.png b/res/drawable-xhdpi/backspace_default.png index b19ba4fa1..1280f1698 100644 Binary files a/res/drawable-xhdpi/backspace_default.png and b/res/drawable-xhdpi/backspace_default.png differ diff --git a/res/drawable-xhdpi/backspace_disabled.png b/res/drawable-xhdpi/backspace_disabled.png new file mode 100644 index 000000000..9895301ce Binary files /dev/null and b/res/drawable-xhdpi/backspace_disabled.png differ diff --git a/res/drawable-xhdpi/backspace_over.png b/res/drawable-xhdpi/backspace_over.png index abd0e13a6..5d3d2bdfe 100644 Binary files a/res/drawable-xhdpi/backspace_over.png and b/res/drawable-xhdpi/backspace_over.png differ diff --git a/res/drawable-xhdpi/button_alert_background_default.9.png b/res/drawable-xhdpi/button_alert_background_default.9.png deleted file mode 100644 index b8857340d..000000000 Binary files a/res/drawable-xhdpi/button_alert_background_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/button_alert_background_over.9.png b/res/drawable-xhdpi/button_alert_background_over.9.png deleted file mode 100644 index f42b202ff..000000000 Binary files a/res/drawable-xhdpi/button_alert_background_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/button_background_default.9.png b/res/drawable-xhdpi/button_background_default.9.png deleted file mode 100644 index c19f88e0b..000000000 Binary files a/res/drawable-xhdpi/button_background_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/button_background_over.9.png b/res/drawable-xhdpi/button_background_over.9.png deleted file mode 100644 index 4c66f4a93..000000000 Binary files a/res/drawable-xhdpi/button_background_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_add.png b/res/drawable-xhdpi/call_add.png new file mode 100644 index 000000000..db4ca84b4 Binary files /dev/null and b/res/drawable-xhdpi/call_add.png differ diff --git a/res/drawable-xhdpi/call_alt_back.png b/res/drawable-xhdpi/call_alt_back.png new file mode 100644 index 000000000..6af067d4f Binary files /dev/null and b/res/drawable-xhdpi/call_alt_back.png differ diff --git a/res/drawable-xhdpi/call_alt_start.png b/res/drawable-xhdpi/call_alt_start.png new file mode 100644 index 000000000..836a0ec5d Binary files /dev/null and b/res/drawable-xhdpi/call_alt_start.png differ diff --git a/res/drawable-xhdpi/call_answer_default.png b/res/drawable-xhdpi/call_answer_default.png deleted file mode 100644 index 56cd9d677..000000000 Binary files a/res/drawable-xhdpi/call_answer_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_answer_over.png b/res/drawable-xhdpi/call_answer_over.png deleted file mode 100644 index ea860d42c..000000000 Binary files a/res/drawable-xhdpi/call_answer_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_audio_start.png b/res/drawable-xhdpi/call_audio_start.png new file mode 100644 index 000000000..3f7b6932d Binary files /dev/null and b/res/drawable-xhdpi/call_audio_start.png differ diff --git a/res/drawable-xhdpi/call_back.png b/res/drawable-xhdpi/call_back.png new file mode 100644 index 000000000..3045bd866 Binary files /dev/null and b/res/drawable-xhdpi/call_back.png differ diff --git a/res/drawable-xhdpi/call_default.png b/res/drawable-xhdpi/call_default.png deleted file mode 100644 index fc2792247..000000000 Binary files a/res/drawable-xhdpi/call_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_disabled.png b/res/drawable-xhdpi/call_disabled.png deleted file mode 100644 index 5600f1945..000000000 Binary files a/res/drawable-xhdpi/call_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_hangup.png b/res/drawable-xhdpi/call_hangup.png new file mode 100644 index 000000000..23fb40172 Binary files /dev/null and b/res/drawable-xhdpi/call_hangup.png differ diff --git a/res/drawable-xhdpi/call_incoming.png b/res/drawable-xhdpi/call_incoming.png new file mode 100644 index 000000000..89d593a4c Binary files /dev/null and b/res/drawable-xhdpi/call_incoming.png differ diff --git a/res/drawable-xhdpi/call_missed.png b/res/drawable-xhdpi/call_missed.png new file mode 100644 index 000000000..e1074ffaf Binary files /dev/null and b/res/drawable-xhdpi/call_missed.png differ diff --git a/res/drawable-xhdpi/call_outgoing.png b/res/drawable-xhdpi/call_outgoing.png new file mode 100644 index 000000000..c6df94bd9 Binary files /dev/null and b/res/drawable-xhdpi/call_outgoing.png differ diff --git a/res/drawable-xhdpi/call_over.png b/res/drawable-xhdpi/call_over.png deleted file mode 100644 index 9cbf18c60..000000000 Binary files a/res/drawable-xhdpi/call_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_quality_indicator_0.png b/res/drawable-xhdpi/call_quality_indicator_0.png index 7bdaf40ab..06804eda3 100644 Binary files a/res/drawable-xhdpi/call_quality_indicator_0.png and b/res/drawable-xhdpi/call_quality_indicator_0.png differ diff --git a/res/drawable-xhdpi/call_quality_indicator_1.png b/res/drawable-xhdpi/call_quality_indicator_1.png index 2cca9b39c..faa61c3e2 100644 Binary files a/res/drawable-xhdpi/call_quality_indicator_1.png and b/res/drawable-xhdpi/call_quality_indicator_1.png differ diff --git a/res/drawable-xhdpi/call_quality_indicator_2.png b/res/drawable-xhdpi/call_quality_indicator_2.png index adab949fc..01335b677 100644 Binary files a/res/drawable-xhdpi/call_quality_indicator_2.png and b/res/drawable-xhdpi/call_quality_indicator_2.png differ diff --git a/res/drawable-xhdpi/call_quality_indicator_3.png b/res/drawable-xhdpi/call_quality_indicator_3.png index 91118ff60..a9a2fa03e 100644 Binary files a/res/drawable-xhdpi/call_quality_indicator_3.png and b/res/drawable-xhdpi/call_quality_indicator_3.png differ diff --git a/res/drawable-xhdpi/call_quality_indicator_4.png b/res/drawable-xhdpi/call_quality_indicator_4.png new file mode 100644 index 000000000..e2c95d4f7 Binary files /dev/null and b/res/drawable-xhdpi/call_quality_indicator_4.png differ diff --git a/res/drawable-xhdpi/call_refused_icon.png b/res/drawable-xhdpi/call_refused_icon.png deleted file mode 100644 index 084515cfe..000000000 Binary files a/res/drawable-xhdpi/call_refused_icon.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_refused_icon_over.png b/res/drawable-xhdpi/call_refused_icon_over.png deleted file mode 100644 index c821dc13b..000000000 Binary files a/res/drawable-xhdpi/call_refused_icon_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_start_body_default.png b/res/drawable-xhdpi/call_start_body_default.png new file mode 100644 index 000000000..f2c474a34 Binary files /dev/null and b/res/drawable-xhdpi/call_start_body_default.png differ diff --git a/res/drawable-xhdpi/call_start_body_disabled.png b/res/drawable-xhdpi/call_start_body_disabled.png new file mode 100644 index 000000000..801708d34 Binary files /dev/null and b/res/drawable-xhdpi/call_start_body_disabled.png differ diff --git a/res/drawable-xhdpi/call_start_body_over.png b/res/drawable-xhdpi/call_start_body_over.png new file mode 100644 index 000000000..9bc6ada2b Binary files /dev/null and b/res/drawable-xhdpi/call_start_body_over.png differ diff --git a/res/drawable-xhdpi/call_state_delete_default.png b/res/drawable-xhdpi/call_state_delete_default.png deleted file mode 100644 index 8c1843de8..000000000 Binary files a/res/drawable-xhdpi/call_state_delete_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_state_delete_over.png b/res/drawable-xhdpi/call_state_delete_over.png deleted file mode 100644 index bc01f8f5d..000000000 Binary files a/res/drawable-xhdpi/call_state_delete_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_state_outgoing_default.png b/res/drawable-xhdpi/call_state_outgoing_default.png deleted file mode 100644 index ca1f8f99b..000000000 Binary files a/res/drawable-xhdpi/call_state_outgoing_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_state_ringing_default.png b/res/drawable-xhdpi/call_state_ringing_default.png deleted file mode 100644 index f7314e148..000000000 Binary files a/res/drawable-xhdpi/call_state_ringing_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/call_status_incoming.png b/res/drawable-xhdpi/call_status_incoming.png index 2ce5c676e..bb3f4d0ff 100644 Binary files a/res/drawable-xhdpi/call_status_incoming.png and b/res/drawable-xhdpi/call_status_incoming.png differ diff --git a/res/drawable-xhdpi/call_status_missed.png b/res/drawable-xhdpi/call_status_missed.png index 426dee899..582040717 100644 Binary files a/res/drawable-xhdpi/call_status_missed.png and b/res/drawable-xhdpi/call_status_missed.png differ diff --git a/res/drawable-xhdpi/call_status_outgoing.png b/res/drawable-xhdpi/call_status_outgoing.png index 645875ce1..5ae14394b 100644 Binary files a/res/drawable-xhdpi/call_status_outgoing.png and b/res/drawable-xhdpi/call_status_outgoing.png differ diff --git a/res/drawable-xhdpi/call_transfer.png b/res/drawable-xhdpi/call_transfer.png new file mode 100644 index 000000000..ef831ef39 Binary files /dev/null and b/res/drawable-xhdpi/call_transfer.png differ diff --git a/res/drawable-xhdpi/call_video_start.png b/res/drawable-xhdpi/call_video_start.png new file mode 100644 index 000000000..a936b8894 Binary files /dev/null and b/res/drawable-xhdpi/call_video_start.png differ diff --git a/res/drawable-xhdpi/camera_default.png b/res/drawable-xhdpi/camera_default.png new file mode 100644 index 000000000..34a6c1c82 Binary files /dev/null and b/res/drawable-xhdpi/camera_default.png differ diff --git a/res/drawable-xhdpi/camera_disabled.png b/res/drawable-xhdpi/camera_disabled.png new file mode 100644 index 000000000..0fa899521 Binary files /dev/null and b/res/drawable-xhdpi/camera_disabled.png differ diff --git a/res/drawable-xhdpi/camera_selected.png b/res/drawable-xhdpi/camera_selected.png new file mode 100644 index 000000000..4d3664d84 Binary files /dev/null and b/res/drawable-xhdpi/camera_selected.png differ diff --git a/res/drawable-xhdpi/camera_switch_default.png b/res/drawable-xhdpi/camera_switch_default.png new file mode 100644 index 000000000..640a61896 Binary files /dev/null and b/res/drawable-xhdpi/camera_switch_default.png differ diff --git a/res/drawable-xhdpi/camera_switch_disabled.png b/res/drawable-xhdpi/camera_switch_disabled.png new file mode 100644 index 000000000..2f3d64306 Binary files /dev/null and b/res/drawable-xhdpi/camera_switch_disabled.png differ diff --git a/res/drawable-xhdpi/camera_switch_over.png b/res/drawable-xhdpi/camera_switch_over.png new file mode 100644 index 000000000..addecb1ca Binary files /dev/null and b/res/drawable-xhdpi/camera_switch_over.png differ diff --git a/res/drawable-xhdpi/cancel_edit.png b/res/drawable-xhdpi/cancel_edit.png new file mode 100644 index 000000000..451836e7e Binary files /dev/null and b/res/drawable-xhdpi/cancel_edit.png differ diff --git a/res/drawable-xhdpi/cell_background.png b/res/drawable-xhdpi/cell_background.png deleted file mode 100644 index 5ca0934fb..000000000 Binary files a/res/drawable-xhdpi/cell_background.png and /dev/null differ diff --git a/res/drawable-xhdpi/cell_call.png b/res/drawable-xhdpi/cell_call.png deleted file mode 100644 index f4fd83b8f..000000000 Binary files a/res/drawable-xhdpi/cell_call.png and /dev/null differ diff --git a/res/drawable-xhdpi/cell_call_first.png b/res/drawable-xhdpi/cell_call_first.png deleted file mode 100644 index 17b55ffef..000000000 Binary files a/res/drawable-xhdpi/cell_call_first.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_add.png b/res/drawable-xhdpi/chat_add.png new file mode 100644 index 000000000..a9733a833 Binary files /dev/null and b/res/drawable-xhdpi/chat_add.png differ diff --git a/res/drawable-xhdpi/chat_attachment_default.png b/res/drawable-xhdpi/chat_attachment_default.png new file mode 100644 index 000000000..8cba3b8c9 Binary files /dev/null and b/res/drawable-xhdpi/chat_attachment_default.png differ diff --git a/res/drawable-xhdpi/chat_attachment_over.png b/res/drawable-xhdpi/chat_attachment_over.png new file mode 100644 index 000000000..97245b742 Binary files /dev/null and b/res/drawable-xhdpi/chat_attachment_over.png differ diff --git a/res/drawable-xhdpi/chat_back_default.9.png b/res/drawable-xhdpi/chat_back_default.9.png deleted file mode 100644 index 0979d7605..000000000 Binary files a/res/drawable-xhdpi/chat_back_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_back_over.9.png b/res/drawable-xhdpi/chat_back_over.9.png deleted file mode 100644 index 841fb620d..000000000 Binary files a/res/drawable-xhdpi/chat_back_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_background.png b/res/drawable-xhdpi/chat_background.png deleted file mode 100644 index 8a28fcd3b..000000000 Binary files a/res/drawable-xhdpi/chat_background.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_bubble_incoming.9.png b/res/drawable-xhdpi/chat_bubble_incoming.9.png deleted file mode 100644 index 68ef2b302..000000000 Binary files a/res/drawable-xhdpi/chat_bubble_incoming.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_bubble_outgoing.9.png b/res/drawable-xhdpi/chat_bubble_outgoing.9.png deleted file mode 100644 index 1aa640f8c..000000000 Binary files a/res/drawable-xhdpi/chat_bubble_outgoing.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_default.png b/res/drawable-xhdpi/chat_default.png deleted file mode 100644 index bcd5e9621..000000000 Binary files a/res/drawable-xhdpi/chat_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_edit_default.9.png b/res/drawable-xhdpi/chat_edit_default.9.png deleted file mode 100644 index 9a248d7f0..000000000 Binary files a/res/drawable-xhdpi/chat_edit_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_edit_over.9.png b/res/drawable-xhdpi/chat_edit_over.9.png deleted file mode 100644 index 46f206543..000000000 Binary files a/res/drawable-xhdpi/chat_edit_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_fast_address_background.9.png b/res/drawable-xhdpi/chat_fast_address_background.9.png deleted file mode 100644 index 93e5257f5..000000000 Binary files a/res/drawable-xhdpi/chat_fast_address_background.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_field_background.9.png b/res/drawable-xhdpi/chat_field_background.9.png deleted file mode 100644 index 5c406644c..000000000 Binary files a/res/drawable-xhdpi/chat_field_background.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_file_message.png b/res/drawable-xhdpi/chat_file_message.png new file mode 100644 index 000000000..624596c76 Binary files /dev/null and b/res/drawable-xhdpi/chat_file_message.png differ diff --git a/res/drawable-xhdpi/chat_icon_default.png b/res/drawable-xhdpi/chat_icon_default.png deleted file mode 100644 index 7a26c20eb..000000000 Binary files a/res/drawable-xhdpi/chat_icon_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_icon_over.png b/res/drawable-xhdpi/chat_icon_over.png deleted file mode 100644 index 6644f4f98..000000000 Binary files a/res/drawable-xhdpi/chat_icon_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_list_indicator.png b/res/drawable-xhdpi/chat_list_indicator.png new file mode 100644 index 000000000..6c3e099bd Binary files /dev/null and b/res/drawable-xhdpi/chat_list_indicator.png differ diff --git a/res/drawable-xhdpi/chat_message_delivered.png b/res/drawable-xhdpi/chat_message_delivered.png new file mode 100644 index 000000000..b98f73db2 Binary files /dev/null and b/res/drawable-xhdpi/chat_message_delivered.png differ diff --git a/res/drawable-xhdpi/chat_message_inprogress.png b/res/drawable-xhdpi/chat_message_inprogress.png new file mode 100644 index 000000000..f762b2d5e Binary files /dev/null and b/res/drawable-xhdpi/chat_message_inprogress.png differ diff --git a/res/drawable-xhdpi/chat_message_not_delivered.png b/res/drawable-xhdpi/chat_message_not_delivered.png new file mode 100644 index 000000000..f858a3cea Binary files /dev/null and b/res/drawable-xhdpi/chat_message_not_delivered.png differ diff --git a/res/drawable-xhdpi/chat_new_default.9.png b/res/drawable-xhdpi/chat_new_default.9.png deleted file mode 100644 index 5d082362d..000000000 Binary files a/res/drawable-xhdpi/chat_new_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_new_over.9.png b/res/drawable-xhdpi/chat_new_over.9.png deleted file mode 100644 index 3dedc532b..000000000 Binary files a/res/drawable-xhdpi/chat_new_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_ok_default.9.png b/res/drawable-xhdpi/chat_ok_default.9.png deleted file mode 100644 index 3d5c1bd66..000000000 Binary files a/res/drawable-xhdpi/chat_ok_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_ok_over.9.png b/res/drawable-xhdpi/chat_ok_over.9.png deleted file mode 100644 index 173a68908..000000000 Binary files a/res/drawable-xhdpi/chat_ok_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_over.png b/res/drawable-xhdpi/chat_over.png deleted file mode 100644 index 08bbb3345..000000000 Binary files a/res/drawable-xhdpi/chat_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_photo_default.png b/res/drawable-xhdpi/chat_photo_default.png deleted file mode 100644 index 6867dafa7..000000000 Binary files a/res/drawable-xhdpi/chat_photo_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_photo_disabled.png b/res/drawable-xhdpi/chat_photo_disabled.png deleted file mode 100644 index 1a3152ffe..000000000 Binary files a/res/drawable-xhdpi/chat_photo_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_photo_over.png b/res/drawable-xhdpi/chat_photo_over.png deleted file mode 100644 index 26fbf1a25..000000000 Binary files a/res/drawable-xhdpi/chat_photo_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_picture_over.png b/res/drawable-xhdpi/chat_picture_over.png new file mode 100644 index 000000000..d53230dd0 Binary files /dev/null and b/res/drawable-xhdpi/chat_picture_over.png differ diff --git a/res/drawable-xhdpi/chat_selected.png b/res/drawable-xhdpi/chat_selected.png deleted file mode 100644 index 9b1eed184..000000000 Binary files a/res/drawable-xhdpi/chat_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_send_default.png b/res/drawable-xhdpi/chat_send_default.png index d441de3f2..d197d1504 100644 Binary files a/res/drawable-xhdpi/chat_send_default.png and b/res/drawable-xhdpi/chat_send_default.png differ diff --git a/res/drawable-xhdpi/chat_send_disabled.png b/res/drawable-xhdpi/chat_send_disabled.png deleted file mode 100644 index 75b831602..000000000 Binary files a/res/drawable-xhdpi/chat_send_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_send_over.png b/res/drawable-xhdpi/chat_send_over.png index 49976fe0d..a3354fa2b 100644 Binary files a/res/drawable-xhdpi/chat_send_over.png and b/res/drawable-xhdpi/chat_send_over.png differ diff --git a/res/drawable-xhdpi/chat_start_body_default.png b/res/drawable-xhdpi/chat_start_body_default.png new file mode 100644 index 000000000..8a8fcce1c Binary files /dev/null and b/res/drawable-xhdpi/chat_start_body_default.png differ diff --git a/res/drawable-xhdpi/chat_start_body_disabled.png b/res/drawable-xhdpi/chat_start_body_disabled.png new file mode 100644 index 000000000..81dc3557b Binary files /dev/null and b/res/drawable-xhdpi/chat_start_body_disabled.png differ diff --git a/res/drawable-xhdpi/chat_start_body_over.png b/res/drawable-xhdpi/chat_start_body_over.png new file mode 100644 index 000000000..e7aa3b022 Binary files /dev/null and b/res/drawable-xhdpi/chat_start_body_over.png differ diff --git a/res/drawable-xhdpi/chat_stop_upload_default.png b/res/drawable-xhdpi/chat_stop_upload_default.png deleted file mode 100644 index b5e87a2e1..000000000 Binary files a/res/drawable-xhdpi/chat_stop_upload_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/chat_stop_upload_over.png b/res/drawable-xhdpi/chat_stop_upload_over.png deleted file mode 100644 index 5d2abd3f8..000000000 Binary files a/res/drawable-xhdpi/chat_stop_upload_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/checkbox_checked.png b/res/drawable-xhdpi/checkbox_checked.png new file mode 100644 index 000000000..66f4ddec6 Binary files /dev/null and b/res/drawable-xhdpi/checkbox_checked.png differ diff --git a/res/drawable-xhdpi/checkbox_unchecked.png b/res/drawable-xhdpi/checkbox_unchecked.png new file mode 100644 index 000000000..f0ec61800 Binary files /dev/null and b/res/drawable-xhdpi/checkbox_unchecked.png differ diff --git a/res/drawable-xhdpi/clean_field_default.png b/res/drawable-xhdpi/clean_field_default.png new file mode 100644 index 000000000..320dc12d2 Binary files /dev/null and b/res/drawable-xhdpi/clean_field_default.png differ diff --git a/res/drawable-xhdpi/clean_field_over.png b/res/drawable-xhdpi/clean_field_over.png new file mode 100644 index 000000000..a9580ff23 Binary files /dev/null and b/res/drawable-xhdpi/clean_field_over.png differ diff --git a/res/drawable-xhdpi/conference_default.png b/res/drawable-xhdpi/conference_default.png deleted file mode 100644 index ca03a9940..000000000 Binary files a/res/drawable-xhdpi/conference_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/conference_exit_default.png b/res/drawable-xhdpi/conference_exit_default.png new file mode 100644 index 000000000..ccc8a0ac7 Binary files /dev/null and b/res/drawable-xhdpi/conference_exit_default.png differ diff --git a/res/drawable-xhdpi/conference_exit_over.png b/res/drawable-xhdpi/conference_exit_over.png new file mode 100644 index 000000000..8035a5e48 Binary files /dev/null and b/res/drawable-xhdpi/conference_exit_over.png differ diff --git a/res/drawable-xhdpi/conference_over.png b/res/drawable-xhdpi/conference_over.png deleted file mode 100644 index 6446f9dea..000000000 Binary files a/res/drawable-xhdpi/conference_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/conference_start.png b/res/drawable-xhdpi/conference_start.png new file mode 100644 index 000000000..544b88b5a Binary files /dev/null and b/res/drawable-xhdpi/conference_start.png differ diff --git a/res/drawable-xhdpi/contact_add.png b/res/drawable-xhdpi/contact_add.png new file mode 100644 index 000000000..a16e6e006 Binary files /dev/null and b/res/drawable-xhdpi/contact_add.png differ diff --git a/res/drawable-xhdpi/contact_add_default.9.png b/res/drawable-xhdpi/contact_add_default.9.png deleted file mode 100644 index 11144e8f8..000000000 Binary files a/res/drawable-xhdpi/contact_add_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_add_disabled.png b/res/drawable-xhdpi/contact_add_disabled.png new file mode 100644 index 000000000..2be5d9cc9 Binary files /dev/null and b/res/drawable-xhdpi/contact_add_disabled.png differ diff --git a/res/drawable-xhdpi/contact_add_over.9.png b/res/drawable-xhdpi/contact_add_over.9.png deleted file mode 100644 index ac5c3f018..000000000 Binary files a/res/drawable-xhdpi/contact_add_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_cancel_default.9.png b/res/drawable-xhdpi/contact_cancel_default.9.png deleted file mode 100644 index 16d416922..000000000 Binary files a/res/drawable-xhdpi/contact_cancel_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_cancel_over.9.png b/res/drawable-xhdpi/contact_cancel_over.9.png deleted file mode 100644 index 6f4b52aba..000000000 Binary files a/res/drawable-xhdpi/contact_cancel_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_delete_default.9.png b/res/drawable-xhdpi/contact_delete_default.9.png deleted file mode 100644 index 993639f69..000000000 Binary files a/res/drawable-xhdpi/contact_delete_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_delete_over.9.png b/res/drawable-xhdpi/contact_delete_over.9.png deleted file mode 100644 index bf0fdcd75..000000000 Binary files a/res/drawable-xhdpi/contact_delete_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_edit_default.9.png b/res/drawable-xhdpi/contact_edit_default.9.png deleted file mode 100644 index 41e20f67a..000000000 Binary files a/res/drawable-xhdpi/contact_edit_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_edit_over.9.png b/res/drawable-xhdpi/contact_edit_over.9.png deleted file mode 100644 index de5862e7e..000000000 Binary files a/res/drawable-xhdpi/contact_edit_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_ok_default.9.png b/res/drawable-xhdpi/contact_ok_default.9.png deleted file mode 100644 index 3d5c1bd66..000000000 Binary files a/res/drawable-xhdpi/contact_ok_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_ok_disabled.9.png b/res/drawable-xhdpi/contact_ok_disabled.9.png deleted file mode 100644 index c2b480881..000000000 Binary files a/res/drawable-xhdpi/contact_ok_disabled.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contact_ok_over.9.png b/res/drawable-xhdpi/contact_ok_over.9.png deleted file mode 100644 index 173a68908..000000000 Binary files a/res/drawable-xhdpi/contact_ok_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_add_default.9.png b/res/drawable-xhdpi/contacts_add_default.9.png deleted file mode 100644 index e2cb849eb..000000000 Binary files a/res/drawable-xhdpi/contacts_add_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_add_over.9.png b/res/drawable-xhdpi/contacts_add_over.9.png deleted file mode 100644 index c9ac5132c..000000000 Binary files a/res/drawable-xhdpi/contacts_add_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_all_default.9.png b/res/drawable-xhdpi/contacts_all_default.9.png deleted file mode 100644 index fde304469..000000000 Binary files a/res/drawable-xhdpi/contacts_all_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_all_default.png b/res/drawable-xhdpi/contacts_all_default.png new file mode 100644 index 000000000..07d00c6a2 Binary files /dev/null and b/res/drawable-xhdpi/contacts_all_default.png differ diff --git a/res/drawable-xhdpi/contacts_all_selected.9.png b/res/drawable-xhdpi/contacts_all_selected.9.png deleted file mode 100644 index 3a4cf50dd..000000000 Binary files a/res/drawable-xhdpi/contacts_all_selected.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_all_selected.png b/res/drawable-xhdpi/contacts_all_selected.png new file mode 100644 index 000000000..c590b7ac7 Binary files /dev/null and b/res/drawable-xhdpi/contacts_all_selected.png differ diff --git a/res/drawable-xhdpi/contacts_default.png b/res/drawable-xhdpi/contacts_default.png deleted file mode 100644 index a6d96b10d..000000000 Binary files a/res/drawable-xhdpi/contacts_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_linphone_default.9.png b/res/drawable-xhdpi/contacts_linphone_default.9.png deleted file mode 100644 index 4a6ddad8f..000000000 Binary files a/res/drawable-xhdpi/contacts_linphone_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_linphone_selected.9.png b/res/drawable-xhdpi/contacts_linphone_selected.9.png deleted file mode 100644 index eaba5d651..000000000 Binary files a/res/drawable-xhdpi/contacts_linphone_selected.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_over.png b/res/drawable-xhdpi/contacts_over.png deleted file mode 100644 index e6a8994ff..000000000 Binary files a/res/drawable-xhdpi/contacts_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_selected.png b/res/drawable-xhdpi/contacts_selected.png deleted file mode 100644 index a304e6edb..000000000 Binary files a/res/drawable-xhdpi/contacts_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/contacts_sip_default.png b/res/drawable-xhdpi/contacts_sip_default.png new file mode 100644 index 000000000..48184b73a Binary files /dev/null and b/res/drawable-xhdpi/contacts_sip_default.png differ diff --git a/res/drawable-xhdpi/contacts_sip_selected.png b/res/drawable-xhdpi/contacts_sip_selected.png new file mode 100644 index 000000000..f05340cbe Binary files /dev/null and b/res/drawable-xhdpi/contacts_sip_selected.png differ diff --git a/res/drawable-xhdpi/delete.png b/res/drawable-xhdpi/delete.png new file mode 100644 index 000000000..76e3d112a Binary files /dev/null and b/res/drawable-xhdpi/delete.png differ diff --git a/res/drawable-xhdpi/delete_default.png b/res/drawable-xhdpi/delete_default.png deleted file mode 100644 index 8c1843de8..000000000 Binary files a/res/drawable-xhdpi/delete_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/delete_disabled.png b/res/drawable-xhdpi/delete_disabled.png new file mode 100644 index 000000000..ce7025092 Binary files /dev/null and b/res/drawable-xhdpi/delete_disabled.png differ diff --git a/res/drawable-xhdpi/delete_field_default.png b/res/drawable-xhdpi/delete_field_default.png new file mode 100644 index 000000000..e750f2c0a Binary files /dev/null and b/res/drawable-xhdpi/delete_field_default.png differ diff --git a/res/drawable-xhdpi/delete_field_over.png b/res/drawable-xhdpi/delete_field_over.png new file mode 100644 index 000000000..ca6aa09fc Binary files /dev/null and b/res/drawable-xhdpi/delete_field_over.png differ diff --git a/res/drawable-xhdpi/delete_over.png b/res/drawable-xhdpi/delete_over.png deleted file mode 100644 index bc01f8f5d..000000000 Binary files a/res/drawable-xhdpi/delete_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/deselect_all.png b/res/drawable-xhdpi/deselect_all.png new file mode 100644 index 000000000..69ee8a272 Binary files /dev/null and b/res/drawable-xhdpi/deselect_all.png differ diff --git a/res/drawable-xhdpi/dialer_address_background.png b/res/drawable-xhdpi/dialer_address_background.png deleted file mode 100644 index 0751263e1..000000000 Binary files a/res/drawable-xhdpi/dialer_address_background.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_alt_back.png b/res/drawable-xhdpi/dialer_alt_back.png new file mode 100644 index 000000000..9c1f84b91 Binary files /dev/null and b/res/drawable-xhdpi/dialer_alt_back.png differ diff --git a/res/drawable-xhdpi/dialer_alt_back_default.png b/res/drawable-xhdpi/dialer_alt_back_default.png deleted file mode 100644 index bacd50f44..000000000 Binary files a/res/drawable-xhdpi/dialer_alt_back_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_alt_back_over.png b/res/drawable-xhdpi/dialer_alt_back_over.png deleted file mode 100644 index 3e3a6dfd2..000000000 Binary files a/res/drawable-xhdpi/dialer_alt_back_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_alt_background.png b/res/drawable-xhdpi/dialer_alt_background.png deleted file mode 100644 index 86b6c3f02..000000000 Binary files a/res/drawable-xhdpi/dialer_alt_background.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_alt_default.png b/res/drawable-xhdpi/dialer_alt_default.png deleted file mode 100644 index 43d512c04..000000000 Binary files a/res/drawable-xhdpi/dialer_alt_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_alt_disabled.png b/res/drawable-xhdpi/dialer_alt_disabled.png deleted file mode 100644 index d85d7fa76..000000000 Binary files a/res/drawable-xhdpi/dialer_alt_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_alt_over.png b/res/drawable-xhdpi/dialer_alt_over.png deleted file mode 100644 index 28567955d..000000000 Binary files a/res/drawable-xhdpi/dialer_alt_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_back.png b/res/drawable-xhdpi/dialer_back.png new file mode 100644 index 000000000..a9eb45734 Binary files /dev/null and b/res/drawable-xhdpi/dialer_back.png differ diff --git a/res/drawable-xhdpi/dialer_background.png b/res/drawable-xhdpi/dialer_background.png new file mode 100644 index 000000000..fc750d8b2 Binary files /dev/null and b/res/drawable-xhdpi/dialer_background.png differ diff --git a/res/drawable-xhdpi/dialer_default.png b/res/drawable-xhdpi/dialer_default.png deleted file mode 100644 index 6d1957b1a..000000000 Binary files a/res/drawable-xhdpi/dialer_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_over.png b/res/drawable-xhdpi/dialer_over.png deleted file mode 100644 index 13b5f34ab..000000000 Binary files a/res/drawable-xhdpi/dialer_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/dialer_selected.png b/res/drawable-xhdpi/dialer_selected.png deleted file mode 100644 index 47b0c03b6..000000000 Binary files a/res/drawable-xhdpi/dialer_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/edit.png b/res/drawable-xhdpi/edit.png new file mode 100644 index 000000000..5550b05a2 Binary files /dev/null and b/res/drawable-xhdpi/edit.png differ diff --git a/res/drawable-xhdpi/edit_list.png b/res/drawable-xhdpi/edit_list.png new file mode 100644 index 000000000..3d53dd5cd Binary files /dev/null and b/res/drawable-xhdpi/edit_list.png differ diff --git a/res/drawable-xhdpi/edit_list_disabled.png b/res/drawable-xhdpi/edit_list_disabled.png new file mode 100644 index 000000000..4817a6b0a Binary files /dev/null and b/res/drawable-xhdpi/edit_list_disabled.png differ diff --git a/res/drawable-xhdpi/emo_im_angel.png b/res/drawable-xhdpi/emo_im_angel.png deleted file mode 100644 index 2cbb7dace..000000000 Binary files a/res/drawable-xhdpi/emo_im_angel.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_cool.png b/res/drawable-xhdpi/emo_im_cool.png deleted file mode 100644 index 3813bc6a2..000000000 Binary files a/res/drawable-xhdpi/emo_im_cool.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_crying.png b/res/drawable-xhdpi/emo_im_crying.png deleted file mode 100644 index 3982d7052..000000000 Binary files a/res/drawable-xhdpi/emo_im_crying.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_happy.png b/res/drawable-xhdpi/emo_im_happy.png deleted file mode 100644 index f1e47237f..000000000 Binary files a/res/drawable-xhdpi/emo_im_happy.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_kissing.png b/res/drawable-xhdpi/emo_im_kissing.png deleted file mode 100644 index 21e5d304f..000000000 Binary files a/res/drawable-xhdpi/emo_im_kissing.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_laughing.png b/res/drawable-xhdpi/emo_im_laughing.png deleted file mode 100644 index 03aa60a77..000000000 Binary files a/res/drawable-xhdpi/emo_im_laughing.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_money_mouth.png b/res/drawable-xhdpi/emo_im_money_mouth.png deleted file mode 100644 index 957bc906b..000000000 Binary files a/res/drawable-xhdpi/emo_im_money_mouth.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_sad.png b/res/drawable-xhdpi/emo_im_sad.png deleted file mode 100644 index bcfe71b4c..000000000 Binary files a/res/drawable-xhdpi/emo_im_sad.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_surprised.png b/res/drawable-xhdpi/emo_im_surprised.png deleted file mode 100644 index 961a9bbfc..000000000 Binary files a/res/drawable-xhdpi/emo_im_surprised.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_tongue_sticking_out.png b/res/drawable-xhdpi/emo_im_tongue_sticking_out.png deleted file mode 100644 index 7a1235c78..000000000 Binary files a/res/drawable-xhdpi/emo_im_tongue_sticking_out.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_undecided.png b/res/drawable-xhdpi/emo_im_undecided.png deleted file mode 100644 index 72bf2f2ed..000000000 Binary files a/res/drawable-xhdpi/emo_im_undecided.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_winking.png b/res/drawable-xhdpi/emo_im_winking.png deleted file mode 100644 index b8fd6d9e3..000000000 Binary files a/res/drawable-xhdpi/emo_im_winking.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_wtf.png b/res/drawable-xhdpi/emo_im_wtf.png deleted file mode 100644 index b22179523..000000000 Binary files a/res/drawable-xhdpi/emo_im_wtf.png and /dev/null differ diff --git a/res/drawable-xhdpi/emo_im_yelling.png b/res/drawable-xhdpi/emo_im_yelling.png deleted file mode 100644 index 59798cbe0..000000000 Binary files a/res/drawable-xhdpi/emo_im_yelling.png and /dev/null differ diff --git a/res/drawable-xhdpi/fast_scroll_default.png b/res/drawable-xhdpi/fast_scroll_default.png new file mode 100644 index 000000000..947a24d95 Binary files /dev/null and b/res/drawable-xhdpi/fast_scroll_default.png differ diff --git a/res/drawable-xhdpi/fast_scroll_over.png b/res/drawable-xhdpi/fast_scroll_over.png new file mode 100644 index 000000000..134b728f7 Binary files /dev/null and b/res/drawable-xhdpi/fast_scroll_over.png differ diff --git a/res/drawable-xhdpi/footer_chat.png b/res/drawable-xhdpi/footer_chat.png new file mode 100644 index 000000000..08baaa4bc Binary files /dev/null and b/res/drawable-xhdpi/footer_chat.png differ diff --git a/res/drawable-xhdpi/footer_contacts.png b/res/drawable-xhdpi/footer_contacts.png new file mode 100644 index 000000000..fe35fecbf Binary files /dev/null and b/res/drawable-xhdpi/footer_contacts.png differ diff --git a/res/drawable-xhdpi/footer_dialer.png b/res/drawable-xhdpi/footer_dialer.png new file mode 100644 index 000000000..d76f053e3 Binary files /dev/null and b/res/drawable-xhdpi/footer_dialer.png differ diff --git a/res/drawable-xhdpi/footer_history.png b/res/drawable-xhdpi/footer_history.png new file mode 100644 index 000000000..96bfde0b6 Binary files /dev/null and b/res/drawable-xhdpi/footer_history.png differ diff --git a/res/drawable-xhdpi/friend_add.png b/res/drawable-xhdpi/friend_add.png deleted file mode 100644 index 4310ce0d3..000000000 Binary files a/res/drawable-xhdpi/friend_add.png and /dev/null differ diff --git a/res/drawable-xhdpi/friend_remove.png b/res/drawable-xhdpi/friend_remove.png deleted file mode 100644 index a1643de5d..000000000 Binary files a/res/drawable-xhdpi/friend_remove.png and /dev/null differ diff --git a/res/drawable-xhdpi/hangup_default.png b/res/drawable-xhdpi/hangup_default.png deleted file mode 100644 index c84ea15b2..000000000 Binary files a/res/drawable-xhdpi/hangup_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/hangup_over.png b/res/drawable-xhdpi/hangup_over.png deleted file mode 100644 index 2c95c5c1a..000000000 Binary files a/res/drawable-xhdpi/hangup_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_all_default.9.png b/res/drawable-xhdpi/history_all_default.9.png deleted file mode 100644 index d98a6e2d1..000000000 Binary files a/res/drawable-xhdpi/history_all_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_all_default.png b/res/drawable-xhdpi/history_all_default.png new file mode 100644 index 000000000..867e2cf70 Binary files /dev/null and b/res/drawable-xhdpi/history_all_default.png differ diff --git a/res/drawable-xhdpi/history_all_selected.9.png b/res/drawable-xhdpi/history_all_selected.9.png deleted file mode 100644 index 5396c2f17..000000000 Binary files a/res/drawable-xhdpi/history_all_selected.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_all_selected.png b/res/drawable-xhdpi/history_all_selected.png new file mode 100644 index 000000000..cf4a2293a Binary files /dev/null and b/res/drawable-xhdpi/history_all_selected.png differ diff --git a/res/drawable-xhdpi/history_chat_indicator.png b/res/drawable-xhdpi/history_chat_indicator.png new file mode 100644 index 000000000..b5f736b23 Binary files /dev/null and b/res/drawable-xhdpi/history_chat_indicator.png differ diff --git a/res/drawable-xhdpi/history_default.png b/res/drawable-xhdpi/history_default.png deleted file mode 100644 index 0442b1472..000000000 Binary files a/res/drawable-xhdpi/history_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_delete_default.9.png b/res/drawable-xhdpi/history_delete_default.9.png deleted file mode 100644 index 993639f69..000000000 Binary files a/res/drawable-xhdpi/history_delete_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_delete_over.9.png b/res/drawable-xhdpi/history_delete_over.9.png deleted file mode 100644 index bf0fdcd75..000000000 Binary files a/res/drawable-xhdpi/history_delete_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_edit_default.9.png b/res/drawable-xhdpi/history_edit_default.9.png deleted file mode 100644 index fe278fb4a..000000000 Binary files a/res/drawable-xhdpi/history_edit_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_edit_over.9.png b/res/drawable-xhdpi/history_edit_over.9.png deleted file mode 100644 index 2211f8c5b..000000000 Binary files a/res/drawable-xhdpi/history_edit_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_missed_default.9.png b/res/drawable-xhdpi/history_missed_default.9.png deleted file mode 100644 index 5694ca67d..000000000 Binary files a/res/drawable-xhdpi/history_missed_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_missed_default.png b/res/drawable-xhdpi/history_missed_default.png new file mode 100644 index 000000000..0ccad7b92 Binary files /dev/null and b/res/drawable-xhdpi/history_missed_default.png differ diff --git a/res/drawable-xhdpi/history_missed_selected.9.png b/res/drawable-xhdpi/history_missed_selected.9.png deleted file mode 100644 index 002b9ee7a..000000000 Binary files a/res/drawable-xhdpi/history_missed_selected.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_missed_selected.png b/res/drawable-xhdpi/history_missed_selected.png new file mode 100644 index 000000000..f7d893608 Binary files /dev/null and b/res/drawable-xhdpi/history_missed_selected.png differ diff --git a/res/drawable-xhdpi/history_ok_default.9.png b/res/drawable-xhdpi/history_ok_default.9.png deleted file mode 100644 index 841d047f2..000000000 Binary files a/res/drawable-xhdpi/history_ok_default.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_ok_over.9.png b/res/drawable-xhdpi/history_ok_over.9.png deleted file mode 100644 index 7db24a575..000000000 Binary files a/res/drawable-xhdpi/history_ok_over.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_over.png b/res/drawable-xhdpi/history_over.png deleted file mode 100644 index f2f973f84..000000000 Binary files a/res/drawable-xhdpi/history_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/history_selected.png b/res/drawable-xhdpi/history_selected.png deleted file mode 100644 index dd14c83dc..000000000 Binary files a/res/drawable-xhdpi/history_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/led_connected.png b/res/drawable-xhdpi/led_connected.png new file mode 100644 index 000000000..d0cc8fc84 Binary files /dev/null and b/res/drawable-xhdpi/led_connected.png differ diff --git a/res/drawable-xhdpi/led_disconnected.png b/res/drawable-xhdpi/led_disconnected.png new file mode 100644 index 000000000..20c814333 Binary files /dev/null and b/res/drawable-xhdpi/led_disconnected.png differ diff --git a/res/drawable-xhdpi/led_error.png b/res/drawable-xhdpi/led_error.png new file mode 100644 index 000000000..67418cc43 Binary files /dev/null and b/res/drawable-xhdpi/led_error.png differ diff --git a/res/drawable-xhdpi/led_inprogress.png b/res/drawable-xhdpi/led_inprogress.png new file mode 100644 index 000000000..cf7263481 Binary files /dev/null and b/res/drawable-xhdpi/led_inprogress.png differ diff --git a/res/drawable-xhdpi/linphone_logo.png b/res/drawable-xhdpi/linphone_logo.png new file mode 100644 index 000000000..f7a9f7545 Binary files /dev/null and b/res/drawable-xhdpi/linphone_logo.png differ diff --git a/res/drawable-xhdpi/linphone_logo_orange.png b/res/drawable-xhdpi/linphone_logo_orange.png new file mode 100644 index 000000000..f5fd6f597 Binary files /dev/null and b/res/drawable-xhdpi/linphone_logo_orange.png differ diff --git a/res/drawable-xhdpi/linphone_notification_icon.png b/res/drawable-xhdpi/linphone_notification_icon.png new file mode 100644 index 000000000..fa36e433e Binary files /dev/null and b/res/drawable-xhdpi/linphone_notification_icon.png differ diff --git a/res/drawable-xhdpi/linphone_user.png b/res/drawable-xhdpi/linphone_user.png new file mode 100644 index 000000000..3abde596c Binary files /dev/null and b/res/drawable-xhdpi/linphone_user.png differ diff --git a/res/drawable-xhdpi/list_add_default.png b/res/drawable-xhdpi/list_add_default.png deleted file mode 100644 index a87ba0390..000000000 Binary files a/res/drawable-xhdpi/list_add_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/list_add_over.png b/res/drawable-xhdpi/list_add_over.png deleted file mode 100644 index 9bacc9d12..000000000 Binary files a/res/drawable-xhdpi/list_add_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/list_delete_default.png b/res/drawable-xhdpi/list_delete_default.png deleted file mode 100644 index ef1ae410e..000000000 Binary files a/res/drawable-xhdpi/list_delete_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/list_delete_over.png b/res/drawable-xhdpi/list_delete_over.png deleted file mode 100644 index ec9522b3b..000000000 Binary files a/res/drawable-xhdpi/list_delete_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/list_detail_default.png b/res/drawable-xhdpi/list_detail_default.png deleted file mode 100644 index a4856294d..000000000 Binary files a/res/drawable-xhdpi/list_detail_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/list_detail_over.png b/res/drawable-xhdpi/list_detail_over.png deleted file mode 100644 index 9cecd5e59..000000000 Binary files a/res/drawable-xhdpi/list_detail_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/list_details_default.png b/res/drawable-xhdpi/list_details_default.png new file mode 100644 index 000000000..8689a7e20 Binary files /dev/null and b/res/drawable-xhdpi/list_details_default.png differ diff --git a/res/drawable-xhdpi/list_details_over.png b/res/drawable-xhdpi/list_details_over.png new file mode 100644 index 000000000..0d6bedeee Binary files /dev/null and b/res/drawable-xhdpi/list_details_over.png differ diff --git a/res/drawable-xhdpi/logo.png b/res/drawable-xhdpi/logo.png deleted file mode 100644 index ff1962516..000000000 Binary files a/res/drawable-xhdpi/logo.png and /dev/null differ diff --git a/res/drawable-xhdpi/mark.png b/res/drawable-xhdpi/mark.png deleted file mode 100644 index 1d6bf7550..000000000 Binary files a/res/drawable-xhdpi/mark.png and /dev/null differ diff --git a/res/drawable-xhdpi/menu.png b/res/drawable-xhdpi/menu.png new file mode 100644 index 000000000..d203ff475 Binary files /dev/null and b/res/drawable-xhdpi/menu.png differ diff --git a/res/drawable-xhdpi/menu_disabled.png b/res/drawable-xhdpi/menu_disabled.png new file mode 100644 index 000000000..afe4c19b0 Binary files /dev/null and b/res/drawable-xhdpi/menu_disabled.png differ diff --git a/res/drawable-xhdpi/micro_default.png b/res/drawable-xhdpi/micro_default.png new file mode 100644 index 000000000..3b3f2d958 Binary files /dev/null and b/res/drawable-xhdpi/micro_default.png differ diff --git a/res/drawable-xhdpi/micro_disabled.png b/res/drawable-xhdpi/micro_disabled.png new file mode 100644 index 000000000..a2e952780 Binary files /dev/null and b/res/drawable-xhdpi/micro_disabled.png differ diff --git a/res/drawable-xhdpi/micro_off_default.png b/res/drawable-xhdpi/micro_off_default.png deleted file mode 100644 index a877f654c..000000000 Binary files a/res/drawable-xhdpi/micro_off_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/micro_off_disabled.png b/res/drawable-xhdpi/micro_off_disabled.png deleted file mode 100644 index 4baf0de70..000000000 Binary files a/res/drawable-xhdpi/micro_off_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/micro_off_over.png b/res/drawable-xhdpi/micro_off_over.png deleted file mode 100644 index 8663a11ef..000000000 Binary files a/res/drawable-xhdpi/micro_off_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/micro_on_default.png b/res/drawable-xhdpi/micro_on_default.png deleted file mode 100644 index 8c73609fe..000000000 Binary files a/res/drawable-xhdpi/micro_on_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/micro_on_disabled.png b/res/drawable-xhdpi/micro_on_disabled.png deleted file mode 100644 index 35fb4bfeb..000000000 Binary files a/res/drawable-xhdpi/micro_on_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/micro_on_over.png b/res/drawable-xhdpi/micro_on_over.png deleted file mode 100644 index 96f645d52..000000000 Binary files a/res/drawable-xhdpi/micro_on_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/micro_selected.png b/res/drawable-xhdpi/micro_selected.png new file mode 100644 index 000000000..065a417f8 Binary files /dev/null and b/res/drawable-xhdpi/micro_selected.png differ diff --git a/res/drawable-xhdpi/numpad_0.png b/res/drawable-xhdpi/numpad_0.png new file mode 100644 index 000000000..9e1e99f0e Binary files /dev/null and b/res/drawable-xhdpi/numpad_0.png differ diff --git a/res/drawable-xhdpi/numpad_0_over.png b/res/drawable-xhdpi/numpad_0_over.png new file mode 100644 index 000000000..305b4bb8b Binary files /dev/null and b/res/drawable-xhdpi/numpad_0_over.png differ diff --git a/res/drawable-xhdpi/numpad_1.png b/res/drawable-xhdpi/numpad_1.png new file mode 100644 index 000000000..8a0e0ec82 Binary files /dev/null and b/res/drawable-xhdpi/numpad_1.png differ diff --git a/res/drawable-xhdpi/numpad_1_over.png b/res/drawable-xhdpi/numpad_1_over.png new file mode 100644 index 000000000..d45557431 Binary files /dev/null and b/res/drawable-xhdpi/numpad_1_over.png differ diff --git a/res/drawable-xhdpi/numpad_2.png b/res/drawable-xhdpi/numpad_2.png new file mode 100644 index 000000000..4d5e7a30a Binary files /dev/null and b/res/drawable-xhdpi/numpad_2.png differ diff --git a/res/drawable-xhdpi/numpad_2_over.png b/res/drawable-xhdpi/numpad_2_over.png new file mode 100644 index 000000000..c20a6b0fb Binary files /dev/null and b/res/drawable-xhdpi/numpad_2_over.png differ diff --git a/res/drawable-xhdpi/numpad_3.png b/res/drawable-xhdpi/numpad_3.png new file mode 100644 index 000000000..0c9976674 Binary files /dev/null and b/res/drawable-xhdpi/numpad_3.png differ diff --git a/res/drawable-xhdpi/numpad_3_over.png b/res/drawable-xhdpi/numpad_3_over.png new file mode 100644 index 000000000..fc9471697 Binary files /dev/null and b/res/drawable-xhdpi/numpad_3_over.png differ diff --git a/res/drawable-xhdpi/numpad_4.png b/res/drawable-xhdpi/numpad_4.png new file mode 100644 index 000000000..ac4f7811a Binary files /dev/null and b/res/drawable-xhdpi/numpad_4.png differ diff --git a/res/drawable-xhdpi/numpad_4_over.png b/res/drawable-xhdpi/numpad_4_over.png new file mode 100644 index 000000000..b7600314c Binary files /dev/null and b/res/drawable-xhdpi/numpad_4_over.png differ diff --git a/res/drawable-xhdpi/numpad_5.png b/res/drawable-xhdpi/numpad_5.png new file mode 100644 index 000000000..1edd6d68c Binary files /dev/null and b/res/drawable-xhdpi/numpad_5.png differ diff --git a/res/drawable-xhdpi/numpad_5_over.png b/res/drawable-xhdpi/numpad_5_over.png new file mode 100644 index 000000000..e90b11bd7 Binary files /dev/null and b/res/drawable-xhdpi/numpad_5_over.png differ diff --git a/res/drawable-xhdpi/numpad_6.png b/res/drawable-xhdpi/numpad_6.png new file mode 100644 index 000000000..83f40dc0b Binary files /dev/null and b/res/drawable-xhdpi/numpad_6.png differ diff --git a/res/drawable-xhdpi/numpad_6_over.png b/res/drawable-xhdpi/numpad_6_over.png new file mode 100644 index 000000000..a3f840217 Binary files /dev/null and b/res/drawable-xhdpi/numpad_6_over.png differ diff --git a/res/drawable-xhdpi/numpad_7.png b/res/drawable-xhdpi/numpad_7.png new file mode 100644 index 000000000..0cab6cb80 Binary files /dev/null and b/res/drawable-xhdpi/numpad_7.png differ diff --git a/res/drawable-xhdpi/numpad_7_over.png b/res/drawable-xhdpi/numpad_7_over.png new file mode 100644 index 000000000..6d071f7ec Binary files /dev/null and b/res/drawable-xhdpi/numpad_7_over.png differ diff --git a/res/drawable-xhdpi/numpad_8.png b/res/drawable-xhdpi/numpad_8.png new file mode 100644 index 000000000..1e1aac033 Binary files /dev/null and b/res/drawable-xhdpi/numpad_8.png differ diff --git a/res/drawable-xhdpi/numpad_8_over.png b/res/drawable-xhdpi/numpad_8_over.png new file mode 100644 index 000000000..37b47df28 Binary files /dev/null and b/res/drawable-xhdpi/numpad_8_over.png differ diff --git a/res/drawable-xhdpi/numpad_9.png b/res/drawable-xhdpi/numpad_9.png new file mode 100644 index 000000000..db29328f2 Binary files /dev/null and b/res/drawable-xhdpi/numpad_9.png differ diff --git a/res/drawable-xhdpi/numpad_9_over.png b/res/drawable-xhdpi/numpad_9_over.png new file mode 100644 index 000000000..ffce7c1af Binary files /dev/null and b/res/drawable-xhdpi/numpad_9_over.png differ diff --git a/res/drawable-xhdpi/numpad_eight_default.png b/res/drawable-xhdpi/numpad_eight_default.png deleted file mode 100644 index a3c0d8033..000000000 Binary files a/res/drawable-xhdpi/numpad_eight_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_eight_over.png b/res/drawable-xhdpi/numpad_eight_over.png deleted file mode 100644 index 2ccb7f97c..000000000 Binary files a/res/drawable-xhdpi/numpad_eight_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_five_default.png b/res/drawable-xhdpi/numpad_five_default.png deleted file mode 100644 index 023eee43b..000000000 Binary files a/res/drawable-xhdpi/numpad_five_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_five_over.png b/res/drawable-xhdpi/numpad_five_over.png deleted file mode 100644 index 3b4a62e63..000000000 Binary files a/res/drawable-xhdpi/numpad_five_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_four_default.png b/res/drawable-xhdpi/numpad_four_default.png deleted file mode 100644 index fa788a745..000000000 Binary files a/res/drawable-xhdpi/numpad_four_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_four_over.png b/res/drawable-xhdpi/numpad_four_over.png deleted file mode 100644 index 2bffe94d5..000000000 Binary files a/res/drawable-xhdpi/numpad_four_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_hash.png b/res/drawable-xhdpi/numpad_hash.png new file mode 100644 index 000000000..48ca9dae2 Binary files /dev/null and b/res/drawable-xhdpi/numpad_hash.png differ diff --git a/res/drawable-xhdpi/numpad_hash_over.png b/res/drawable-xhdpi/numpad_hash_over.png new file mode 100644 index 000000000..0d4858fe7 Binary files /dev/null and b/res/drawable-xhdpi/numpad_hash_over.png differ diff --git a/res/drawable-xhdpi/numpad_nine_default.png b/res/drawable-xhdpi/numpad_nine_default.png deleted file mode 100644 index 594a49d5f..000000000 Binary files a/res/drawable-xhdpi/numpad_nine_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_nine_over.png b/res/drawable-xhdpi/numpad_nine_over.png deleted file mode 100644 index c457e8400..000000000 Binary files a/res/drawable-xhdpi/numpad_nine_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_one_default.png b/res/drawable-xhdpi/numpad_one_default.png deleted file mode 100644 index 07f8d0ecf..000000000 Binary files a/res/drawable-xhdpi/numpad_one_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_one_over.png b/res/drawable-xhdpi/numpad_one_over.png deleted file mode 100644 index abe10c6e7..000000000 Binary files a/res/drawable-xhdpi/numpad_one_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_seven_default.png b/res/drawable-xhdpi/numpad_seven_default.png deleted file mode 100644 index 85ea3ddcf..000000000 Binary files a/res/drawable-xhdpi/numpad_seven_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_seven_over.png b/res/drawable-xhdpi/numpad_seven_over.png deleted file mode 100644 index 9ec319835..000000000 Binary files a/res/drawable-xhdpi/numpad_seven_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_sharp_default.png b/res/drawable-xhdpi/numpad_sharp_default.png deleted file mode 100644 index c551d9121..000000000 Binary files a/res/drawable-xhdpi/numpad_sharp_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_sharp_over.png b/res/drawable-xhdpi/numpad_sharp_over.png deleted file mode 100644 index dffb1b062..000000000 Binary files a/res/drawable-xhdpi/numpad_sharp_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_six_default.png b/res/drawable-xhdpi/numpad_six_default.png deleted file mode 100644 index 5404d14ec..000000000 Binary files a/res/drawable-xhdpi/numpad_six_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_six_over.png b/res/drawable-xhdpi/numpad_six_over.png deleted file mode 100644 index aee8556d7..000000000 Binary files a/res/drawable-xhdpi/numpad_six_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_star.png b/res/drawable-xhdpi/numpad_star.png new file mode 100644 index 000000000..5eda5fb98 Binary files /dev/null and b/res/drawable-xhdpi/numpad_star.png differ diff --git a/res/drawable-xhdpi/numpad_star_default.png b/res/drawable-xhdpi/numpad_star_default.png deleted file mode 100644 index 41c13aa40..000000000 Binary files a/res/drawable-xhdpi/numpad_star_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_star_over.png b/res/drawable-xhdpi/numpad_star_over.png index ac9639ff7..a73206aca 100644 Binary files a/res/drawable-xhdpi/numpad_star_over.png and b/res/drawable-xhdpi/numpad_star_over.png differ diff --git a/res/drawable-xhdpi/numpad_three_default.png b/res/drawable-xhdpi/numpad_three_default.png deleted file mode 100644 index 5a489c493..000000000 Binary files a/res/drawable-xhdpi/numpad_three_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_three_over.png b/res/drawable-xhdpi/numpad_three_over.png deleted file mode 100644 index 8fb1e1dc8..000000000 Binary files a/res/drawable-xhdpi/numpad_three_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_two_default.png b/res/drawable-xhdpi/numpad_two_default.png deleted file mode 100644 index 0de47b0bb..000000000 Binary files a/res/drawable-xhdpi/numpad_two_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_two_over.png b/res/drawable-xhdpi/numpad_two_over.png deleted file mode 100644 index da5f95e90..000000000 Binary files a/res/drawable-xhdpi/numpad_two_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_zero_default.png b/res/drawable-xhdpi/numpad_zero_default.png deleted file mode 100644 index 465a3c9f6..000000000 Binary files a/res/drawable-xhdpi/numpad_zero_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/numpad_zero_over.png b/res/drawable-xhdpi/numpad_zero_over.png deleted file mode 100644 index 86c14f38c..000000000 Binary files a/res/drawable-xhdpi/numpad_zero_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/ok_default.png b/res/drawable-xhdpi/ok_default.png deleted file mode 100644 index 7fb188033..000000000 Binary files a/res/drawable-xhdpi/ok_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/ok_over.png b/res/drawable-xhdpi/ok_over.png deleted file mode 100644 index 51411d7db..000000000 Binary files a/res/drawable-xhdpi/ok_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_add_call.png b/res/drawable-xhdpi/options_add_call.png new file mode 100644 index 000000000..a4b8c9ad9 Binary files /dev/null and b/res/drawable-xhdpi/options_add_call.png differ diff --git a/res/drawable-xhdpi/options_add_call_disabled.png b/res/drawable-xhdpi/options_add_call_disabled.png new file mode 100644 index 000000000..82a0e832e Binary files /dev/null and b/res/drawable-xhdpi/options_add_call_disabled.png differ diff --git a/res/drawable-xhdpi/options_add_default.png b/res/drawable-xhdpi/options_add_default.png deleted file mode 100644 index 06e0fd2c0..000000000 Binary files a/res/drawable-xhdpi/options_add_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_add_default_alt.png b/res/drawable-xhdpi/options_add_default_alt.png deleted file mode 100644 index 8fd635c9c..000000000 Binary files a/res/drawable-xhdpi/options_add_default_alt.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_add_disabled.png b/res/drawable-xhdpi/options_add_disabled.png deleted file mode 100644 index 613b91a2b..000000000 Binary files a/res/drawable-xhdpi/options_add_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_add_disabled_alt.png b/res/drawable-xhdpi/options_add_disabled_alt.png deleted file mode 100644 index 554e277bc..000000000 Binary files a/res/drawable-xhdpi/options_add_disabled_alt.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_add_over.png b/res/drawable-xhdpi/options_add_over.png deleted file mode 100644 index d7b50ebd5..000000000 Binary files a/res/drawable-xhdpi/options_add_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_add_over_alt.png b/res/drawable-xhdpi/options_add_over_alt.png deleted file mode 100644 index 878f04cd4..000000000 Binary files a/res/drawable-xhdpi/options_add_over_alt.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_default.png b/res/drawable-xhdpi/options_default.png index 6b1560d1d..e13c5942c 100644 Binary files a/res/drawable-xhdpi/options_default.png and b/res/drawable-xhdpi/options_default.png differ diff --git a/res/drawable-xhdpi/options_default_alt.png b/res/drawable-xhdpi/options_default_alt.png deleted file mode 100644 index 766cc5458..000000000 Binary files a/res/drawable-xhdpi/options_default_alt.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_disabled.png b/res/drawable-xhdpi/options_disabled.png index 307775b8b..533713d97 100644 Binary files a/res/drawable-xhdpi/options_disabled.png and b/res/drawable-xhdpi/options_disabled.png differ diff --git a/res/drawable-xhdpi/options_disabled_alt.png b/res/drawable-xhdpi/options_disabled_alt.png deleted file mode 100644 index bee08216c..000000000 Binary files a/res/drawable-xhdpi/options_disabled_alt.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_over.png b/res/drawable-xhdpi/options_over.png deleted file mode 100644 index bbad96627..000000000 Binary files a/res/drawable-xhdpi/options_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_over_alt.png b/res/drawable-xhdpi/options_over_alt.png deleted file mode 100644 index e229a55b2..000000000 Binary files a/res/drawable-xhdpi/options_over_alt.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_selected.png b/res/drawable-xhdpi/options_selected.png index a0b05aec2..3123fcf77 100644 Binary files a/res/drawable-xhdpi/options_selected.png and b/res/drawable-xhdpi/options_selected.png differ diff --git a/res/drawable-xhdpi/options_selected_alt.png b/res/drawable-xhdpi/options_selected_alt.png deleted file mode 100644 index b737d7e74..000000000 Binary files a/res/drawable-xhdpi/options_selected_alt.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_start_conference.png b/res/drawable-xhdpi/options_start_conference.png new file mode 100644 index 000000000..28ba66b7e Binary files /dev/null and b/res/drawable-xhdpi/options_start_conference.png differ diff --git a/res/drawable-xhdpi/options_start_conference_disabled.png b/res/drawable-xhdpi/options_start_conference_disabled.png new file mode 100644 index 000000000..468dc128d Binary files /dev/null and b/res/drawable-xhdpi/options_start_conference_disabled.png differ diff --git a/res/drawable-xhdpi/options_transfer_call.png b/res/drawable-xhdpi/options_transfer_call.png new file mode 100644 index 000000000..6b4bc1665 Binary files /dev/null and b/res/drawable-xhdpi/options_transfer_call.png differ diff --git a/res/drawable-xhdpi/options_transfer_call_disabled.png b/res/drawable-xhdpi/options_transfer_call_disabled.png new file mode 100644 index 000000000..bbb11170b Binary files /dev/null and b/res/drawable-xhdpi/options_transfer_call_disabled.png differ diff --git a/res/drawable-xhdpi/options_transfer_default.png b/res/drawable-xhdpi/options_transfer_default.png deleted file mode 100644 index 9310c63ea..000000000 Binary files a/res/drawable-xhdpi/options_transfer_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_transfer_disabled.png b/res/drawable-xhdpi/options_transfer_disabled.png deleted file mode 100644 index c40943bf1..000000000 Binary files a/res/drawable-xhdpi/options_transfer_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/options_transfer_over.png b/res/drawable-xhdpi/options_transfer_over.png deleted file mode 100644 index 4101ba4b5..000000000 Binary files a/res/drawable-xhdpi/options_transfer_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/pause_big_default.png b/res/drawable-xhdpi/pause_big_default.png new file mode 100644 index 000000000..6b92420c4 Binary files /dev/null and b/res/drawable-xhdpi/pause_big_default.png differ diff --git a/res/drawable-xhdpi/pause_big_disabled.png b/res/drawable-xhdpi/pause_big_disabled.png new file mode 100644 index 000000000..a9759e3b7 Binary files /dev/null and b/res/drawable-xhdpi/pause_big_disabled.png differ diff --git a/res/drawable-xhdpi/pause_big_over_selected.png b/res/drawable-xhdpi/pause_big_over_selected.png new file mode 100644 index 000000000..d4f16fa34 Binary files /dev/null and b/res/drawable-xhdpi/pause_big_over_selected.png differ diff --git a/res/drawable-xhdpi/pause_default.png b/res/drawable-xhdpi/pause_default.png deleted file mode 100644 index 0ca4db8c1..000000000 Binary files a/res/drawable-xhdpi/pause_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/pause_off_default.png b/res/drawable-xhdpi/pause_off_default.png deleted file mode 100644 index c6bf04de7..000000000 Binary files a/res/drawable-xhdpi/pause_off_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/pause_off_disabled.png b/res/drawable-xhdpi/pause_off_disabled.png deleted file mode 100644 index f6fc66b3c..000000000 Binary files a/res/drawable-xhdpi/pause_off_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/pause_off_over.png b/res/drawable-xhdpi/pause_off_over.png deleted file mode 100644 index 7289286c2..000000000 Binary files a/res/drawable-xhdpi/pause_off_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/pause_on_default.png b/res/drawable-xhdpi/pause_on_default.png deleted file mode 100644 index f6c266768..000000000 Binary files a/res/drawable-xhdpi/pause_on_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/pause_on_over.png b/res/drawable-xhdpi/pause_on_over.png deleted file mode 100644 index 8268d1f8a..000000000 Binary files a/res/drawable-xhdpi/pause_on_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/pause_over.png b/res/drawable-xhdpi/pause_over.png deleted file mode 100644 index a2a15e52b..000000000 Binary files a/res/drawable-xhdpi/pause_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/pause_small_default.png b/res/drawable-xhdpi/pause_small_default.png new file mode 100644 index 000000000..c51c8f113 Binary files /dev/null and b/res/drawable-xhdpi/pause_small_default.png differ diff --git a/res/drawable-xhdpi/pause_small_disabled.png b/res/drawable-xhdpi/pause_small_disabled.png new file mode 100644 index 000000000..75f0d05e0 Binary files /dev/null and b/res/drawable-xhdpi/pause_small_disabled.png differ diff --git a/res/drawable-xhdpi/pause_small_over_selected.png b/res/drawable-xhdpi/pause_small_over_selected.png new file mode 100644 index 000000000..f3b5a78a0 Binary files /dev/null and b/res/drawable-xhdpi/pause_small_over_selected.png differ diff --git a/res/drawable-xhdpi/play_default.png b/res/drawable-xhdpi/play_default.png deleted file mode 100644 index cf455e337..000000000 Binary files a/res/drawable-xhdpi/play_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/play_over.png b/res/drawable-xhdpi/play_over.png deleted file mode 100644 index 42d81a845..000000000 Binary files a/res/drawable-xhdpi/play_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/quit_default.png b/res/drawable-xhdpi/quit_default.png new file mode 100644 index 000000000..b47b451f8 Binary files /dev/null and b/res/drawable-xhdpi/quit_default.png differ diff --git a/res/drawable-xhdpi/quit_over.png b/res/drawable-xhdpi/quit_over.png new file mode 100644 index 000000000..bdf8031ec Binary files /dev/null and b/res/drawable-xhdpi/quit_over.png differ diff --git a/res/drawable-xhdpi/resizable_assistant_button.9.png b/res/drawable-xhdpi/resizable_assistant_button.9.png new file mode 100644 index 000000000..cc63e9cdd Binary files /dev/null and b/res/drawable-xhdpi/resizable_assistant_button.9.png differ diff --git a/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png b/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png new file mode 100644 index 000000000..df69f9217 Binary files /dev/null and b/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png differ diff --git a/res/drawable-xhdpi/resizable_assistant_button_over.9.png b/res/drawable-xhdpi/resizable_assistant_button_over.9.png new file mode 100644 index 000000000..d8c4b0ee2 Binary files /dev/null and b/res/drawable-xhdpi/resizable_assistant_button_over.9.png differ diff --git a/res/drawable-xhdpi/resizable_cancel_button.9.png b/res/drawable-xhdpi/resizable_cancel_button.9.png new file mode 100644 index 000000000..8923cf47a Binary files /dev/null and b/res/drawable-xhdpi/resizable_cancel_button.9.png differ diff --git a/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png b/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png new file mode 100644 index 000000000..9c200e4d4 Binary files /dev/null and b/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png differ diff --git a/res/drawable-xhdpi/resizable_chat_bubble_outgoing.9.png b/res/drawable-xhdpi/resizable_chat_bubble_outgoing.9.png new file mode 100644 index 000000000..cca504a1d Binary files /dev/null and b/res/drawable-xhdpi/resizable_chat_bubble_outgoing.9.png differ diff --git a/res/drawable-xhdpi/resizable_confirm_delete_button.9.png b/res/drawable-xhdpi/resizable_confirm_delete_button.9.png new file mode 100644 index 000000000..509a20e49 Binary files /dev/null and b/res/drawable-xhdpi/resizable_confirm_delete_button.9.png differ diff --git a/res/drawable-xhdpi/resizable_textfield.9.png b/res/drawable-xhdpi/resizable_textfield.9.png new file mode 100644 index 000000000..51ad75cf4 Binary files /dev/null and b/res/drawable-xhdpi/resizable_textfield.9.png differ diff --git a/res/drawable-xhdpi/resizable_textfield_error.9.png b/res/drawable-xhdpi/resizable_textfield_error.9.png new file mode 100644 index 000000000..3b6fe1140 Binary files /dev/null and b/res/drawable-xhdpi/resizable_textfield_error.9.png differ diff --git a/res/drawable-xhdpi/route_bluetooth.png b/res/drawable-xhdpi/route_bluetooth.png new file mode 100644 index 000000000..46793a483 Binary files /dev/null and b/res/drawable-xhdpi/route_bluetooth.png differ diff --git a/res/drawable-xhdpi/route_bluetooth_selected.png b/res/drawable-xhdpi/route_bluetooth_selected.png new file mode 100644 index 000000000..2ece4746e Binary files /dev/null and b/res/drawable-xhdpi/route_bluetooth_selected.png differ diff --git a/res/drawable-xhdpi/route_earpiece.png b/res/drawable-xhdpi/route_earpiece.png new file mode 100644 index 000000000..9a4950867 Binary files /dev/null and b/res/drawable-xhdpi/route_earpiece.png differ diff --git a/res/drawable-xhdpi/route_earpiece_selected.png b/res/drawable-xhdpi/route_earpiece_selected.png new file mode 100644 index 000000000..8d85693f8 Binary files /dev/null and b/res/drawable-xhdpi/route_earpiece_selected.png differ diff --git a/res/drawable-xhdpi/route_speaker.png b/res/drawable-xhdpi/route_speaker.png new file mode 100644 index 000000000..e3621092e Binary files /dev/null and b/res/drawable-xhdpi/route_speaker.png differ diff --git a/res/drawable-xhdpi/route_speaker_selected.png b/res/drawable-xhdpi/route_speaker_selected.png new file mode 100644 index 000000000..3ea594615 Binary files /dev/null and b/res/drawable-xhdpi/route_speaker_selected.png differ diff --git a/res/drawable-xhdpi/routes_bluetooth_off_default.png b/res/drawable-xhdpi/routes_bluetooth_off_default.png deleted file mode 100644 index fa4c9417e..000000000 Binary files a/res/drawable-xhdpi/routes_bluetooth_off_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_bluetooth_off_disabled.png b/res/drawable-xhdpi/routes_bluetooth_off_disabled.png deleted file mode 100644 index 67dedd040..000000000 Binary files a/res/drawable-xhdpi/routes_bluetooth_off_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_bluetooth_off_over.png b/res/drawable-xhdpi/routes_bluetooth_off_over.png deleted file mode 100644 index a4c2eec95..000000000 Binary files a/res/drawable-xhdpi/routes_bluetooth_off_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_bluetooth_on_default.png b/res/drawable-xhdpi/routes_bluetooth_on_default.png deleted file mode 100644 index 346db2f9e..000000000 Binary files a/res/drawable-xhdpi/routes_bluetooth_on_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_bluetooth_on_disabled.png b/res/drawable-xhdpi/routes_bluetooth_on_disabled.png deleted file mode 100644 index d230b127d..000000000 Binary files a/res/drawable-xhdpi/routes_bluetooth_on_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_bluetooth_on_over.png b/res/drawable-xhdpi/routes_bluetooth_on_over.png deleted file mode 100644 index 68a2ec19a..000000000 Binary files a/res/drawable-xhdpi/routes_bluetooth_on_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_default.png b/res/drawable-xhdpi/routes_default.png index a0502e293..cd78857df 100644 Binary files a/res/drawable-xhdpi/routes_default.png and b/res/drawable-xhdpi/routes_default.png differ diff --git a/res/drawable-xhdpi/routes_disabled.png b/res/drawable-xhdpi/routes_disabled.png deleted file mode 100644 index aa54e1ab5..000000000 Binary files a/res/drawable-xhdpi/routes_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_over.png b/res/drawable-xhdpi/routes_over.png deleted file mode 100644 index c6e555a46..000000000 Binary files a/res/drawable-xhdpi/routes_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_phone_off_default.png b/res/drawable-xhdpi/routes_phone_off_default.png deleted file mode 100644 index dccec9086..000000000 Binary files a/res/drawable-xhdpi/routes_phone_off_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_phone_off_disabled.png b/res/drawable-xhdpi/routes_phone_off_disabled.png deleted file mode 100644 index 9aafeeca9..000000000 Binary files a/res/drawable-xhdpi/routes_phone_off_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_phone_off_over.png b/res/drawable-xhdpi/routes_phone_off_over.png deleted file mode 100644 index 72b5021f2..000000000 Binary files a/res/drawable-xhdpi/routes_phone_off_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_phone_on_default.png b/res/drawable-xhdpi/routes_phone_on_default.png deleted file mode 100644 index c82423761..000000000 Binary files a/res/drawable-xhdpi/routes_phone_on_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_phone_on_disabled.png b/res/drawable-xhdpi/routes_phone_on_disabled.png deleted file mode 100644 index a4787ecee..000000000 Binary files a/res/drawable-xhdpi/routes_phone_on_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_phone_on_over.png b/res/drawable-xhdpi/routes_phone_on_over.png deleted file mode 100644 index c7e5ff1c8..000000000 Binary files a/res/drawable-xhdpi/routes_phone_on_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_selected.png b/res/drawable-xhdpi/routes_selected.png index 88196d339..455b83343 100644 Binary files a/res/drawable-xhdpi/routes_selected.png and b/res/drawable-xhdpi/routes_selected.png differ diff --git a/res/drawable-xhdpi/routes_speaker_off_default.png b/res/drawable-xhdpi/routes_speaker_off_default.png deleted file mode 100644 index f641aca07..000000000 Binary files a/res/drawable-xhdpi/routes_speaker_off_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_speaker_off_disabled.png b/res/drawable-xhdpi/routes_speaker_off_disabled.png deleted file mode 100644 index 3565c0fe2..000000000 Binary files a/res/drawable-xhdpi/routes_speaker_off_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_speaker_off_over.png b/res/drawable-xhdpi/routes_speaker_off_over.png deleted file mode 100644 index a3bd8ee47..000000000 Binary files a/res/drawable-xhdpi/routes_speaker_off_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_speaker_on_default.png b/res/drawable-xhdpi/routes_speaker_on_default.png deleted file mode 100644 index 194e34896..000000000 Binary files a/res/drawable-xhdpi/routes_speaker_on_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_speaker_on_disabled.png b/res/drawable-xhdpi/routes_speaker_on_disabled.png deleted file mode 100644 index 402b7de14..000000000 Binary files a/res/drawable-xhdpi/routes_speaker_on_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/routes_speaker_on_over.png b/res/drawable-xhdpi/routes_speaker_on_over.png deleted file mode 100644 index e32ad0941..000000000 Binary files a/res/drawable-xhdpi/routes_speaker_on_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/security_ko.png b/res/drawable-xhdpi/security_ko.png new file mode 100644 index 000000000..9bd476a71 Binary files /dev/null and b/res/drawable-xhdpi/security_ko.png differ diff --git a/res/drawable-xhdpi/security_ok.png b/res/drawable-xhdpi/security_ok.png new file mode 100644 index 000000000..9ca4a19f2 Binary files /dev/null and b/res/drawable-xhdpi/security_ok.png differ diff --git a/res/drawable-xhdpi/security_pending.png b/res/drawable-xhdpi/security_pending.png new file mode 100644 index 000000000..aa7081af8 Binary files /dev/null and b/res/drawable-xhdpi/security_pending.png differ diff --git a/res/drawable-xhdpi/select_all.png b/res/drawable-xhdpi/select_all.png new file mode 100644 index 000000000..cefe12239 Binary files /dev/null and b/res/drawable-xhdpi/select_all.png differ diff --git a/res/drawable-xhdpi/settings_default.png b/res/drawable-xhdpi/settings_default.png deleted file mode 100644 index 97b0ba031..000000000 Binary files a/res/drawable-xhdpi/settings_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/settings_over.png b/res/drawable-xhdpi/settings_over.png deleted file mode 100644 index 0cabe2002..000000000 Binary files a/res/drawable-xhdpi/settings_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/settings_selected.png b/res/drawable-xhdpi/settings_selected.png deleted file mode 100644 index 790153366..000000000 Binary files a/res/drawable-xhdpi/settings_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_back_default.png b/res/drawable-xhdpi/setup_back_default.png deleted file mode 100644 index ddb63847f..000000000 Binary files a/res/drawable-xhdpi/setup_back_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_back_disabled.png b/res/drawable-xhdpi/setup_back_disabled.png deleted file mode 100644 index bbc23f190..000000000 Binary files a/res/drawable-xhdpi/setup_back_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_back_over.png b/res/drawable-xhdpi/setup_back_over.png deleted file mode 100644 index aa86ad542..000000000 Binary files a/res/drawable-xhdpi/setup_back_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_cancel_default.png b/res/drawable-xhdpi/setup_cancel_default.png deleted file mode 100644 index 411381928..000000000 Binary files a/res/drawable-xhdpi/setup_cancel_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_cancel_disabled.png b/res/drawable-xhdpi/setup_cancel_disabled.png deleted file mode 100644 index 97674e02c..000000000 Binary files a/res/drawable-xhdpi/setup_cancel_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_cancel_over.png b/res/drawable-xhdpi/setup_cancel_over.png deleted file mode 100644 index cf48a5173..000000000 Binary files a/res/drawable-xhdpi/setup_cancel_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_field_background.9.png b/res/drawable-xhdpi/setup_field_background.9.png deleted file mode 100644 index f24e08706..000000000 Binary files a/res/drawable-xhdpi/setup_field_background.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_mark.png b/res/drawable-xhdpi/setup_mark.png deleted file mode 100644 index 71504e74b..000000000 Binary files a/res/drawable-xhdpi/setup_mark.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_start_default.png b/res/drawable-xhdpi/setup_start_default.png deleted file mode 100644 index 342a59a6c..000000000 Binary files a/res/drawable-xhdpi/setup_start_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_start_disabled.png b/res/drawable-xhdpi/setup_start_disabled.png deleted file mode 100644 index c57868e0a..000000000 Binary files a/res/drawable-xhdpi/setup_start_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_start_over.png b/res/drawable-xhdpi/setup_start_over.png deleted file mode 100644 index 7fc26c6fd..000000000 Binary files a/res/drawable-xhdpi/setup_start_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_title_assistant.png b/res/drawable-xhdpi/setup_title_assistant.png deleted file mode 100644 index 275ed24b1..000000000 Binary files a/res/drawable-xhdpi/setup_title_assistant.png and /dev/null differ diff --git a/res/drawable-xhdpi/setup_welcome_logo.png b/res/drawable-xhdpi/setup_welcome_logo.png deleted file mode 100644 index d257f3158..000000000 Binary files a/res/drawable-xhdpi/setup_welcome_logo.png and /dev/null differ diff --git a/res/drawable-xhdpi/slider_left.9.png b/res/drawable-xhdpi/slider_left.9.png deleted file mode 100644 index 2bdb7ae6e..000000000 Binary files a/res/drawable-xhdpi/slider_left.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/slider_right.9.png b/res/drawable-xhdpi/slider_right.9.png deleted file mode 100644 index d0a8f1670..000000000 Binary files a/res/drawable-xhdpi/slider_right.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/speaker_default.png b/res/drawable-xhdpi/speaker_default.png new file mode 100644 index 000000000..e3621092e Binary files /dev/null and b/res/drawable-xhdpi/speaker_default.png differ diff --git a/res/drawable-xhdpi/speaker_disabled.png b/res/drawable-xhdpi/speaker_disabled.png new file mode 100644 index 000000000..aa2a0b78a Binary files /dev/null and b/res/drawable-xhdpi/speaker_disabled.png differ diff --git a/res/drawable-xhdpi/speaker_off_default.png b/res/drawable-xhdpi/speaker_off_default.png deleted file mode 100644 index 43f95c20f..000000000 Binary files a/res/drawable-xhdpi/speaker_off_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/speaker_off_disabled.png b/res/drawable-xhdpi/speaker_off_disabled.png deleted file mode 100644 index 440af308e..000000000 Binary files a/res/drawable-xhdpi/speaker_off_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/speaker_off_over.png b/res/drawable-xhdpi/speaker_off_over.png deleted file mode 100644 index 0b42163d2..000000000 Binary files a/res/drawable-xhdpi/speaker_off_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/speaker_on_default.png b/res/drawable-xhdpi/speaker_on_default.png deleted file mode 100644 index ffc9d1763..000000000 Binary files a/res/drawable-xhdpi/speaker_on_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/speaker_on_disabled.png b/res/drawable-xhdpi/speaker_on_disabled.png deleted file mode 100644 index 1869a1327..000000000 Binary files a/res/drawable-xhdpi/speaker_on_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/speaker_on_over.png b/res/drawable-xhdpi/speaker_on_over.png deleted file mode 100644 index adc72500d..000000000 Binary files a/res/drawable-xhdpi/speaker_on_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/speaker_selected.png b/res/drawable-xhdpi/speaker_selected.png new file mode 100644 index 000000000..b7f86d022 Binary files /dev/null and b/res/drawable-xhdpi/speaker_selected.png differ diff --git a/res/drawable-xhdpi/splashscreen.png b/res/drawable-xhdpi/splashscreen.png index 168900c1c..a02ddb045 100644 Binary files a/res/drawable-xhdpi/splashscreen.png and b/res/drawable-xhdpi/splashscreen.png differ diff --git a/res/drawable-xhdpi/statebar_background.png b/res/drawable-xhdpi/statebar_background.png deleted file mode 100644 index 001991fb0..000000000 Binary files a/res/drawable-xhdpi/statebar_background.png and /dev/null differ diff --git a/res/drawable-xhdpi/status_available.png b/res/drawable-xhdpi/status_available.png new file mode 100644 index 000000000..f57919fd0 Binary files /dev/null and b/res/drawable-xhdpi/status_available.png differ diff --git a/res/drawable-xhdpi/status_available_desktop.png b/res/drawable-xhdpi/status_available_desktop.png new file mode 100644 index 000000000..fc64f9cc8 Binary files /dev/null and b/res/drawable-xhdpi/status_available_desktop.png differ diff --git a/res/drawable-xhdpi/status_available_phone.png b/res/drawable-xhdpi/status_available_phone.png new file mode 100644 index 000000000..12262bbe8 Binary files /dev/null and b/res/drawable-xhdpi/status_available_phone.png differ diff --git a/res/drawable-xhdpi/status_away.png b/res/drawable-xhdpi/status_away.png new file mode 100644 index 000000000..0cb280dd3 Binary files /dev/null and b/res/drawable-xhdpi/status_away.png differ diff --git a/res/drawable-xhdpi/status_away_desktop.png b/res/drawable-xhdpi/status_away_desktop.png new file mode 100644 index 000000000..6900b7c36 Binary files /dev/null and b/res/drawable-xhdpi/status_away_desktop.png differ diff --git a/res/drawable-xhdpi/status_away_phone.png b/res/drawable-xhdpi/status_away_phone.png new file mode 100644 index 000000000..05863265f Binary files /dev/null and b/res/drawable-xhdpi/status_away_phone.png differ diff --git a/res/drawable-xhdpi/status_busy.png b/res/drawable-xhdpi/status_busy.png new file mode 100644 index 000000000..7040944dd Binary files /dev/null and b/res/drawable-xhdpi/status_busy.png differ diff --git a/res/drawable-xhdpi/status_busy_desktop.png b/res/drawable-xhdpi/status_busy_desktop.png new file mode 100644 index 000000000..ad8965b31 Binary files /dev/null and b/res/drawable-xhdpi/status_busy_desktop.png differ diff --git a/res/drawable-xhdpi/status_busy_phone.png b/res/drawable-xhdpi/status_busy_phone.png new file mode 100644 index 000000000..a129c022a Binary files /dev/null and b/res/drawable-xhdpi/status_busy_phone.png differ diff --git a/res/drawable-xhdpi/status_disconnected.png b/res/drawable-xhdpi/status_disconnected.png new file mode 100644 index 000000000..aa354e37d Binary files /dev/null and b/res/drawable-xhdpi/status_disconnected.png differ diff --git a/res/drawable-xhdpi/status_disconnected_desktop.png b/res/drawable-xhdpi/status_disconnected_desktop.png new file mode 100644 index 000000000..45599a8fd Binary files /dev/null and b/res/drawable-xhdpi/status_disconnected_desktop.png differ diff --git a/res/drawable-xhdpi/status_disconnected_phone.png b/res/drawable-xhdpi/status_disconnected_phone.png new file mode 100644 index 000000000..4195447dc Binary files /dev/null and b/res/drawable-xhdpi/status_disconnected_phone.png differ diff --git a/res/drawable-xhdpi/switch_camera_default.png b/res/drawable-xhdpi/switch_camera_default.png deleted file mode 100644 index 2145e1db3..000000000 Binary files a/res/drawable-xhdpi/switch_camera_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/switch_camera_over.png b/res/drawable-xhdpi/switch_camera_over.png deleted file mode 100644 index 649861e9f..000000000 Binary files a/res/drawable-xhdpi/switch_camera_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/toolsbar_background.png b/res/drawable-xhdpi/toolsbar_background.png deleted file mode 100644 index 814c07993..000000000 Binary files a/res/drawable-xhdpi/toolsbar_background.png and /dev/null differ diff --git a/res/drawable-xhdpi/topbar_avatar.png b/res/drawable-xhdpi/topbar_avatar.png new file mode 100644 index 000000000..6589b09e3 Binary files /dev/null and b/res/drawable-xhdpi/topbar_avatar.png differ diff --git a/res/drawable-xhdpi/topbar_call_notification.png b/res/drawable-xhdpi/topbar_call_notification.png new file mode 100644 index 000000000..2f0b96fea Binary files /dev/null and b/res/drawable-xhdpi/topbar_call_notification.png differ diff --git a/res/drawable-xhdpi/topbar_chat_notification.png b/res/drawable-xhdpi/topbar_chat_notification.png new file mode 100644 index 000000000..4f35ff4e6 Binary files /dev/null and b/res/drawable-xhdpi/topbar_chat_notification.png differ diff --git a/res/drawable-xhdpi/topbar_videocall_notification.png b/res/drawable-xhdpi/topbar_videocall_notification.png new file mode 100644 index 000000000..e91df1885 Binary files /dev/null and b/res/drawable-xhdpi/topbar_videocall_notification.png differ diff --git a/res/drawable-xhdpi/transfer_call_default.png b/res/drawable-xhdpi/transfer_call_default.png deleted file mode 100644 index b67e4509e..000000000 Binary files a/res/drawable-xhdpi/transfer_call_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/transfer_call_disabled.png b/res/drawable-xhdpi/transfer_call_disabled.png deleted file mode 100644 index 0307f6bf8..000000000 Binary files a/res/drawable-xhdpi/transfer_call_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/transfer_call_over.png b/res/drawable-xhdpi/transfer_call_over.png deleted file mode 100644 index 9f3e9ac36..000000000 Binary files a/res/drawable-xhdpi/transfer_call_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/unknown_small.png b/res/drawable-xhdpi/unknown_small.png deleted file mode 100644 index 143da1512..000000000 Binary files a/res/drawable-xhdpi/unknown_small.png and /dev/null differ diff --git a/res/drawable-xhdpi/valid.png b/res/drawable-xhdpi/valid.png new file mode 100644 index 000000000..52bc36535 Binary files /dev/null and b/res/drawable-xhdpi/valid.png differ diff --git a/res/drawable-xhdpi/valid_disabled.png b/res/drawable-xhdpi/valid_disabled.png new file mode 100644 index 000000000..a7c040c4b Binary files /dev/null and b/res/drawable-xhdpi/valid_disabled.png differ diff --git a/res/drawable-xhdpi/video_off_default.png b/res/drawable-xhdpi/video_off_default.png deleted file mode 100644 index 088412bd7..000000000 Binary files a/res/drawable-xhdpi/video_off_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/video_off_disabled.png b/res/drawable-xhdpi/video_off_disabled.png deleted file mode 100644 index cccfe8d25..000000000 Binary files a/res/drawable-xhdpi/video_off_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/video_off_over.png b/res/drawable-xhdpi/video_off_over.png deleted file mode 100644 index b4bb25bda..000000000 Binary files a/res/drawable-xhdpi/video_off_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/video_on_default.png b/res/drawable-xhdpi/video_on_default.png deleted file mode 100644 index 5c852ac03..000000000 Binary files a/res/drawable-xhdpi/video_on_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/video_on_disabled.png b/res/drawable-xhdpi/video_on_disabled.png deleted file mode 100644 index bdfcbe8f6..000000000 Binary files a/res/drawable-xhdpi/video_on_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/video_on_over.png b/res/drawable-xhdpi/video_on_over.png deleted file mode 100644 index 13dd3546e..000000000 Binary files a/res/drawable-xhdpi/video_on_over.png and /dev/null differ diff --git a/res/drawable-xhdpi/voicemail.png b/res/drawable-xhdpi/voicemail.png new file mode 100644 index 000000000..63d880993 Binary files /dev/null and b/res/drawable-xhdpi/voicemail.png differ diff --git a/res/drawable-xhdpi/waiting_time.png b/res/drawable-xhdpi/waiting_time.png new file mode 100644 index 000000000..cd949a26f Binary files /dev/null and b/res/drawable-xhdpi/waiting_time.png differ diff --git a/res/drawable/about_chat.xml b/res/drawable/about_chat.xml deleted file mode 100644 index ae54de5a7..000000000 --- a/res/drawable/about_chat.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/about_settings.xml b/res/drawable/about_settings.xml deleted file mode 100644 index b98f2f8e8..000000000 --- a/res/drawable/about_settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/add_call.xml b/res/drawable/add_call.xml deleted file mode 100644 index 077a07bc2..000000000 --- a/res/drawable/add_call.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/res/drawable/add_contact.xml b/res/drawable/add_contact.xml deleted file mode 100644 index c100ec00b..000000000 --- a/res/drawable/add_contact.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/res/drawable/alert.xml b/res/drawable/alert.xml deleted file mode 100644 index 125848d4c..000000000 --- a/res/drawable/alert.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/drawable/assistant_button.xml b/res/drawable/assistant_button.xml new file mode 100644 index 000000000..1d6cbee82 --- /dev/null +++ b/res/drawable/assistant_button.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/res/drawable/assistant_button_text_color.xml b/res/drawable/assistant_button_text_color.xml new file mode 100644 index 000000000..8e05da560 --- /dev/null +++ b/res/drawable/assistant_button_text_color.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/back.xml b/res/drawable/back.xml deleted file mode 100644 index 10c0e21d2..000000000 --- a/res/drawable/back.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/background.xml b/res/drawable/background.xml deleted file mode 100644 index eefecb76b..000000000 --- a/res/drawable/background.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/drawable/backspace.xml b/res/drawable/backspace.xml index 6f2a75a42..e5209e310 100644 --- a/res/drawable/backspace.xml +++ b/res/drawable/backspace.xml @@ -1,7 +1,9 @@ - + diff --git a/res/drawable/button.xml b/res/drawable/button.xml deleted file mode 100644 index ab6a95baa..000000000 --- a/res/drawable/button.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/drawable/button_background.xml b/res/drawable/button_background.xml new file mode 100644 index 000000000..2a0ff0c72 --- /dev/null +++ b/res/drawable/button_background.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/res/drawable/call.xml b/res/drawable/call.xml index e9355926a..7564861e6 100644 --- a/res/drawable/call.xml +++ b/res/drawable/call.xml @@ -1,8 +1,10 @@ + android:drawable="@color/colorL" /> + + android:drawable="@color/colorA" /> diff --git a/res/drawable/call_answer.xml b/res/drawable/call_answer.xml deleted file mode 100644 index a81d47745..000000000 --- a/res/drawable/call_answer.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/drawable/camera_button.xml b/res/drawable/camera_button.xml new file mode 100644 index 000000000..844fb67b3 --- /dev/null +++ b/res/drawable/camera_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/cancel.xml b/res/drawable/cancel.xml deleted file mode 100644 index a22bb497e..000000000 --- a/res/drawable/cancel.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/drawable/chat.xml b/res/drawable/chat.xml index a7a0da6b3..5bdf45573 100644 --- a/res/drawable/chat.xml +++ b/res/drawable/chat.xml @@ -1,9 +1,9 @@ - + + android:drawable="@color/colorD" /> + android:drawable="@color/colorD" /> diff --git a/res/drawable/chat_back.xml b/res/drawable/chat_back.xml deleted file mode 100644 index 80e8f379b..000000000 --- a/res/drawable/chat_back.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/chat_edit.xml b/res/drawable/chat_edit.xml deleted file mode 100644 index 8722d6690..000000000 --- a/res/drawable/chat_edit.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/chat_message_delivered.png b/res/drawable/chat_message_delivered.png deleted file mode 100644 index f8edc012d..000000000 Binary files a/res/drawable/chat_message_delivered.png and /dev/null differ diff --git a/res/drawable/chat_message_inprogress.png b/res/drawable/chat_message_inprogress.png deleted file mode 100644 index f725a3eb9..000000000 Binary files a/res/drawable/chat_message_inprogress.png and /dev/null differ diff --git a/res/drawable/chat_message_not_delivered.png b/res/drawable/chat_message_not_delivered.png deleted file mode 100644 index c174df390..000000000 Binary files a/res/drawable/chat_message_not_delivered.png and /dev/null differ diff --git a/res/drawable/chat_new.xml b/res/drawable/chat_new.xml deleted file mode 100644 index e42e5819c..000000000 --- a/res/drawable/chat_new.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/chat_ok.xml b/res/drawable/chat_ok.xml deleted file mode 100644 index 3b5a53732..000000000 --- a/res/drawable/chat_ok.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/chat_send_file.xml b/res/drawable/chat_send_file.xml new file mode 100644 index 000000000..a26285ecf --- /dev/null +++ b/res/drawable/chat_send_file.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/res/drawable/chat_send_message.xml b/res/drawable/chat_send_message.xml index 3336f7499..8cc2b9dc4 100644 --- a/res/drawable/chat_send_message.xml +++ b/res/drawable/chat_send_message.xml @@ -2,8 +2,6 @@ - diff --git a/res/drawable/chat_send_picture.xml b/res/drawable/chat_send_picture.xml deleted file mode 100644 index 173e351a2..000000000 --- a/res/drawable/chat_send_picture.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/res/drawable/chat_stop_upload.xml b/res/drawable/chat_stop_upload.xml deleted file mode 100644 index 623c4ee55..000000000 --- a/res/drawable/chat_stop_upload.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/checkbox.xml b/res/drawable/checkbox.xml new file mode 100644 index 000000000..8239dc456 --- /dev/null +++ b/res/drawable/checkbox.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/conf_status_paused.png b/res/drawable/conf_status_paused.png deleted file mode 100644 index 2d6a3cb4d..000000000 Binary files a/res/drawable/conf_status_paused.png and /dev/null differ diff --git a/res/drawable/conf_unhook.png b/res/drawable/conf_unhook.png deleted file mode 100644 index 2f141582d..000000000 Binary files a/res/drawable/conf_unhook.png and /dev/null differ diff --git a/res/drawable/conf_video.png b/res/drawable/conf_video.png deleted file mode 100644 index 6e7616404..000000000 Binary files a/res/drawable/conf_video.png and /dev/null differ diff --git a/res/drawable/conference.xml b/res/drawable/conference.xml deleted file mode 100644 index 6fff0737a..000000000 --- a/res/drawable/conference.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/contact_add_button.xml b/res/drawable/contact_add_button.xml new file mode 100644 index 000000000..c688770db --- /dev/null +++ b/res/drawable/contact_add_button.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/res/drawable/contact_add_contact.xml b/res/drawable/contact_add_contact.xml deleted file mode 100644 index bdfe8f4d9..000000000 --- a/res/drawable/contact_add_contact.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/contact_cancel.xml b/res/drawable/contact_cancel.xml deleted file mode 100644 index c69e447ed..000000000 --- a/res/drawable/contact_cancel.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/contact_delete.xml b/res/drawable/contact_delete.xml deleted file mode 100644 index 32694f1e5..000000000 --- a/res/drawable/contact_delete.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/contact_edit.xml b/res/drawable/contact_edit.xml deleted file mode 100644 index 52e3aa964..000000000 --- a/res/drawable/contact_edit.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/contact_ok.xml b/res/drawable/contact_ok.xml deleted file mode 100644 index 5c3b8eebb..000000000 --- a/res/drawable/contact_ok.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/res/drawable/contacts.xml b/res/drawable/contacts.xml deleted file mode 100644 index 52818fa7d..000000000 --- a/res/drawable/contacts.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/contacts_add_contact.xml b/res/drawable/contacts_add_contact.xml deleted file mode 100644 index f5f16757a..000000000 --- a/res/drawable/contacts_add_contact.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/contacts_sip.xml b/res/drawable/contacts_sip.xml index 022a9eb67..089d67756 100644 --- a/res/drawable/contacts_sip.xml +++ b/res/drawable/contacts_sip.xml @@ -1,7 +1,7 @@ + android:drawable="@drawable/contacts_sip_default" /> + android:drawable="@drawable/contacts_sip_selected" /> \ No newline at end of file diff --git a/res/drawable/delete_button.xml b/res/drawable/delete_button.xml new file mode 100644 index 000000000..e70740455 --- /dev/null +++ b/res/drawable/delete_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/dialer.xml b/res/drawable/dialer.xml index 345f9eceb..cae05314b 100644 --- a/res/drawable/dialer.xml +++ b/res/drawable/dialer.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/res/drawable/dialer_alt.xml b/res/drawable/dialer_alt.xml deleted file mode 100644 index 2e173a06a..000000000 --- a/res/drawable/dialer_alt.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/res/drawable/dialer_alt_back.xml b/res/drawable/dialer_alt_back.xml deleted file mode 100644 index cfdb1f87a..000000000 --- a/res/drawable/dialer_alt_back.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/edit_list_button.xml b/res/drawable/edit_list_button.xml new file mode 100644 index 000000000..d53758283 --- /dev/null +++ b/res/drawable/edit_list_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/fast_scroll.xml b/res/drawable/fast_scroll.xml new file mode 100644 index 000000000..438a7ad42 --- /dev/null +++ b/res/drawable/fast_scroll.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/res/drawable/fast_scroll_preview.xml b/res/drawable/fast_scroll_preview.xml new file mode 100644 index 000000000..cdf8aeccb --- /dev/null +++ b/res/drawable/fast_scroll_preview.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/footer_button.xml b/res/drawable/footer_button.xml new file mode 100644 index 000000000..a621e8f73 --- /dev/null +++ b/res/drawable/footer_button.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/res/drawable/hangup.xml b/res/drawable/hangup.xml index 7faa23180..3a15ca838 100644 --- a/res/drawable/hangup.xml +++ b/res/drawable/hangup.xml @@ -1,8 +1,10 @@ - - + + + diff --git a/res/drawable/history.xml b/res/drawable/history.xml deleted file mode 100644 index 6f32df31c..000000000 --- a/res/drawable/history.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/history_all.xml b/res/drawable/history_all.xml index a4c887d87..2a20b0e07 100644 --- a/res/drawable/history_all.xml +++ b/res/drawable/history_all.xml @@ -1,7 +1,7 @@ + android:drawable="@drawable/history_all_default"/> diff --git a/res/drawable/history_delete.xml b/res/drawable/history_delete.xml deleted file mode 100644 index e284ffd1f..000000000 --- a/res/drawable/history_delete.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/history_edit.xml b/res/drawable/history_edit.xml deleted file mode 100644 index a2108f74b..000000000 --- a/res/drawable/history_edit.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/history_ok.xml b/res/drawable/history_ok.xml deleted file mode 100644 index ae9b0b5b1..000000000 --- a/res/drawable/history_ok.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/led_connected.png b/res/drawable/led_connected.png deleted file mode 100644 index e788e2b07..000000000 Binary files a/res/drawable/led_connected.png and /dev/null differ diff --git a/res/drawable/led_disconnected.png b/res/drawable/led_disconnected.png deleted file mode 100644 index 11455fb1b..000000000 Binary files a/res/drawable/led_disconnected.png and /dev/null differ diff --git a/res/drawable/led_error.png b/res/drawable/led_error.png deleted file mode 100644 index e7617832b..000000000 Binary files a/res/drawable/led_error.png and /dev/null differ diff --git a/res/drawable/led_inprogress.png b/res/drawable/led_inprogress.png deleted file mode 100644 index d2fe9da56..000000000 Binary files a/res/drawable/led_inprogress.png and /dev/null differ diff --git a/res/drawable/linphone_banner.png b/res/drawable/linphone_banner.png deleted file mode 100644 index 0abff3ebf..000000000 Binary files a/res/drawable/linphone_banner.png and /dev/null differ diff --git a/res/drawable/list_add.xml b/res/drawable/list_add.xml deleted file mode 100644 index 6424c7cad..000000000 --- a/res/drawable/list_add.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/res/drawable/list_delete.xml b/res/drawable/list_delete.xml index e8c034ea1..d453abfd5 100644 --- a/res/drawable/list_delete.xml +++ b/res/drawable/list_delete.xml @@ -1,7 +1,7 @@ + android:drawable="@drawable/delete_field_over" /> + android:drawable="@drawable/delete_field_default" /> diff --git a/res/drawable/list_detail.xml b/res/drawable/list_detail.xml index 275fbd50d..90a37d7ef 100644 --- a/res/drawable/list_detail.xml +++ b/res/drawable/list_detail.xml @@ -1,7 +1,7 @@ + android:drawable="@drawable/list_details_over" /> + android:drawable="@drawable/list_details_default" /> diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml index 7ae5b7b7a..a24232d1d 100644 --- a/res/drawable/list_selector.xml +++ b/res/drawable/list_selector.xml @@ -2,7 +2,7 @@ + android:drawable="@color/colorH" /> + android:drawable="@color/colorH" /> \ No newline at end of file diff --git a/res/drawable/logo_linphone_57x57.png b/res/drawable/logo_linphone_57x57.png deleted file mode 100644 index 40c1c98ff..000000000 Binary files a/res/drawable/logo_linphone_57x57.png and /dev/null differ diff --git a/res/drawable/menu_burger.xml b/res/drawable/menu_burger.xml new file mode 100644 index 000000000..1a8ea79ab --- /dev/null +++ b/res/drawable/menu_burger.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/micro.xml b/res/drawable/micro.xml new file mode 100644 index 000000000..1780f755d --- /dev/null +++ b/res/drawable/micro.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/micro_off.xml b/res/drawable/micro_off.xml deleted file mode 100644 index 8a260ceaf..000000000 --- a/res/drawable/micro_off.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/micro_on.xml b/res/drawable/micro_on.xml deleted file mode 100644 index 396c876b4..000000000 --- a/res/drawable/micro_on.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/missed_calls_bg.xml b/res/drawable/missed_calls_bg.xml deleted file mode 100644 index 8b9a496b4..000000000 --- a/res/drawable/missed_calls_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/res/drawable/numpad_eight.xml b/res/drawable/numpad_eight.xml index 9c6ece841..0bc160196 100644 --- a/res/drawable/numpad_eight.xml +++ b/res/drawable/numpad_eight.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_8_over" /> + android:drawable="@drawable/numpad_8" /> diff --git a/res/drawable/numpad_five.xml b/res/drawable/numpad_five.xml index 3a3c7dcbd..7b16e525c 100644 --- a/res/drawable/numpad_five.xml +++ b/res/drawable/numpad_five.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_5_over" /> + android:drawable="@drawable/numpad_5" /> diff --git a/res/drawable/numpad_four.xml b/res/drawable/numpad_four.xml index 7fcef5d78..0c58614bf 100644 --- a/res/drawable/numpad_four.xml +++ b/res/drawable/numpad_four.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_4_over" /> + android:drawable="@drawable/numpad_4" /> diff --git a/res/drawable/numpad_nine.xml b/res/drawable/numpad_nine.xml index 51a5637bc..32059b5be 100644 --- a/res/drawable/numpad_nine.xml +++ b/res/drawable/numpad_nine.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_9_over" /> + android:drawable="@drawable/numpad_9" /> diff --git a/res/drawable/numpad_one.xml b/res/drawable/numpad_one.xml index 0e84886ba..dc46fba4b 100644 --- a/res/drawable/numpad_one.xml +++ b/res/drawable/numpad_one.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_1_over" /> + android:drawable="@drawable/numpad_1" /> diff --git a/res/drawable/numpad_seven.xml b/res/drawable/numpad_seven.xml index ce132ee85..7f152177e 100644 --- a/res/drawable/numpad_seven.xml +++ b/res/drawable/numpad_seven.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_7_over" /> + android:drawable="@drawable/numpad_7" /> diff --git a/res/drawable/numpad_sharp.xml b/res/drawable/numpad_sharp.xml index 00f95053c..56eebda1e 100644 --- a/res/drawable/numpad_sharp.xml +++ b/res/drawable/numpad_sharp.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_hash_over" /> + android:drawable="@drawable/numpad_hash" /> diff --git a/res/drawable/numpad_six.xml b/res/drawable/numpad_six.xml index 772a76289..88620e5f9 100644 --- a/res/drawable/numpad_six.xml +++ b/res/drawable/numpad_six.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_6_over" /> + android:drawable="@drawable/numpad_6" /> diff --git a/res/drawable/numpad_star.xml b/res/drawable/numpad_star_digit.xml similarity index 78% rename from res/drawable/numpad_star.xml rename to res/drawable/numpad_star_digit.xml index ba25790e4..a68ea64c9 100644 --- a/res/drawable/numpad_star.xml +++ b/res/drawable/numpad_star_digit.xml @@ -3,6 +3,6 @@ + android:drawable="@drawable/numpad_star" /> diff --git a/res/drawable/numpad_three.xml b/res/drawable/numpad_three.xml index 64d9d9ab5..3828174b7 100644 --- a/res/drawable/numpad_three.xml +++ b/res/drawable/numpad_three.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_3_over" /> + android:drawable="@drawable/numpad_3" /> diff --git a/res/drawable/numpad_two.xml b/res/drawable/numpad_two.xml index e65e2a7ed..8b60338cc 100644 --- a/res/drawable/numpad_two.xml +++ b/res/drawable/numpad_two.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_2_over" /> + android:drawable="@drawable/numpad_2" /> diff --git a/res/drawable/numpad_zero.xml b/res/drawable/numpad_zero.xml index 9caee9d41..34a4ed955 100644 --- a/res/drawable/numpad_zero.xml +++ b/res/drawable/numpad_zero.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/numpad_0_over" /> + android:drawable="@drawable/numpad_0" /> diff --git a/res/drawable/ok.xml b/res/drawable/ok.xml deleted file mode 100644 index b50da4366..000000000 --- a/res/drawable/ok.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/options.xml b/res/drawable/options.xml deleted file mode 100644 index add45465b..000000000 --- a/res/drawable/options.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/res/drawable/options_add_call.xml b/res/drawable/options_add_call.xml deleted file mode 100644 index 00fff68de..000000000 --- a/res/drawable/options_add_call.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/options_add_call_alt.xml b/res/drawable/options_add_call_alt.xml deleted file mode 100644 index 41658a7cf..000000000 --- a/res/drawable/options_add_call_alt.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/options_add_call_button.xml b/res/drawable/options_add_call_button.xml new file mode 100644 index 000000000..83a0120bc --- /dev/null +++ b/res/drawable/options_add_call_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/options_alt.xml b/res/drawable/options_alt.xml deleted file mode 100644 index 3b8abe67c..000000000 --- a/res/drawable/options_alt.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/res/drawable/options_start_conference_button.xml b/res/drawable/options_start_conference_button.xml new file mode 100644 index 000000000..b04e79480 --- /dev/null +++ b/res/drawable/options_start_conference_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/options_transfer.xml b/res/drawable/options_transfer.xml deleted file mode 100644 index 39ae26dfd..000000000 --- a/res/drawable/options_transfer.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/options_transfer_call_button.xml b/res/drawable/options_transfer_call_button.xml new file mode 100644 index 000000000..4ba682b61 --- /dev/null +++ b/res/drawable/options_transfer_call_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/pause.xml b/res/drawable/pause.xml index ef208947c..db65212ca 100644 --- a/res/drawable/pause.xml +++ b/res/drawable/pause.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/pause_small_over_selected" /> + android:drawable="@drawable/pause_small_default" /> diff --git a/res/drawable/pause_off.xml b/res/drawable/pause_off.xml deleted file mode 100644 index 20b205848..000000000 --- a/res/drawable/pause_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/res/drawable/pause_on.xml b/res/drawable/pause_on.xml deleted file mode 100644 index b6a96d195..000000000 --- a/res/drawable/pause_on.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/play.xml b/res/drawable/play.xml deleted file mode 100644 index 7835c3562..000000000 --- a/res/drawable/play.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/popup.9.png b/res/drawable/popup.9.png deleted file mode 100644 index 212f1e4aa..000000000 Binary files a/res/drawable/popup.9.png and /dev/null differ diff --git a/res/drawable/quit.xml b/res/drawable/quit.xml new file mode 100644 index 000000000..f85f9638b --- /dev/null +++ b/res/drawable/quit.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/remove.xml b/res/drawable/remove.xml deleted file mode 100644 index 4a288620c..000000000 --- a/res/drawable/remove.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/route_bluetooth_off.xml b/res/drawable/route_bluetooth_off.xml deleted file mode 100644 index 50964a542..000000000 --- a/res/drawable/route_bluetooth_off.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/route_bluetooth_on.xml b/res/drawable/route_bluetooth_on.xml deleted file mode 100644 index 257dbd2c6..000000000 --- a/res/drawable/route_bluetooth_on.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/route_receiver_off.xml b/res/drawable/route_receiver_off.xml deleted file mode 100644 index c850ff48e..000000000 --- a/res/drawable/route_receiver_off.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/route_receiver_on.xml b/res/drawable/route_receiver_on.xml deleted file mode 100644 index 7b6d830f9..000000000 --- a/res/drawable/route_receiver_on.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/route_speaker_off.xml b/res/drawable/route_speaker_off.xml deleted file mode 100644 index 699fad44f..000000000 --- a/res/drawable/route_speaker_off.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/route_speaker_on.xml b/res/drawable/route_speaker_on.xml deleted file mode 100644 index 59f0124fb..000000000 --- a/res/drawable/route_speaker_on.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/routes.xml b/res/drawable/routes.xml deleted file mode 100644 index 227067f91..000000000 --- a/res/drawable/routes.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/res/drawable/security_ko.png b/res/drawable/security_ko.png deleted file mode 100644 index bf75d1b27..000000000 Binary files a/res/drawable/security_ko.png and /dev/null differ diff --git a/res/drawable/security_ok.png b/res/drawable/security_ok.png deleted file mode 100644 index 0a48c7d14..000000000 Binary files a/res/drawable/security_ok.png and /dev/null differ diff --git a/res/drawable/security_pending.png b/res/drawable/security_pending.png deleted file mode 100644 index 1f68accf2..000000000 Binary files a/res/drawable/security_pending.png and /dev/null differ diff --git a/res/drawable/settings.xml b/res/drawable/settings.xml deleted file mode 100644 index 365633495..000000000 --- a/res/drawable/settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/setup_back.xml b/res/drawable/setup_back.xml deleted file mode 100644 index c5fb0fbe1..000000000 --- a/res/drawable/setup_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/setup_cancel.xml b/res/drawable/setup_cancel.xml deleted file mode 100644 index e4f34cd9f..000000000 --- a/res/drawable/setup_cancel.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/setup_next.xml b/res/drawable/setup_next.xml deleted file mode 100644 index e3c69dea1..000000000 --- a/res/drawable/setup_next.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/speaker.xml b/res/drawable/speaker.xml new file mode 100644 index 000000000..ac67e2924 --- /dev/null +++ b/res/drawable/speaker.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/speaker_off.xml b/res/drawable/speaker_off.xml deleted file mode 100644 index 125cebfe2..000000000 --- a/res/drawable/speaker_off.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/speaker_on.xml b/res/drawable/speaker_on.xml deleted file mode 100644 index b1e7ce119..000000000 --- a/res/drawable/speaker_on.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/status_green.png b/res/drawable/status_green.png deleted file mode 100644 index 1a39a4242..000000000 Binary files a/res/drawable/status_green.png and /dev/null differ diff --git a/res/drawable/status_level.xml b/res/drawable/status_level.xml index 592a6b94f..2852a9c03 100644 --- a/res/drawable/status_level.xml +++ b/res/drawable/status_level.xml @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/res/drawable/status_offline.png b/res/drawable/status_offline.png deleted file mode 100644 index 243c5c069..000000000 Binary files a/res/drawable/status_offline.png and /dev/null differ diff --git a/res/drawable/status_orange.png b/res/drawable/status_orange.png deleted file mode 100644 index f2e66d34d..000000000 Binary files a/res/drawable/status_orange.png and /dev/null differ diff --git a/res/drawable/status_red.png b/res/drawable/status_red.png deleted file mode 100644 index e7a0ec98a..000000000 Binary files a/res/drawable/status_red.png and /dev/null differ diff --git a/res/drawable/switch_camera.xml b/res/drawable/switch_camera.xml index f0e714934..b51a46377 100644 --- a/res/drawable/switch_camera.xml +++ b/res/drawable/switch_camera.xml @@ -1,7 +1,7 @@ + android:drawable="@drawable/camera_switch_over" /> + android:drawable="@drawable/camera_switch_default" /> diff --git a/res/drawable/text_button.xml b/res/drawable/text_button.xml deleted file mode 100644 index 982f2f896..000000000 --- a/res/drawable/text_button.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/drawable/text_color.xml b/res/drawable/text_color.xml deleted file mode 100644 index 3a895c222..000000000 --- a/res/drawable/text_color.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/drawable/text_incall_button_color.xml b/res/drawable/text_incall_button_color.xml deleted file mode 100644 index 9431c27e4..000000000 --- a/res/drawable/text_incall_button_color.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/drawable/text_switch_button_color.xml b/res/drawable/text_switch_button_color.xml deleted file mode 100644 index e883208d1..000000000 --- a/res/drawable/text_switch_button_color.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/drawable/toolbar_button.xml b/res/drawable/toolbar_button.xml new file mode 100644 index 000000000..b10f6f259 --- /dev/null +++ b/res/drawable/toolbar_button.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/transfer_call.xml b/res/drawable/transfer_call.xml deleted file mode 100644 index 68248239d..000000000 --- a/res/drawable/transfer_call.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/video_off.xml b/res/drawable/video_off.xml deleted file mode 100644 index ded805ba2..000000000 --- a/res/drawable/video_off.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/video_on.xml b/res/drawable/video_on.xml deleted file mode 100644 index 851cef5ef..000000000 --- a/res/drawable/video_on.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/wizard_notok.png b/res/drawable/wizard_notok.png deleted file mode 100644 index c174df390..000000000 Binary files a/res/drawable/wizard_notok.png and /dev/null differ diff --git a/res/drawable/wizard_ok.png b/res/drawable/wizard_ok.png deleted file mode 100644 index f8edc012d..000000000 Binary files a/res/drawable/wizard_ok.png and /dev/null differ diff --git a/res/drawable/zrtp_popup.9.png b/res/drawable/zrtp_popup.9.png deleted file mode 100644 index 8d117ff49..000000000 Binary files a/res/drawable/zrtp_popup.9.png and /dev/null differ diff --git a/res/layout-land/about.xml b/res/layout-land/about.xml new file mode 100644 index 000000000..6d9d277b9 --- /dev/null +++ b/res/layout-land/about.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +