diff --git a/.gitmodules b/.gitmodules index 3138e5888..21d5755ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -91,3 +91,6 @@ [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 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7601dcb72..80f026f80 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,9 +1,9 @@ - - + android:versionCode="2510" android:installLocation="auto"> + + diff --git a/Makefile b/Makefile index 08ed199c8..a4d8f4917 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ BUILD_CONTACT_HEADER=0 BUILD_RTP_MAP=0 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0 BUILD_ILBC=1 +BUILD_CODEC2=0 LIBLINPHONE_EXTENDED_SRC_FILES= LIBLINPHONE_EXTENDED_C_INCLUDES= LIBLINPHONE_EXTENDED_CFLAGS= @@ -255,6 +256,29 @@ clean-x264: rm -rf $(X264_BUILD_DIR)/arm && \ rm -rf $(X264_BUILD_DIR)/x86 +#codec2 +ifeq ($(BUILD_CODEC2),1) +CODEC2_SRC_DIR=$(TOPDIR)/submodules/externals/codec2 +CODEC2_BUILD_DIR=$(TOPDIR)/submodules/externals/build/codec2 +PREPARE_CODEC2_DEPS=codec2-install-headers +endif + +fetch-codec2: +ifneq "$(wildcard $(CODEC2_SRC_DIR) )" "" + # source directory for codec2 already exists, update it + svn up $(CODEC2_SRC_DIR) +else + #source directory for codec2 doesn't exist, create it and fetch the source from svn depot + mkdir $(CODEC2_SRC_DIR) + svn co https://svn.code.sf.net/p/freetel/code/codec2/branches/0.3/ $(CODEC2_SRC_DIR) +endif + +codec2-install-headers: fetch-codec2 + mkdir -p $(CODEC2_SRC_DIR)/include/codec2 + rsync -rvLpgoc $(CODEC2_SRC_DIR)/src/codec2.h $(CODEC2_SRC_DIR)/include/codec2/codec2.h + +prepare-codec2: $(PREPARE_CODEC2_DEPS) + #openh264 ifeq ($(BUILD_VIDEO),1) ifeq ($(BUILD_OPENH264), 1) @@ -318,13 +342,13 @@ 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 + cd $(LIBVPX_SRC_DIR) && 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) && \ + $(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --extra-cflags="-mfloat-abi=softfp -mfpu=neon" --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \ make -j${NUMCPUS} \ || ( echo "Build of libvpx for arm failed." ; exit 1 ) @@ -409,10 +433,10 @@ $(MATROSKA_SRC_DIR)/patch_applied.txt: $(MATROSKA_BUILD_DIR)/fix_libmatroska2.pa 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 +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 prepare-codec2 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_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) BUILD_CODEC2=$(BUILD_CODEC2)\ 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) @@ -471,9 +495,10 @@ install-apk: ant installd release: update-project - $(ANT) clean + $(MAKE) java-clean patch -p1 < release.patch cat ant.properties | grep version.name > default.properties + $(MAKE) generate-libs $(ANT) release patch -Rp1 < release.patch @@ -505,8 +530,10 @@ java-clean: $(ANT) clean clean: clean-native java-clean + patch -Rp1 -f < release.patch || echo "patch already cleaned" + rm -f AndroidManifest.xml.rej + rm -f AndroidManifest.xml.orig -veryclean: clean .PHONY: clean install-apk run-linphone @@ -526,4 +553,4 @@ pull-transifex: tx pull -af push-transifex: - tx push -s -t -f --no-interactive + tx push -s -f --no-interactive diff --git a/README b/README index 1ceb2271b..960700b70 100644 --- a/README +++ b/README @@ -144,3 +144,6 @@ BUILD_MATROSKA BUILD_ILBC values: 0 (don't build iLBC), 1 (do build iLBC), default value: 1 + +BUILD_CODEC2 + values: 0 (don't build codec2 support), 1 (do build codec2 support), default value: 0 diff --git a/jni/Android.mk b/jni/Android.mk index c1951fdde..4a2928c3e 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -86,6 +86,11 @@ ifeq ($(BUILD_ILBC), 1) include $(linphone-root-dir)/submodules/msilbc/Android.mk endif +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) diff --git a/jni/Application.mk b/jni/Application.mk index 62337407e..ab32cd6d1 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 @@ -127,6 +131,10 @@ ifeq ($(BUILD_ZRTP), 1) APP_MODULES += libbzrtp endif +ifeq ($(BUILD_CODEC2), 1) +APP_MODULES +=libcodec2 libmscodec2 +endif + ifeq ($(BUILD_ILBC), 1) APP_MODULES +=libmsilbc endif diff --git a/patches/libvpx_configure_android_x86.patch b/patches/libvpx_configure_android_x86.patch index 3496853dd..6c7f40e97 100644 --- a/patches/libvpx_configure_android_x86.patch +++ b/patches/libvpx_configure_android_x86.patch @@ -1,36 +1,38 @@ ---- 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 25c9f80..336b006 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1082,6 +1082,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 + -+ 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 -+ ;; ++ soft_enable realtime_only ++ ;; + - esac + esac - AS="${alt_as:-${AS:-auto}}" + AS="${alt_as:-${AS:-auto}}" diff --git a/res/color/edittextcolor.xml b/res/color/edittextcolor.xml deleted file mode 100644 index 00b8d9743..000000000 --- a/res/color/edittextcolor.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file 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_message_inprogress.png b/res/drawable-xhdpi/chat_message_inprogress.png index 3b3884d9e..f762b2d5e 100644 Binary files a/res/drawable-xhdpi/chat_message_inprogress.png 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 index af74f68d1..f858a3cea 100644 Binary files a/res/drawable-xhdpi/chat_message_not_delivered.png and b/res/drawable-xhdpi/chat_message_not_delivered.png differ diff --git a/res/drawable-xhdpi/chat_picture_default.png b/res/drawable-xhdpi/chat_picture_default.png deleted file mode 100644 index f5c3bf949..000000000 Binary files a/res/drawable-xhdpi/chat_picture_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png b/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png index cca504a1d..9c200e4d4 100644 Binary files a/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png 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 index 9c200e4d4..cca504a1d 100644 Binary files a/res/drawable-xhdpi/resizable_chat_bubble_outgoing.9.png and b/res/drawable-xhdpi/resizable_chat_bubble_outgoing.9.png differ diff --git a/res/drawable-xhdpi/security_ko.png b/res/drawable-xhdpi/security_ko.png index 579247822..9bd476a71 100644 Binary files a/res/drawable-xhdpi/security_ko.png 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 index fdd1e2e26..9ca4a19f2 100644 Binary files a/res/drawable-xhdpi/security_ok.png 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 index dc8d955be..aa7081af8 100644 Binary files a/res/drawable-xhdpi/security_pending.png and b/res/drawable-xhdpi/security_pending.png 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/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/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/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/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_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_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/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/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/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/layout-small/dialer.xml b/res/layout-small/dialer.xml deleted file mode 100644 index 996ac8121..000000000 --- a/res/layout-small/dialer.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/res/layout-small/main.xml b/res/layout-small/main.xml deleted file mode 100644 index 3875f75c3..000000000 --- a/res/layout-small/main.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout-small/menu_chat_button.xml b/res/layout-small/menu_chat_button.xml deleted file mode 100644 index 6daec2864..000000000 --- a/res/layout-small/menu_chat_button.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-small/menu_contact_button.xml b/res/layout-small/menu_contact_button.xml deleted file mode 100644 index 84c274880..000000000 --- a/res/layout-small/menu_contact_button.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-small/menu_history_button.xml b/res/layout-small/menu_history_button.xml deleted file mode 100644 index 2b391f6b1..000000000 --- a/res/layout-small/menu_history_button.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-small/menu_settings_button.xml b/res/layout-small/menu_settings_button.xml deleted file mode 100644 index 9f1ea3a9d..000000000 --- a/res/layout-small/menu_settings_button.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-small/status.xml b/res/layout-small/status.xml deleted file mode 100644 index c79638cbb..000000000 --- a/res/layout-small/status.xml +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout-small/video.xml b/res/layout-small/video.xml deleted file mode 100644 index 3f259124b..000000000 --- a/res/layout-small/video.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/audio.xml b/res/layout-sw533dp-land/audio.xml deleted file mode 100644 index 191def061..000000000 --- a/res/layout-sw533dp-land/audio.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/chat.xml b/res/layout-sw533dp-land/chat.xml deleted file mode 100644 index 65b4305d3..000000000 --- a/res/layout-sw533dp-land/chat.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/dialer.xml b/res/layout-sw533dp-land/dialer.xml deleted file mode 100644 index 489b1d0a9..000000000 --- a/res/layout-sw533dp-land/dialer.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/main.xml b/res/layout-sw533dp-land/main.xml deleted file mode 100644 index 98f65e93e..000000000 --- a/res/layout-sw533dp-land/main.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/menu_chat_button.xml b/res/layout-sw533dp-land/menu_chat_button.xml deleted file mode 100644 index 6ef0f0b70..000000000 --- a/res/layout-sw533dp-land/menu_chat_button.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/menu_contact_button.xml b/res/layout-sw533dp-land/menu_contact_button.xml deleted file mode 100644 index 6bbf67010..000000000 --- a/res/layout-sw533dp-land/menu_contact_button.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/menu_history_button.xml b/res/layout-sw533dp-land/menu_history_button.xml deleted file mode 100644 index 2c5b4b9ee..000000000 --- a/res/layout-sw533dp-land/menu_history_button.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/menu_settings_button.xml b/res/layout-sw533dp-land/menu_settings_button.xml deleted file mode 100644 index 739e3bc0e..000000000 --- a/res/layout-sw533dp-land/menu_settings_button.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout-sw533dp-land/settings.xml b/res/layout-sw533dp-land/settings.xml deleted file mode 100644 index b6b4694a1..000000000 --- a/res/layout-sw533dp-land/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml index 21cb9ba20..554d2099a 100644 --- a/res/layout/accounts.xml +++ b/res/layout/accounts.xml @@ -1,37 +1,31 @@ - - + android:layout_width="match_parent" + android:background="@color/colorG" + android:layout_height="30dp"> + + - - - + diff --git a/res/layout/active_call_control_row.xml b/res/layout/active_call_control_row.xml index df632dca2..0ad739dbe 100644 --- a/res/layout/active_call_control_row.xml +++ b/res/layout/active_call_control_row.xml @@ -7,6 +7,7 @@ android:gravity="center_vertical" android:orientation="horizontal" android:background="@color/colorA" + android:alpha="0.5" android:padding="2dp"> diff --git a/res/layout/chat.xml b/res/layout/chat.xml index a7f38b995..f288b0b35 100644 --- a/res/layout/chat.xml +++ b/res/layout/chat.xml @@ -2,16 +2,14 @@ - + android:layout_gravity="bottom"> - - - - - + + + + - + android:layout_below="@+id/top_bar"/> diff --git a/res/layout/chat_activity.xml b/res/layout/chat_activity.xml index 34e3c7ae8..75982a741 100644 --- a/res/layout/chat_activity.xml +++ b/res/layout/chat_activity.xml @@ -12,5 +12,7 @@ android:layout_width="match_parent" android:layout_height="40dp" tools:layout="@layout/status" /> + + \ No newline at end of file diff --git a/res/layout/chat_bubble_incoming.xml b/res/layout/chat_bubble_incoming.xml index 93ca9a220..7a93998d4 100644 --- a/res/layout/chat_bubble_incoming.xml +++ b/res/layout/chat_bubble_incoming.xml @@ -1,43 +1,40 @@ + android:paddingLeft="10dp"/> + android:padding="12dp"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> @@ -52,31 +49,19 @@