android: move to Gradle build
Refs #74812
Change-Id: I2587debb5e4c1584f94370edb36ad87b28fc6c92
diff --git a/Makefile b/Makefile
index 86964b8..f9ffb5f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,15 @@
ARCH = $(ANDROID_ABI)
-SRC=ring-android
+PSRC=ring-android
+SRC=$(PSRC)/app/src/main
LIBRINGJNI_H=ring-daemon/src/dring/dring.h
-LIBRINGJNI=$(SRC)/obj/local/$(ARCH)/libring.so
+LIBRINGJNI=$(SRC)/obj/local/${ANDROID_ABI}/libring.so
-JAVA_SOURCES=$(shell find $(SRC)/src/cx/ring/ -type f -name "*.java")
+JAVA_SOURCES=$(shell find $(SRC)/java/cx/ring/ -type f -name "*.java")
ifneq ($(V),)
-ANT_OPTS += -v
+GRADLE_OPTS += -d
VERBOSE =
GEN =
else
@@ -20,11 +21,11 @@
endif
ifeq ($(RELEASE),1)
-ANT_TARGET = release
+GRADLE_TARGET = assembleRelease
RING_APK=$(SRC)/bin/Ring-release-unsigned.apk
NDK_DEBUG=0
else
-ANT_TARGET = debug
+GRADLE_TARGET = assembleDebug
RING_APK=$(SRC)/bin/Ring-debug.apk
NDK_DEBUG=1
endif
@@ -37,7 +38,8 @@
echo `id -u -n`@`hostname` > $(SRC)/assets/builder.txt
git rev-parse --short HEAD > $(SRC)/assets/revision.txt
./gen-env.sh $(SRC)
- $(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
+ # many times the gradlew script is not executable by default
+ $(VERBOSE)cd $(PSRC) && chmod +x ./gradlew && ./gradlew $(GRADLE_OPTS) $(GRADLE_TARGET)
endef
$(RING_APK): $(LIBRINGJNI) $(JAVA_SOURCES)
@@ -47,7 +49,8 @@
date +"%Y-%m-%d" > $(SRC)/assets/builddate.txt
echo `id -u -n`@`hostname` > $(SRC)/assets/builder.txt
git rev-parse --short HEAD > $(SRC)/assets/revision.txt
- $(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
+ # many times the gradlew script is not executable by default
+ $(VERBOSE)cd $(PSRC) && chmod +x ./gradlew && ./gradlew $(GRADLE_OPTS) $(GRADLE_TARGET)
$(LIBRINGJNI): $(LIBRINGJNI_H)
@if [ -z "$(RING_BUILD_DIR)" ]; then echo "RING_BUILD_DIR not defined" ; exit 1; fi
diff --git a/compile.sh b/compile.sh
index cf9bcb7..43004a0 100755
--- a/compile.sh
+++ b/compile.sh
@@ -160,6 +160,7 @@
# Add the NDK toolchain to the PATH, needed both for contribs and for building
# stub libraries
NDK_TOOLCHAIN_PATH=`echo ${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin`
+export NDK_TOOLCHAIN_PATH=${NDK_TOOLCHAIN_PATH}
export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
ANDROID_PATH="`pwd`"
@@ -168,7 +169,7 @@
if [ "$FETCH" = 1 ]
then
# 1/ dring
- TESTED_HASH=1853fb821308514102cf6a98aef47ae127a78c99
+ TESTED_HASH=240708ff275a314cb8d77e9d21dc2b840cdfcf86
if [ ! -d "ring-daemon" ]; then
echo "ring daemon source not found, cloning"
git clone https://gerrit-ring.savoirfairelinux.com/ring-daemon.git
@@ -180,7 +181,7 @@
echo "ring daemon source found"
pushd ring-daemon
git fetch
- git checkout ${TESTED_HASH}
+ #git checkout ${TESTED_HASH}
# if ! git cat-file -e ${TESTED_HASH}; then
# cat << EOF
#***
@@ -329,21 +330,24 @@
[ -e .zlib ] || (mkdir -p zlib; touch .zlib)
which autopoint >/dev/null || make $MAKEFLAGS .gettext
export PATH="$PATH:$PWD/../$TARGET_TUPLE/bin"
-
-export RING_BUILD_DIR=ring-daemon/build-android-${TARGET_TUPLE}
popd
############
# Make Ring #
############
-RING_INSTALL_DIR="`realpath install-android-${TARGET_TUPLE}`"
-mkdir -p RING_INSTALL_DIR
+RING_SRC_DIR="${PWD}"
+RING_BUILD_DIR="`realpath build-android-${TARGET_TUPLE}`"
+#RING_INSTALL_DIR="`realpath install-android-${TARGET_TUPLE}`"
+export RING_SRC_DIR="${RING_SRC_DIR}"
+export RING_BUILD_DIR="${RING_BUILD_DIR}"
+
+#mkdir -p ${RING_INSTALL_DIR}
mkdir -p build-android-${TARGET_TUPLE} && pushd build-android-${TARGET_TUPLE}
DRING_PATH="`pwd`"
if [ "$JNI" = 1 ]; then
CLEAN="jniclean"
- TARGET="ring-android/obj/local/${ANDROID_ABI}/libdring.so"
+ TARGET="ring-android/app/src/obj/local/${ANDROID_ABI}/libring.so"
else
CLEAN="distclean"
TARGET=
diff --git a/ring-android/.idea/libraries/libs.xml b/ring-android/.idea/libraries/libs.xml
deleted file mode 100644
index 94ec99d..0000000
--- a/ring-android/.idea/libraries/libs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="libs">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/libs/robotium-solo-5.0.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/libs/ormlite-android-4.48.jar!/" />
- <root url="jar://$PROJECT_DIR$/libs/ormlite-core-4.48.jar!/" />
- <root url="jar://$PROJECT_DIR$/libs/android-support-v13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/ring-android/.idea/modules.xml b/ring-android/.idea/modules.xml
index 5ef5875..93fc78f 100644
--- a/ring-android/.idea/modules.xml
+++ b/ring-android/.idea/modules.xml
@@ -2,9 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/Tests/Tests.iml" filepath="$PROJECT_DIR$/Tests/Tests.iml" />
+ <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/ring-android.iml" filepath="$PROJECT_DIR$/ring-android.iml" />
</modules>
</component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/ring-android/Tests/Tests.iml b/ring-android/Tests/Tests.iml
deleted file mode 100644
index 8ee77ba..0000000
--- a/ring-android/Tests/Tests.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="android" name="Android">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="libs" level="project" />
- <orderEntry type="module" module-name="ring-android" />
- </component>
-</module>
-
diff --git a/ring-android/app/app.iml b/ring-android/app/app.iml
new file mode 100644
index 0000000..8535bf2
--- /dev/null
+++ b/ring-android/app/app.iml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ring-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="android-gradle" name="Android-Gradle">
+ <configuration>
+ <option name="GRADLE_PROJECT_PATH" value=":app" />
+ </configuration>
+ </facet>
+ <facet type="android" name="Android">
+ <configuration>
+ <option name="SELECTED_BUILD_VARIANT" value="debug" />
+ <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+ <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+ <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+ <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+ <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+ <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+ <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+ <option name="ALLOW_USER_CONFIGURATION" value="false" />
+ <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+ <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+ <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+ <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+ <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/build-types/debug/jni" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/22.2.0/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.astuetz/pagerslidingtabstrip/1.0.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+ </content>
+ <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" exported="" name="ormlite-android-4.48" level="project" />
+ <orderEntry type="library" exported="" name="pagerslidingtabstrip-1.0.1" level="project" />
+ <orderEntry type="library" exported="" name="ormlite-core-4.48" level="project" />
+ <orderEntry type="library" exported="" name="robotium-solo-5.0.1" level="project" />
+ <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+ <orderEntry type="library" exported="" name="support-v13-22.2.0" level="project" />
+ <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
+ <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
new file mode 100644
index 0000000..b067339
--- /dev/null
+++ b/ring-android/app/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.android.application'
+
+repositories {
+ mavenCentral()
+}
+dependencies {
+ compile fileTree(dir: 'libs', include: '*.jar')
+ compile 'com.j256.ormlite:ormlite-core:4.48'
+ compile 'com.j256.ormlite:ormlite-android:4.48'
+ compile "com.android.support:support-v13:22.2.0"
+ compile "com.android.support:appcompat-v7:22.2.0"
+ compile 'com.jayway.android.robotium:robotium-solo:5.0.1'
+ compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
+}
+
+android {
+ compileSdkVersion 22
+ buildToolsVersion "22.0.1"
+
+ sourceSets {
+ main {
+ aidl.srcDirs = ['src/main/java']
+ jniLibs.srcDir 'src/main/libs'
+ jni.srcDirs = []
+ }
+
+ // Move the tests to tests/java, tests/res, etc...
+ instrumentTest.setRoot('tests')
+
+ // Move the build types to build-types/<type>
+ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+ // This moves them out of them default location under src/<type>/... which would
+ // conflict with src/ being used by the main source set.
+ // Adding new build types or product flavors should be accompanied
+ // by a similar customization.
+ debug.setRoot('build-types/debug')
+ release.setRoot('build-types/release')
+ }
+}
\ No newline at end of file
diff --git a/ring-android/proguard-project.txt b/ring-android/app/proguard-project.txt
similarity index 100%
rename from ring-android/proguard-project.txt
rename to ring-android/app/proguard-project.txt
diff --git a/ring-android/AndroidManifest.xml b/ring-android/app/src/main/AndroidManifest.xml
similarity index 98%
rename from ring-android/AndroidManifest.xml
rename to ring-android/app/src/main/AndroidManifest.xml
index e280033..ceb3bd8 100644
--- a/ring-android/AndroidManifest.xml
+++ b/ring-android/app/src/main/AndroidManifest.xml
@@ -63,7 +63,6 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.WRITE_CALL_LOG" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_LOGS" />
diff --git a/ring-android/assets/.gitignore b/ring-android/app/src/main/assets/.gitignore
similarity index 100%
rename from ring-android/assets/.gitignore
rename to ring-android/app/src/main/assets/.gitignore
diff --git a/ring-android/assets/fonts/Roboto-Thin.ttf b/ring-android/app/src/main/assets/fonts/Roboto-Thin.ttf
similarity index 100%
rename from ring-android/assets/fonts/Roboto-Thin.ttf
rename to ring-android/app/src/main/assets/fonts/Roboto-Thin.ttf
Binary files differ
diff --git a/ring-android/assets/ringtones/konga.ul b/ring-android/app/src/main/assets/ringtones/konga.ul
similarity index 100%
rename from ring-android/assets/ringtones/konga.ul
rename to ring-android/app/src/main/assets/ringtones/konga.ul
Binary files differ
diff --git a/ring-android/assets/ringtones/phone.au b/ring-android/app/src/main/assets/ringtones/phone.au
similarity index 100%
rename from ring-android/assets/ringtones/phone.au
rename to ring-android/app/src/main/assets/ringtones/phone.au
Binary files differ
diff --git a/ring-android/assets/ringtones/phone2.au b/ring-android/app/src/main/assets/ringtones/phone2.au
similarity index 100%
rename from ring-android/assets/ringtones/phone2.au
rename to ring-android/app/src/main/assets/ringtones/phone2.au
Binary files differ
diff --git a/ring-android/src/cx/ring/adapters/AccountSelectionAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java
similarity index 100%
rename from ring-android/src/cx/ring/adapters/AccountSelectionAdapter.java
rename to ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java
diff --git a/ring-android/src/cx/ring/adapters/ContactPictureTask.java b/ring-android/app/src/main/java/cx/ring/adapters/ContactPictureTask.java
similarity index 100%
rename from ring-android/src/cx/ring/adapters/ContactPictureTask.java
rename to ring-android/app/src/main/java/cx/ring/adapters/ContactPictureTask.java
diff --git a/ring-android/src/cx/ring/adapters/ContactsAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java
similarity index 100%
rename from ring-android/src/cx/ring/adapters/ContactsAdapter.java
rename to ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java
diff --git a/ring-android/src/cx/ring/adapters/DiscussArrayAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/DiscussArrayAdapter.java
similarity index 100%
rename from ring-android/src/cx/ring/adapters/DiscussArrayAdapter.java
rename to ring-android/app/src/main/java/cx/ring/adapters/DiscussArrayAdapter.java
diff --git a/ring-android/src/cx/ring/adapters/SectionsPagerAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java
similarity index 98%
rename from ring-android/src/cx/ring/adapters/SectionsPagerAdapter.java
rename to ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java
index e9a4e15..bae0414 100644
--- a/ring-android/src/cx/ring/adapters/SectionsPagerAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java
@@ -40,7 +40,7 @@
import cx.ring.fragments.CallListFragment;
import cx.ring.fragments.DialingFragment;
import cx.ring.fragments.HistoryFragment;
-import cx.ring.views.PagerSlidingTabStrip;
+import com.astuetz.PagerSlidingTabStrip;
import android.content.Context;
import android.util.Log;
diff --git a/ring-android/src/cx/ring/adapters/StarredContactsAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java
similarity index 100%
rename from ring-android/src/cx/ring/adapters/StarredContactsAdapter.java
rename to ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java
diff --git a/ring-android/src/cx/ring/client/AccountEditionActivity.java b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
similarity index 99%
rename from ring-android/src/cx/ring/client/AccountEditionActivity.java
rename to ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
index 6433049..8026bb8 100644
--- a/ring-android/src/cx/ring/client/AccountEditionActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
@@ -54,8 +54,7 @@
import cx.ring.model.account.Account;
import cx.ring.service.ISipService;
import cx.ring.service.SipService;
-import cx.ring.views.PagerSlidingTabStrip;
-
+import com.astuetz.PagerSlidingTabStrip;
import java.util.ArrayList;
import java.util.Locale;
import java.util.Observable;
diff --git a/ring-android/src/cx/ring/client/AccountWizard.java b/ring-android/app/src/main/java/cx/ring/client/AccountWizard.java
similarity index 100%
rename from ring-android/src/cx/ring/client/AccountWizard.java
rename to ring-android/app/src/main/java/cx/ring/client/AccountWizard.java
diff --git a/ring-android/src/cx/ring/client/CallActivity.java b/ring-android/app/src/main/java/cx/ring/client/CallActivity.java
similarity index 100%
rename from ring-android/src/cx/ring/client/CallActivity.java
rename to ring-android/app/src/main/java/cx/ring/client/CallActivity.java
diff --git a/ring-android/src/cx/ring/client/DetailHistoryActivity.java b/ring-android/app/src/main/java/cx/ring/client/DetailHistoryActivity.java
similarity index 100%
rename from ring-android/src/cx/ring/client/DetailHistoryActivity.java
rename to ring-android/app/src/main/java/cx/ring/client/DetailHistoryActivity.java
diff --git a/ring-android/src/cx/ring/client/HomeActivity.java b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
similarity index 99%
rename from ring-android/src/cx/ring/client/HomeActivity.java
rename to ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
index fdcb022..7b4049c 100644
--- a/ring-android/src/cx/ring/client/HomeActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
@@ -234,7 +234,7 @@
Log.i(TAG, "Creating :" + toPath);
boolean res = true;
for (String file : files)
- if (file.contains(".")) {
+ if (file.contains("")) {
Log.i(TAG, "Copying file :" + fromAssetPath + "/" + file + " to " + toPath + "/" + file);
res &= copyAsset(assetManager, fromAssetPath + "/" + file, toPath + "/" + file);
} else {
diff --git a/ring-android/src/cx/ring/fragments/AboutFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AboutFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/AboutFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/AboutFragment.java
diff --git a/ring-android/src/cx/ring/fragments/AccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/AccountCreationFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
diff --git a/ring-android/src/cx/ring/fragments/AccountWrapperFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AccountWrapperFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/AccountWrapperFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/AccountWrapperFragment.java
diff --git a/ring-android/src/cx/ring/fragments/AccountsManagementFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/AccountsManagementFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java
diff --git a/ring-android/src/cx/ring/fragments/AdvancedAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/AdvancedAccountFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
diff --git a/ring-android/src/cx/ring/fragments/AudioManagementFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/AudioManagementFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java
diff --git a/ring-android/src/cx/ring/fragments/CallFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/CallFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
diff --git a/ring-android/src/cx/ring/fragments/CallListFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/CallListFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/CallListFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/CallListFragment.java
diff --git a/ring-android/src/cx/ring/fragments/CallableWrapperFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/CallableWrapperFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/CallableWrapperFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/CallableWrapperFragment.java
diff --git a/ring-android/src/cx/ring/fragments/ConferenceDFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConferenceDFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/ConferenceDFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/ConferenceDFragment.java
diff --git a/ring-android/src/cx/ring/fragments/ContactListFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/ContactListFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java
diff --git a/ring-android/src/cx/ring/fragments/DetailsHistoryEntryFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/DetailsHistoryEntryFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java
diff --git a/ring-android/src/cx/ring/fragments/DialingFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/DialingFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/DialingFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/DialingFragment.java
diff --git a/ring-android/src/cx/ring/fragments/DropActionsChoice.java b/ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/DropActionsChoice.java
rename to ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java
diff --git a/ring-android/src/cx/ring/fragments/GeneralAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/GeneralAccountFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
diff --git a/ring-android/src/cx/ring/fragments/HistoryFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/HistoryFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/HistoryFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/HistoryFragment.java
diff --git a/ring-android/src/cx/ring/fragments/HomeFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java
similarity index 98%
rename from ring-android/src/cx/ring/fragments/HomeFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java
index e3066c9..b89841d 100644
--- a/ring-android/src/cx/ring/fragments/HomeFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java
@@ -33,7 +33,7 @@
import android.support.v4.app.Fragment;
import cx.ring.R;
import cx.ring.adapters.SectionsPagerAdapter;
-import cx.ring.views.PagerSlidingTabStrip;
+import com.astuetz.PagerSlidingTabStrip;
import android.app.Activity;
import android.content.Intent;
diff --git a/ring-android/src/cx/ring/fragments/IMFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/IMFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/IMFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/IMFragment.java
diff --git a/ring-android/src/cx/ring/fragments/MenuFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/MenuFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/MenuFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/MenuFragment.java
diff --git a/ring-android/src/cx/ring/fragments/NestedSettingsFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/NestedSettingsFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/NestedSettingsFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/NestedSettingsFragment.java
diff --git a/ring-android/src/cx/ring/fragments/SecurityAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/SecurityAccountFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.java
diff --git a/ring-android/src/cx/ring/fragments/TransferDFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java
similarity index 100%
rename from ring-android/src/cx/ring/fragments/TransferDFragment.java
rename to ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java
diff --git a/ring-android/src/cx/ring/history/DatabaseHelper.java b/ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.java
similarity index 100%
rename from ring-android/src/cx/ring/history/DatabaseHelper.java
rename to ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.java
diff --git a/ring-android/src/cx/ring/history/HistoryCall.java b/ring-android/app/src/main/java/cx/ring/history/HistoryCall.java
similarity index 100%
rename from ring-android/src/cx/ring/history/HistoryCall.java
rename to ring-android/app/src/main/java/cx/ring/history/HistoryCall.java
diff --git a/ring-android/src/cx/ring/history/HistoryEntry.java b/ring-android/app/src/main/java/cx/ring/history/HistoryEntry.java
similarity index 100%
rename from ring-android/src/cx/ring/history/HistoryEntry.java
rename to ring-android/app/src/main/java/cx/ring/history/HistoryEntry.java
diff --git a/ring-android/src/cx/ring/history/HistoryManager.java b/ring-android/app/src/main/java/cx/ring/history/HistoryManager.java
similarity index 100%
rename from ring-android/src/cx/ring/history/HistoryManager.java
rename to ring-android/app/src/main/java/cx/ring/history/HistoryManager.java
diff --git a/ring-android/src/cx/ring/history/HistoryTimeModel.java b/ring-android/app/src/main/java/cx/ring/history/HistoryTimeModel.java
similarity index 100%
rename from ring-android/src/cx/ring/history/HistoryTimeModel.java
rename to ring-android/app/src/main/java/cx/ring/history/HistoryTimeModel.java
diff --git a/ring-android/src/cx/ring/interfaces/AccountsInterface.java b/ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java
similarity index 100%
rename from ring-android/src/cx/ring/interfaces/AccountsInterface.java
rename to ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java
diff --git a/ring-android/src/cx/ring/interfaces/CallInterface.java b/ring-android/app/src/main/java/cx/ring/interfaces/CallInterface.java
similarity index 100%
rename from ring-android/src/cx/ring/interfaces/CallInterface.java
rename to ring-android/app/src/main/java/cx/ring/interfaces/CallInterface.java
diff --git a/ring-android/src/cx/ring/loaders/AccountsLoader.java b/ring-android/app/src/main/java/cx/ring/loaders/AccountsLoader.java
similarity index 100%
rename from ring-android/src/cx/ring/loaders/AccountsLoader.java
rename to ring-android/app/src/main/java/cx/ring/loaders/AccountsLoader.java
diff --git a/ring-android/src/cx/ring/loaders/ContactsLoader.java b/ring-android/app/src/main/java/cx/ring/loaders/ContactsLoader.java
similarity index 100%
rename from ring-android/src/cx/ring/loaders/ContactsLoader.java
rename to ring-android/app/src/main/java/cx/ring/loaders/ContactsLoader.java
diff --git a/ring-android/src/cx/ring/loaders/HistoryLoader.java b/ring-android/app/src/main/java/cx/ring/loaders/HistoryLoader.java
similarity index 100%
rename from ring-android/src/cx/ring/loaders/HistoryLoader.java
rename to ring-android/app/src/main/java/cx/ring/loaders/HistoryLoader.java
diff --git a/ring-android/src/cx/ring/loaders/LoaderConstants.java b/ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java
similarity index 100%
rename from ring-android/src/cx/ring/loaders/LoaderConstants.java
rename to ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java
diff --git a/ring-android/src/cx/ring/model/Attractor.java b/ring-android/app/src/main/java/cx/ring/model/Attractor.java
similarity index 100%
rename from ring-android/src/cx/ring/model/Attractor.java
rename to ring-android/app/src/main/java/cx/ring/model/Attractor.java
diff --git a/ring-android/src/cx/ring/model/Bubble.java b/ring-android/app/src/main/java/cx/ring/model/Bubble.java
similarity index 100%
rename from ring-android/src/cx/ring/model/Bubble.java
rename to ring-android/app/src/main/java/cx/ring/model/Bubble.java
diff --git a/ring-android/src/cx/ring/model/BubbleContact.java b/ring-android/app/src/main/java/cx/ring/model/BubbleContact.java
similarity index 100%
rename from ring-android/src/cx/ring/model/BubbleContact.java
rename to ring-android/app/src/main/java/cx/ring/model/BubbleContact.java
diff --git a/ring-android/src/cx/ring/model/BubbleModel.java b/ring-android/app/src/main/java/cx/ring/model/BubbleModel.java
similarity index 100%
rename from ring-android/src/cx/ring/model/BubbleModel.java
rename to ring-android/app/src/main/java/cx/ring/model/BubbleModel.java
diff --git a/ring-android/src/cx/ring/model/BubbleUser.java b/ring-android/app/src/main/java/cx/ring/model/BubbleUser.java
similarity index 100%
rename from ring-android/src/cx/ring/model/BubbleUser.java
rename to ring-android/app/src/main/java/cx/ring/model/BubbleUser.java
diff --git a/ring-android/src/cx/ring/model/BubblesView.java b/ring-android/app/src/main/java/cx/ring/model/BubblesView.java
similarity index 100%
rename from ring-android/src/cx/ring/model/BubblesView.java
rename to ring-android/app/src/main/java/cx/ring/model/BubblesView.java
diff --git a/ring-android/src/cx/ring/model/CallContact.java b/ring-android/app/src/main/java/cx/ring/model/CallContact.java
similarity index 100%
rename from ring-android/src/cx/ring/model/CallContact.java
rename to ring-android/app/src/main/java/cx/ring/model/CallContact.java
diff --git a/ring-android/src/cx/ring/model/Codec.java b/ring-android/app/src/main/java/cx/ring/model/Codec.java
similarity index 100%
rename from ring-android/src/cx/ring/model/Codec.java
rename to ring-android/app/src/main/java/cx/ring/model/Codec.java
diff --git a/ring-android/src/cx/ring/model/Conference.aidl b/ring-android/app/src/main/java/cx/ring/model/Conference.aidl
similarity index 100%
rename from ring-android/src/cx/ring/model/Conference.aidl
rename to ring-android/app/src/main/java/cx/ring/model/Conference.aidl
diff --git a/ring-android/src/cx/ring/model/Conference.java b/ring-android/app/src/main/java/cx/ring/model/Conference.java
similarity index 100%
rename from ring-android/src/cx/ring/model/Conference.java
rename to ring-android/app/src/main/java/cx/ring/model/Conference.java
diff --git a/ring-android/src/cx/ring/model/SecureSipCall.java b/ring-android/app/src/main/java/cx/ring/model/SecureSipCall.java
similarity index 100%
rename from ring-android/src/cx/ring/model/SecureSipCall.java
rename to ring-android/app/src/main/java/cx/ring/model/SecureSipCall.java
diff --git a/ring-android/src/cx/ring/model/SipCall.aidl b/ring-android/app/src/main/java/cx/ring/model/SipCall.aidl
similarity index 100%
rename from ring-android/src/cx/ring/model/SipCall.aidl
rename to ring-android/app/src/main/java/cx/ring/model/SipCall.aidl
diff --git a/ring-android/src/cx/ring/model/SipCall.java b/ring-android/app/src/main/java/cx/ring/model/SipCall.java
similarity index 100%
rename from ring-android/src/cx/ring/model/SipCall.java
rename to ring-android/app/src/main/java/cx/ring/model/SipCall.java
diff --git a/ring-android/src/cx/ring/model/SipMessage.aidl b/ring-android/app/src/main/java/cx/ring/model/SipMessage.aidl
similarity index 100%
rename from ring-android/src/cx/ring/model/SipMessage.aidl
rename to ring-android/app/src/main/java/cx/ring/model/SipMessage.aidl
diff --git a/ring-android/src/cx/ring/model/SipMessage.java b/ring-android/app/src/main/java/cx/ring/model/SipMessage.java
similarity index 100%
rename from ring-android/src/cx/ring/model/SipMessage.java
rename to ring-android/app/src/main/java/cx/ring/model/SipMessage.java
diff --git a/ring-android/src/cx/ring/model/account/Account.java b/ring-android/app/src/main/java/cx/ring/model/account/Account.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/Account.java
rename to ring-android/app/src/main/java/cx/ring/model/account/Account.java
diff --git a/ring-android/src/cx/ring/model/account/AccountCredentials.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountCredentials.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/AccountCredentials.java
rename to ring-android/app/src/main/java/cx/ring/model/account/AccountCredentials.java
diff --git a/ring-android/src/cx/ring/model/account/AccountDetail.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetail.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/AccountDetail.java
rename to ring-android/app/src/main/java/cx/ring/model/account/AccountDetail.java
diff --git a/ring-android/src/cx/ring/model/account/AccountDetailAdvanced.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailAdvanced.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/AccountDetailAdvanced.java
rename to ring-android/app/src/main/java/cx/ring/model/account/AccountDetailAdvanced.java
diff --git a/ring-android/src/cx/ring/model/account/AccountDetailBasic.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/AccountDetailBasic.java
rename to ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
diff --git a/ring-android/src/cx/ring/model/account/AccountDetailSrtp.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailSrtp.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/AccountDetailSrtp.java
rename to ring-android/app/src/main/java/cx/ring/model/account/AccountDetailSrtp.java
diff --git a/ring-android/src/cx/ring/model/account/AccountDetailTls.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailTls.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/AccountDetailTls.java
rename to ring-android/app/src/main/java/cx/ring/model/account/AccountDetailTls.java
diff --git a/ring-android/src/cx/ring/model/account/CredentialsManager.java b/ring-android/app/src/main/java/cx/ring/model/account/CredentialsManager.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/CredentialsManager.java
rename to ring-android/app/src/main/java/cx/ring/model/account/CredentialsManager.java
diff --git a/ring-android/src/cx/ring/model/account/SRTPManager.java b/ring-android/app/src/main/java/cx/ring/model/account/SRTPManager.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/SRTPManager.java
rename to ring-android/app/src/main/java/cx/ring/model/account/SRTPManager.java
diff --git a/ring-android/src/cx/ring/model/account/TLSManager.java b/ring-android/app/src/main/java/cx/ring/model/account/TLSManager.java
similarity index 100%
rename from ring-android/src/cx/ring/model/account/TLSManager.java
rename to ring-android/app/src/main/java/cx/ring/model/account/TLSManager.java
diff --git a/ring-android/src/cx/ring/service/CallManagerCallBack.java b/ring-android/app/src/main/java/cx/ring/service/CallManagerCallBack.java
similarity index 100%
rename from ring-android/src/cx/ring/service/CallManagerCallBack.java
rename to ring-android/app/src/main/java/cx/ring/service/CallManagerCallBack.java
diff --git a/ring-android/src/cx/ring/service/ConfigurationManagerCallback.java b/ring-android/app/src/main/java/cx/ring/service/ConfigurationManagerCallback.java
similarity index 100%
rename from ring-android/src/cx/ring/service/ConfigurationManagerCallback.java
rename to ring-android/app/src/main/java/cx/ring/service/ConfigurationManagerCallback.java
diff --git a/ring-android/src/cx/ring/service/ISipService.aidl b/ring-android/app/src/main/java/cx/ring/service/ISipService.aidl
similarity index 100%
rename from ring-android/src/cx/ring/service/ISipService.aidl
rename to ring-android/app/src/main/java/cx/ring/service/ISipService.aidl
diff --git a/ring-android/src/cx/ring/service/OpenSlParams.java b/ring-android/app/src/main/java/cx/ring/service/OpenSlParams.java
similarity index 100%
rename from ring-android/src/cx/ring/service/OpenSlParams.java
rename to ring-android/app/src/main/java/cx/ring/service/OpenSlParams.java
diff --git a/ring-android/src/cx/ring/service/ServiceConstants.java b/ring-android/app/src/main/java/cx/ring/service/ServiceConstants.java
similarity index 100%
rename from ring-android/src/cx/ring/service/ServiceConstants.java
rename to ring-android/app/src/main/java/cx/ring/service/ServiceConstants.java
diff --git a/ring-android/src/cx/ring/service/SipService.java b/ring-android/app/src/main/java/cx/ring/service/SipService.java
similarity index 100%
rename from ring-android/src/cx/ring/service/SipService.java
rename to ring-android/app/src/main/java/cx/ring/service/SipService.java
diff --git a/ring-android/src/cx/ring/utils/AccelerometerListener.java b/ring-android/app/src/main/java/cx/ring/utils/AccelerometerListener.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/AccelerometerListener.java
rename to ring-android/app/src/main/java/cx/ring/utils/AccelerometerListener.java
diff --git a/ring-android/src/cx/ring/utils/CallProximityManager.java b/ring-android/app/src/main/java/cx/ring/utils/CallProximityManager.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/CallProximityManager.java
rename to ring-android/app/src/main/java/cx/ring/utils/CallProximityManager.java
diff --git a/ring-android/src/cx/ring/utils/Compatibility.java b/ring-android/app/src/main/java/cx/ring/utils/Compatibility.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/Compatibility.java
rename to ring-android/app/src/main/java/cx/ring/utils/Compatibility.java
diff --git a/ring-android/src/cx/ring/utils/MediaManager.java b/ring-android/app/src/main/java/cx/ring/utils/MediaManager.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/MediaManager.java
rename to ring-android/app/src/main/java/cx/ring/utils/MediaManager.java
diff --git a/ring-android/src/cx/ring/utils/Ringer.java b/ring-android/app/src/main/java/cx/ring/utils/Ringer.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/Ringer.java
rename to ring-android/app/src/main/java/cx/ring/utils/Ringer.java
diff --git a/ring-android/src/cx/ring/utils/SettingsContentObserver.java b/ring-android/app/src/main/java/cx/ring/utils/SettingsContentObserver.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/SettingsContentObserver.java
rename to ring-android/app/src/main/java/cx/ring/utils/SettingsContentObserver.java
diff --git a/ring-android/src/cx/ring/utils/SipNotifications.java b/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/SipNotifications.java
rename to ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java
diff --git a/ring-android/src/cx/ring/utils/SwigNativeConverter.java b/ring-android/app/src/main/java/cx/ring/utils/SwigNativeConverter.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/SwigNativeConverter.java
rename to ring-android/app/src/main/java/cx/ring/utils/SwigNativeConverter.java
diff --git a/ring-android/src/cx/ring/utils/bluetooth/BluetoothUtils14.java b/ring-android/app/src/main/java/cx/ring/utils/bluetooth/BluetoothUtils14.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/bluetooth/BluetoothUtils14.java
rename to ring-android/app/src/main/java/cx/ring/utils/bluetooth/BluetoothUtils14.java
diff --git a/ring-android/src/cx/ring/utils/bluetooth/BluetoothWrapper.java b/ring-android/app/src/main/java/cx/ring/utils/bluetooth/BluetoothWrapper.java
similarity index 100%
rename from ring-android/src/cx/ring/utils/bluetooth/BluetoothWrapper.java
rename to ring-android/app/src/main/java/cx/ring/utils/bluetooth/BluetoothWrapper.java
diff --git a/ring-android/src/cx/ring/views/CallPaneLayout.java b/ring-android/app/src/main/java/cx/ring/views/CallPaneLayout.java
similarity index 100%
rename from ring-android/src/cx/ring/views/CallPaneLayout.java
rename to ring-android/app/src/main/java/cx/ring/views/CallPaneLayout.java
diff --git a/ring-android/src/cx/ring/views/CircularImageView.java b/ring-android/app/src/main/java/cx/ring/views/CircularImageView.java
similarity index 100%
rename from ring-android/src/cx/ring/views/CircularImageView.java
rename to ring-android/app/src/main/java/cx/ring/views/CircularImageView.java
diff --git a/ring-android/src/cx/ring/views/ClearableEditText.java b/ring-android/app/src/main/java/cx/ring/views/ClearableEditText.java
similarity index 100%
rename from ring-android/src/cx/ring/views/ClearableEditText.java
rename to ring-android/app/src/main/java/cx/ring/views/ClearableEditText.java
diff --git a/ring-android/src/cx/ring/views/CredentialsPreference.java b/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
similarity index 100%
rename from ring-android/src/cx/ring/views/CredentialsPreference.java
rename to ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
diff --git a/ring-android/src/cx/ring/views/HalfCircleImageView.java b/ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java
similarity index 100%
rename from ring-android/src/cx/ring/views/HalfCircleImageView.java
rename to ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java
diff --git a/ring-android/src/cx/ring/views/NumberPickerPreference.java b/ring-android/app/src/main/java/cx/ring/views/NumberPickerPreference.java
similarity index 100%
rename from ring-android/src/cx/ring/views/NumberPickerPreference.java
rename to ring-android/app/src/main/java/cx/ring/views/NumberPickerPreference.java
diff --git a/ring-android/src/cx/ring/views/PasswordEditText.java b/ring-android/app/src/main/java/cx/ring/views/PasswordEditText.java
similarity index 100%
rename from ring-android/src/cx/ring/views/PasswordEditText.java
rename to ring-android/app/src/main/java/cx/ring/views/PasswordEditText.java
diff --git a/ring-android/src/cx/ring/views/PasswordPreference.java b/ring-android/app/src/main/java/cx/ring/views/PasswordPreference.java
similarity index 100%
rename from ring-android/src/cx/ring/views/PasswordPreference.java
rename to ring-android/app/src/main/java/cx/ring/views/PasswordPreference.java
diff --git a/ring-android/src/cx/ring/views/QuadNumberPickerPreference.java b/ring-android/app/src/main/java/cx/ring/views/QuadNumberPickerPreference.java
similarity index 100%
rename from ring-android/src/cx/ring/views/QuadNumberPickerPreference.java
rename to ring-android/app/src/main/java/cx/ring/views/QuadNumberPickerPreference.java
diff --git a/ring-android/src/cx/ring/views/SlidingUpPanelLayout.java b/ring-android/app/src/main/java/cx/ring/views/SlidingUpPanelLayout.java
similarity index 100%
rename from ring-android/src/cx/ring/views/SlidingUpPanelLayout.java
rename to ring-android/app/src/main/java/cx/ring/views/SlidingUpPanelLayout.java
diff --git a/ring-android/src/cx/ring/views/SwipeListViewTouchListener.java b/ring-android/app/src/main/java/cx/ring/views/SwipeListViewTouchListener.java
similarity index 100%
rename from ring-android/src/cx/ring/views/SwipeListViewTouchListener.java
rename to ring-android/app/src/main/java/cx/ring/views/SwipeListViewTouchListener.java
diff --git a/ring-android/src/cx/ring/views/dragsortlv/DragSortController.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortController.java
similarity index 100%
rename from ring-android/src/cx/ring/views/dragsortlv/DragSortController.java
rename to ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortController.java
diff --git a/ring-android/src/cx/ring/views/dragsortlv/DragSortCursorAdapter.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
similarity index 100%
rename from ring-android/src/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
rename to ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
diff --git a/ring-android/src/cx/ring/views/dragsortlv/DragSortItemView.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemView.java
similarity index 100%
rename from ring-android/src/cx/ring/views/dragsortlv/DragSortItemView.java
rename to ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemView.java
diff --git a/ring-android/src/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
similarity index 100%
rename from ring-android/src/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
rename to ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
diff --git a/ring-android/src/cx/ring/views/dragsortlv/DragSortListView.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortListView.java
similarity index 100%
rename from ring-android/src/cx/ring/views/dragsortlv/DragSortListView.java
rename to ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortListView.java
diff --git a/ring-android/src/cx/ring/views/dragsortlv/ResourceDragSortCursorAdapter.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/ResourceDragSortCursorAdapter.java
similarity index 100%
rename from ring-android/src/cx/ring/views/dragsortlv/ResourceDragSortCursorAdapter.java
rename to ring-android/app/src/main/java/cx/ring/views/dragsortlv/ResourceDragSortCursorAdapter.java
diff --git a/ring-android/src/cx/ring/views/dragsortlv/SimpleDragSortCursorAdapter.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/SimpleDragSortCursorAdapter.java
similarity index 100%
rename from ring-android/src/cx/ring/views/dragsortlv/SimpleDragSortCursorAdapter.java
rename to ring-android/app/src/main/java/cx/ring/views/dragsortlv/SimpleDragSortCursorAdapter.java
diff --git a/ring-android/src/cx/ring/views/dragsortlv/SimpleFloatViewManager.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/SimpleFloatViewManager.java
similarity index 100%
rename from ring-android/src/cx/ring/views/dragsortlv/SimpleFloatViewManager.java
rename to ring-android/app/src/main/java/cx/ring/views/dragsortlv/SimpleFloatViewManager.java
diff --git a/ring-android/src/cx/ring/views/stickylistheaders/AdapterWrapper.java b/ring-android/app/src/main/java/cx/ring/views/stickylistheaders/AdapterWrapper.java
similarity index 100%
rename from ring-android/src/cx/ring/views/stickylistheaders/AdapterWrapper.java
rename to ring-android/app/src/main/java/cx/ring/views/stickylistheaders/AdapterWrapper.java
diff --git a/ring-android/src/cx/ring/views/stickylistheaders/ApiLevelTooLowException.java b/ring-android/app/src/main/java/cx/ring/views/stickylistheaders/ApiLevelTooLowException.java
similarity index 100%
rename from ring-android/src/cx/ring/views/stickylistheaders/ApiLevelTooLowException.java
rename to ring-android/app/src/main/java/cx/ring/views/stickylistheaders/ApiLevelTooLowException.java
diff --git a/ring-android/src/cx/ring/views/stickylistheaders/CheckableWrapperView.java b/ring-android/app/src/main/java/cx/ring/views/stickylistheaders/CheckableWrapperView.java
similarity index 100%
rename from ring-android/src/cx/ring/views/stickylistheaders/CheckableWrapperView.java
rename to ring-android/app/src/main/java/cx/ring/views/stickylistheaders/CheckableWrapperView.java
diff --git a/ring-android/src/cx/ring/views/stickylistheaders/SectionIndexerAdapterWrapper.java b/ring-android/app/src/main/java/cx/ring/views/stickylistheaders/SectionIndexerAdapterWrapper.java
similarity index 100%
rename from ring-android/src/cx/ring/views/stickylistheaders/SectionIndexerAdapterWrapper.java
rename to ring-android/app/src/main/java/cx/ring/views/stickylistheaders/SectionIndexerAdapterWrapper.java
diff --git a/ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersAdapter.java b/ring-android/app/src/main/java/cx/ring/views/stickylistheaders/StickyListHeadersAdapter.java
similarity index 100%
rename from ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersAdapter.java
rename to ring-android/app/src/main/java/cx/ring/views/stickylistheaders/StickyListHeadersAdapter.java
diff --git a/ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersListView.java b/ring-android/app/src/main/java/cx/ring/views/stickylistheaders/StickyListHeadersListView.java
similarity index 100%
rename from ring-android/src/cx/ring/views/stickylistheaders/StickyListHeadersListView.java
rename to ring-android/app/src/main/java/cx/ring/views/stickylistheaders/StickyListHeadersListView.java
diff --git a/ring-android/src/cx/ring/views/stickylistheaders/WrapperView.java b/ring-android/app/src/main/java/cx/ring/views/stickylistheaders/WrapperView.java
similarity index 100%
rename from ring-android/src/cx/ring/views/stickylistheaders/WrapperView.java
rename to ring-android/app/src/main/java/cx/ring/views/stickylistheaders/WrapperView.java
diff --git a/ring-android/src/cx/ring/views/stickylistheaders/WrapperViewList.java b/ring-android/app/src/main/java/cx/ring/views/stickylistheaders/WrapperViewList.java
similarity index 100%
rename from ring-android/src/cx/ring/views/stickylistheaders/WrapperViewList.java
rename to ring-android/app/src/main/java/cx/ring/views/stickylistheaders/WrapperViewList.java
diff --git a/ring-android/jni/.gitignore b/ring-android/app/src/main/jni/.gitignore
similarity index 100%
rename from ring-android/jni/.gitignore
rename to ring-android/app/src/main/jni/.gitignore
diff --git a/ring-android/jni/Android.mk b/ring-android/app/src/main/jni/Android.mk
similarity index 100%
rename from ring-android/jni/Android.mk
rename to ring-android/app/src/main/jni/Android.mk
diff --git a/ring-android/jni/Application.mk b/ring-android/app/src/main/jni/Application.mk
similarity index 100%
rename from ring-android/jni/Application.mk
rename to ring-android/app/src/main/jni/Application.mk
diff --git a/ring-android/jni/JavaJNI2CJNI_Load.py b/ring-android/app/src/main/jni/JavaJNI2CJNI_Load.py
similarity index 100%
rename from ring-android/jni/JavaJNI2CJNI_Load.py
rename to ring-android/app/src/main/jni/JavaJNI2CJNI_Load.py
diff --git a/ring-android/jni/callmanager.i b/ring-android/app/src/main/jni/callmanager.i
similarity index 100%
rename from ring-android/jni/callmanager.i
rename to ring-android/app/src/main/jni/callmanager.i
diff --git a/ring-android/jni/configurationmanager.i b/ring-android/app/src/main/jni/configurationmanager.i
similarity index 100%
rename from ring-android/jni/configurationmanager.i
rename to ring-android/app/src/main/jni/configurationmanager.i
diff --git a/ring-android/jni/jni-xml2cpp.py b/ring-android/app/src/main/jni/jni-xml2cpp.py
similarity index 100%
rename from ring-android/jni/jni-xml2cpp.py
rename to ring-android/app/src/main/jni/jni-xml2cpp.py
diff --git a/ring-android/jni/jni_interface.i b/ring-android/app/src/main/jni/jni_interface.i
similarity index 100%
rename from ring-android/jni/jni_interface.i
rename to ring-android/app/src/main/jni/jni_interface.i
diff --git a/ring-android/jni/managerimpl.i b/ring-android/app/src/main/jni/managerimpl.i
similarity index 100%
rename from ring-android/jni/managerimpl.i
rename to ring-android/app/src/main/jni/managerimpl.i
diff --git a/ring-android/jni/ringservice.c.template b/ring-android/app/src/main/jni/ringservice.c.template
similarity index 100%
rename from ring-android/jni/ringservice.c.template
rename to ring-android/app/src/main/jni/ringservice.c.template
diff --git a/ring-android/res/animator/slidein_up.xml b/ring-android/app/src/main/res/animator/slidein_up.xml
similarity index 100%
rename from ring-android/res/animator/slidein_up.xml
rename to ring-android/app/src/main/res/animator/slidein_up.xml
diff --git a/ring-android/res/animator/slideout_down.xml b/ring-android/app/src/main/res/animator/slideout_down.xml
similarity index 100%
rename from ring-android/res/animator/slideout_down.xml
rename to ring-android/app/src/main/res/animator/slideout_down.xml
diff --git a/ring-android/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png b/ring-android/app/src/main/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png
rename to ring-android/app/src/main/res/drawable-hdpi/ab_stacked_solid_light_holo.9.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/box_border.9.png b/ring-android/app/src/main/res/drawable-hdpi/box_border.9.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/box_border.9.png
rename to ring-android/app/src/main/res/drawable-hdpi/box_border.9.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/call_pause.png b/ring-android/app/src/main/res/drawable-hdpi/call_pause.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/call_pause.png
rename to ring-android/app/src/main/res/drawable-hdpi/call_pause.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/drawer_shadow.9.png b/ring-android/app/src/main/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/drawer_shadow.9.png
rename to ring-android/app/src/main/res/drawable-hdpi/drawer_shadow.9.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/green_lock.png b/ring-android/app/src/main/res/drawable-hdpi/green_lock.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/green_lock.png
rename to ring-android/app/src/main/res/drawable-hdpi/green_lock.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/handle.png b/ring-android/app/src/main/res/drawable-hdpi/handle.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/handle.png
rename to ring-android/app/src/main/res/drawable-hdpi/handle.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_accept.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_accept.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_accept.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_accept.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_call.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_call.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_call.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_chat.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_chat.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_chat.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_dial_pad.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad_light.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_dial_pad_light.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad_light.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_discard.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_discard.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_discard.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_discard.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_edit.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_edit.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_edit.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_edit.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_end_call.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_end_call.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_end_call.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_end_call.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_expand.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_expand.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_expand.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_expand.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_expand_light.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_expand_light.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_expand_light.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_expand_light.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_forward.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_forward.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_forward.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_forward.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_group.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_group.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_group.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_group.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_important.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_important.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_important.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_important.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_keyboard.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_keyboard.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_keyboard.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_keyboard.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_keyboard_light.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_keyboard_light.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_keyboard_light.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_keyboard_light.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_mic.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_mic.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_mic.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_mic.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_mic_muted.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_mic_muted.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_mic_muted.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_mic_muted.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_new.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_new.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_new.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_new.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_new_dark.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_new_dark.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_new_dark.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_new_dark.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_not_important.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_not_important.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_not_important.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_not_important.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_pause_over_video.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_pause_over_video.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_pause_over_video.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_pause_over_video.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_play_over_video.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_play_over_video.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_play_over_video.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_play_over_video.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_remove.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_remove.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_remove.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_remove.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_reveal.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_reveal.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_reveal.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_reveal.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_time.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_time.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_time.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_time.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_action_volume_on.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_volume_on.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_action_volume_on.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_action_volume_on.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_bg.png b/ring-android/app/src/main/res/drawable-hdpi/ic_bg.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_bg.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_bg.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_bg_sel.png b/ring-android/app/src/main/res/drawable-hdpi/ic_bg_sel.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_bg_sel.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_bg_sel.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_btn_search.png b/ring-android/app/src/main/res/drawable-hdpi/ic_btn_search.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_btn_search.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_btn_search.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_btn_speak_now.png b/ring-android/app/src/main/res/drawable-hdpi/ic_btn_speak_now.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_btn_speak_now.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_btn_speak_now.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_drawer.png b/ring-android/app/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_drawer.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_drawer.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_error.png b/ring-android/app/src/main/res/drawable-hdpi/ic_error.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_error.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_error.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_good.png b/ring-android/app/src/main/res/drawable-hdpi/ic_good.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_good.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_good.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_incomingcall.png b/ring-android/app/src/main/res/drawable-hdpi/ic_incomingcall.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_incomingcall.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_incomingcall.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_launcher.png b/ring-android/app/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_launcher.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_menu_search.png b/ring-android/app/src/main/res/drawable-hdpi/ic_menu_search.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_menu_search.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_menu_search.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_tab_call.png b/ring-android/app/src/main/res/drawable-hdpi/ic_tab_call.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_tab_call.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_tab_call.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/ic_warning.png b/ring-android/app/src/main/res/drawable-hdpi/ic_warning.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/ic_warning.png
rename to ring-android/app/src/main/res/drawable-hdpi/ic_warning.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/recordpressed.png b/ring-android/app/src/main/res/drawable-hdpi/recordpressed.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/recordpressed.png
rename to ring-android/app/src/main/res/drawable-hdpi/recordpressed.png
Binary files differ
diff --git a/ring-android/res/drawable-hdpi/red_lock.png b/ring-android/app/src/main/res/drawable-hdpi/red_lock.png
similarity index 100%
rename from ring-android/res/drawable-hdpi/red_lock.png
rename to ring-android/app/src/main/res/drawable-hdpi/red_lock.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png b/ring-android/app/src/main/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png
rename to ring-android/app/src/main/res/drawable-mdpi/ab_stacked_solid_light_holo.9.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/drawer_shadow.9.png b/ring-android/app/src/main/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/drawer_shadow.9.png
rename to ring-android/app/src/main/res/drawable-mdpi/drawer_shadow.9.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/green_lock.png b/ring-android/app/src/main/res/drawable-mdpi/green_lock.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/green_lock.png
rename to ring-android/app/src/main/res/drawable-mdpi/green_lock.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/handle.png b/ring-android/app/src/main/res/drawable-mdpi/handle.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/handle.png
rename to ring-android/app/src/main/res/drawable-mdpi/handle.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_accept.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_accept.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_accept.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_accept.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_call.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_call.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_call.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_chat.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_chat.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_chat.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_dial_pad.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad_light.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_dial_pad_light.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad_light.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_discard.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_discard.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_discard.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_discard.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_edit.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_edit.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_edit.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_edit.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_end_call.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_end_call.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_end_call.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_end_call.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_expand.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_expand.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_expand.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_expand.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_expand_light.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_expand_light.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_expand_light.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_expand_light.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_forward.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_forward.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_forward.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_forward.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_group.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_group.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_group.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_group.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_important.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_important.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_important.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_important.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_keyboard.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_keyboard.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_keyboard.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_keyboard.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_keyboard_light.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_keyboard_light.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_keyboard_light.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_keyboard_light.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_mic.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_mic.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_mic.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_mic.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_mic_muted.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_mic_muted.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_mic_muted.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_mic_muted.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_new.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_new.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_new.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_new.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_new_dark.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_new_dark.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_new_dark.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_new_dark.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_not_important.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_not_important.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_not_important.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_not_important.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_pause_over_video.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_pause_over_video.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_pause_over_video.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_pause_over_video.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_play_over_video.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_play_over_video.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_play_over_video.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_play_over_video.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_remove.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_remove.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_remove.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_remove.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_reveal.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_reveal.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_reveal.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_reveal.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_time.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_time.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_time.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_time.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_action_volume_on.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_volume_on.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_action_volume_on.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_action_volume_on.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_btn_search.png b/ring-android/app/src/main/res/drawable-mdpi/ic_btn_search.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_btn_search.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_btn_search.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_btn_speak_now.png b/ring-android/app/src/main/res/drawable-mdpi/ic_btn_speak_now.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_btn_speak_now.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_btn_speak_now.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_drawer.png b/ring-android/app/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_drawer.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_drawer.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_error.png b/ring-android/app/src/main/res/drawable-mdpi/ic_error.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_error.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_error.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_good.png b/ring-android/app/src/main/res/drawable-mdpi/ic_good.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_good.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_good.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_incomingcall.png b/ring-android/app/src/main/res/drawable-mdpi/ic_incomingcall.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_incomingcall.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_incomingcall.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_launcher.png b/ring-android/app/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_launcher.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_menu_search.png b/ring-android/app/src/main/res/drawable-mdpi/ic_menu_search.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_menu_search.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_menu_search.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/ic_warning.png b/ring-android/app/src/main/res/drawable-mdpi/ic_warning.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/ic_warning.png
rename to ring-android/app/src/main/res/drawable-mdpi/ic_warning.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/recordpressed.png b/ring-android/app/src/main/res/drawable-mdpi/recordpressed.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/recordpressed.png
rename to ring-android/app/src/main/res/drawable-mdpi/recordpressed.png
Binary files differ
diff --git a/ring-android/res/drawable-mdpi/red_lock.png b/ring-android/app/src/main/res/drawable-mdpi/red_lock.png
similarity index 100%
rename from ring-android/res/drawable-mdpi/red_lock.png
rename to ring-android/app/src/main/res/drawable-mdpi/red_lock.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png b/ring-android/app/src/main/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ab_stacked_solid_light_holo.9.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/device_access_call.png b/ring-android/app/src/main/res/drawable-xhdpi/device_access_call.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/device_access_call.png
rename to ring-android/app/src/main/res/drawable-xhdpi/device_access_call.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/drawer_shadow.9.png b/ring-android/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/drawer_shadow.9.png
rename to ring-android/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/green_lock.png b/ring-android/app/src/main/res/drawable-xhdpi/green_lock.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/green_lock.png
rename to ring-android/app/src/main/res/drawable-xhdpi/green_lock.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/handle.png b/ring-android/app/src/main/res/drawable-xhdpi/handle.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/handle.png
rename to ring-android/app/src/main/res/drawable-xhdpi/handle.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_accept.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_accept.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_accept.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_accept.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_call.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_call.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_call.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_chat.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_chat.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_chat.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_dial_pad.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad_light.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_dial_pad_light.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad_light.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_discard.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_discard.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_discard.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_discard.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_edit.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_edit.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_edit.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_edit.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_end_call.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_end_call.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_end_call.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_end_call.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_expand.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_expand.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_expand.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_expand.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_expand_light.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_expand_light.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_expand_light.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_expand_light.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_forward.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_forward.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_forward.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_forward.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_group.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_group.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_group.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_group.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_important.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_important.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_important.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_important.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_keyboard.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_keyboard.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_keyboard.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_keyboard.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_keyboard_light.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_keyboard_light.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_keyboard_light.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_keyboard_light.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_mic.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_mic.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_mic.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_mic.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_mic_muted.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_mic_muted.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_mic_muted.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_mic_muted.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_new.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_new.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_new.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_new.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_new_dark.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_new_dark.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_new_dark.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_new_dark.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_not_important.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_not_important.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_not_important.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_not_important.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_pause_over_video.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_pause_over_video.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_play_over_video.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_play_over_video.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_play_over_video.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_play_over_video.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_remove.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_remove.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_remove.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_remove.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_reveal.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_reveal.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_reveal.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_reveal.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_time.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_time.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_time.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_time.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_action_volume_on.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_volume_on.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_action_volume_on.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_action_volume_on.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_btn_search.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_btn_search.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_btn_search.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_btn_search.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_btn_speak_now.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_btn_speak_now.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_btn_speak_now.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_btn_speak_now.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_drawer.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_drawer.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_drawer.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_error.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_error.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_error.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_error.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_good.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_good.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_good.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_good.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_incomingcall.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_incomingcall.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_incomingcall.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_incomingcall.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_launcher.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_launcher.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/ic_warning.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_warning.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/ic_warning.png
rename to ring-android/app/src/main/res/drawable-xhdpi/ic_warning.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/recordpressed.png b/ring-android/app/src/main/res/drawable-xhdpi/recordpressed.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/recordpressed.png
rename to ring-android/app/src/main/res/drawable-xhdpi/recordpressed.png
Binary files differ
diff --git a/ring-android/res/drawable-xhdpi/red_lock.png b/ring-android/app/src/main/res/drawable-xhdpi/red_lock.png
similarity index 100%
rename from ring-android/res/drawable-xhdpi/red_lock.png
rename to ring-android/app/src/main/res/drawable-xhdpi/red_lock.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/green_lock.png b/ring-android/app/src/main/res/drawable-xxhdpi/green_lock.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/green_lock.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/green_lock.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/handle.png b/ring-android/app/src/main/res/drawable-xxhdpi/handle.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/handle.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/handle.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_accept.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_accept.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_accept.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_accept.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_call.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_call.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_call.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_chat.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_chat.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_chat.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_dial_pad.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad_light.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_dial_pad_light.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad_light.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_discard.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_discard.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_discard.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_discard.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_edit.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_edit.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_edit.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_edit.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_end_call.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_end_call.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_end_call.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_end_call.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_expand.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_expand.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_expand.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_expand.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_expand_light.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_expand_light.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_expand_light.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_expand_light.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_forward.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_forward.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_forward.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_forward.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_group.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_group.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_group.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_group.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_important.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_important.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_important.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_important.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_keyboard.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_keyboard.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_keyboard.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_keyboard.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_keyboard_light.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_keyboard_light.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_keyboard_light.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_keyboard_light.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_mic.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_mic.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_mic.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_mic.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_mic_muted.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_mic_muted.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_mic_muted.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_mic_muted.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_new.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_new.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_new.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_new.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_new_dark.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_new_dark.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_new_dark.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_new_dark.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_not_important.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_not_important.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_not_important.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_not_important.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_pause_over_video.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_pause_over_video.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_play_over_video.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_play_over_video.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_remove.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_remove.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_remove.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_remove.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_reveal.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_reveal.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_reveal.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_reveal.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_time.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_time.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_time.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_time.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_action_volume_on.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_volume_on.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_action_volume_on.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_action_volume_on.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_btn_search.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_btn_search.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_btn_search.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_btn_search.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_error.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_error.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_error.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_error.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_good.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_good.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_good.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_good.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_launcher.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_launcher.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/ic_warning.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_warning.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/ic_warning.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/ic_warning.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/recordpressed.png b/ring-android/app/src/main/res/drawable-xxhdpi/recordpressed.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/recordpressed.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/recordpressed.png
Binary files differ
diff --git a/ring-android/res/drawable-xxhdpi/red_lock.png b/ring-android/app/src/main/res/drawable-xxhdpi/red_lock.png
similarity index 100%
rename from ring-android/res/drawable-xxhdpi/red_lock.png
rename to ring-android/app/src/main/res/drawable-xxhdpi/red_lock.png
Binary files differ
diff --git a/ring-android/res/drawable/background_tabs.xml b/ring-android/app/src/main/res/drawable/background_tabs.xml
similarity index 100%
rename from ring-android/res/drawable/background_tabs.xml
rename to ring-android/app/src/main/res/drawable/background_tabs.xml
diff --git a/ring-android/res/drawable/bg_108.png b/ring-android/app/src/main/res/drawable/bg_108.png
similarity index 100%
rename from ring-android/res/drawable/bg_108.png
rename to ring-android/app/src/main/res/drawable/bg_108.png
Binary files differ
diff --git a/ring-android/res/drawable/bg_144.png b/ring-android/app/src/main/res/drawable/bg_144.png
similarity index 100%
rename from ring-android/res/drawable/bg_144.png
rename to ring-android/app/src/main/res/drawable/bg_144.png
Binary files differ
diff --git a/ring-android/res/drawable/bg_72.png b/ring-android/app/src/main/res/drawable/bg_72.png
similarity index 100%
rename from ring-android/res/drawable/bg_72.png
rename to ring-android/app/src/main/res/drawable/bg_72.png
Binary files differ
diff --git a/ring-android/res/drawable/bubble_left_selector.xml b/ring-android/app/src/main/res/drawable/bubble_left_selector.xml
similarity index 100%
rename from ring-android/res/drawable/bubble_left_selector.xml
rename to ring-android/app/src/main/res/drawable/bubble_left_selector.xml
diff --git a/ring-android/res/drawable/bubble_right_selector.xml b/ring-android/app/src/main/res/drawable/bubble_right_selector.xml
similarity index 100%
rename from ring-android/res/drawable/bubble_right_selector.xml
rename to ring-android/app/src/main/res/drawable/bubble_right_selector.xml
diff --git a/ring-android/res/drawable/call_button.xml b/ring-android/app/src/main/res/drawable/call_button.xml
similarity index 100%
rename from ring-android/res/drawable/call_button.xml
rename to ring-android/app/src/main/res/drawable/call_button.xml
diff --git a/ring-android/res/drawable/defaultshadowtop.xml b/ring-android/app/src/main/res/drawable/defaultshadowtop.xml
similarity index 100%
rename from ring-android/res/drawable/defaultshadowtop.xml
rename to ring-android/app/src/main/res/drawable/defaultshadowtop.xml
diff --git a/ring-android/res/drawable/dialer_selector.xml b/ring-android/app/src/main/res/drawable/dialer_selector.xml
similarity index 100%
rename from ring-android/res/drawable/dialer_selector.xml
rename to ring-android/app/src/main/res/drawable/dialer_selector.xml
diff --git a/ring-android/res/drawable/divider.xml b/ring-android/app/src/main/res/drawable/divider.xml
similarity index 100%
rename from ring-android/res/drawable/divider.xml
rename to ring-android/app/src/main/res/drawable/divider.xml
diff --git a/ring-android/res/drawable/drawer_disc_handle.xml b/ring-android/app/src/main/res/drawable/drawer_disc_handle.xml
similarity index 100%
rename from ring-android/res/drawable/drawer_disc_handle.xml
rename to ring-android/app/src/main/res/drawable/drawer_disc_handle.xml
diff --git a/ring-android/res/drawable/hangup_button.xml b/ring-android/app/src/main/res/drawable/hangup_button.xml
similarity index 100%
rename from ring-android/res/drawable/hangup_button.xml
rename to ring-android/app/src/main/res/drawable/hangup_button.xml
diff --git a/ring-android/res/drawable/hold_button.xml b/ring-android/app/src/main/res/drawable/hold_button.xml
similarity index 100%
rename from ring-android/res/drawable/hold_button.xml
rename to ring-android/app/src/main/res/drawable/hold_button.xml
diff --git a/ring-android/res/drawable/ic_contact_picture.png b/ring-android/app/src/main/res/drawable/ic_contact_picture.png
similarity index 100%
rename from ring-android/res/drawable/ic_contact_picture.png
rename to ring-android/app/src/main/res/drawable/ic_contact_picture.png
Binary files differ
diff --git a/ring-android/res/drawable/item_contact_selector.xml b/ring-android/app/src/main/res/drawable/item_contact_selector.xml
similarity index 100%
rename from ring-android/res/drawable/item_contact_selector.xml
rename to ring-android/app/src/main/res/drawable/item_contact_selector.xml
diff --git a/ring-android/res/drawable/item_generic_selector.xml b/ring-android/app/src/main/res/drawable/item_generic_selector.xml
similarity index 100%
rename from ring-android/res/drawable/item_generic_selector.xml
rename to ring-android/app/src/main/res/drawable/item_generic_selector.xml
diff --git a/ring-android/res/drawable/item_history_selector.xml b/ring-android/app/src/main/res/drawable/item_history_selector.xml
similarity index 100%
rename from ring-android/res/drawable/item_history_selector.xml
rename to ring-android/app/src/main/res/drawable/item_history_selector.xml
diff --git a/ring-android/res/drawable/item_keyboard_choice_selector.xml b/ring-android/app/src/main/res/drawable/item_keyboard_choice_selector.xml
similarity index 100%
rename from ring-android/res/drawable/item_keyboard_choice_selector.xml
rename to ring-android/app/src/main/res/drawable/item_keyboard_choice_selector.xml
diff --git a/ring-android/res/drawable/logo_sfl_coul_rgb.png b/ring-android/app/src/main/res/drawable/logo_sfl_coul_rgb.png
similarity index 100%
rename from ring-android/res/drawable/logo_sfl_coul_rgb.png
rename to ring-android/app/src/main/res/drawable/logo_sfl_coul_rgb.png
Binary files differ
diff --git a/ring-android/res/drawable/navigation_selector.xml b/ring-android/app/src/main/res/drawable/navigation_selector.xml
similarity index 100%
rename from ring-android/res/drawable/navigation_selector.xml
rename to ring-android/app/src/main/res/drawable/navigation_selector.xml
diff --git a/ring-android/res/drawable/toggle_speaker_selector.xml b/ring-android/app/src/main/res/drawable/toggle_speaker_selector.xml
similarity index 100%
rename from ring-android/res/drawable/toggle_speaker_selector.xml
rename to ring-android/app/src/main/res/drawable/toggle_speaker_selector.xml
diff --git a/ring-android/res/layout/activity_account_settings.xml b/ring-android/app/src/main/res/layout/activity_account_settings.xml
similarity index 79%
rename from ring-android/res/layout/activity_account_settings.xml
rename to ring-android/app/src/main/res/layout/activity_account_settings.xml
index 63faced..13d726a 100644
--- a/ring-android/res/layout/activity_account_settings.xml
+++ b/ring-android/app/src/main/res/layout/activity_account_settings.xml
@@ -1,18 +1,20 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/cx.ring"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
- <cx.ring.views.PagerSlidingTabStrip
+ <com.astuetz.PagerSlidingTabStrip
android:id="@+id/pager_sliding_strip"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:layout_alignParentTop="true"
android:background="@color/sfl_blue_0"
android:textColor="@color/white"
- app:indicatorColor="@color/sfl_light_blue"
- app:underlineColor="@color/sfl_light_blue" />
+ app:pstsIndicatorColor="@color/sfl_light_blue"
+ app:pstsUnderlineColor="@color/sfl_light_blue"
+ />
+ <!---->
<android.support.v4.view.ViewPager
android:id="@+id/pager"
diff --git a/ring-android/res/layout/activity_call_layout.xml b/ring-android/app/src/main/res/layout/activity_call_layout.xml
similarity index 100%
rename from ring-android/res/layout/activity_call_layout.xml
rename to ring-android/app/src/main/res/layout/activity_call_layout.xml
diff --git a/ring-android/res/layout/activity_holder.xml b/ring-android/app/src/main/res/layout/activity_holder.xml
similarity index 100%
rename from ring-android/res/layout/activity_holder.xml
rename to ring-android/app/src/main/res/layout/activity_holder.xml
diff --git a/ring-android/res/layout/activity_home.xml b/ring-android/app/src/main/res/layout/activity_home.xml
similarity index 100%
rename from ring-android/res/layout/activity_home.xml
rename to ring-android/app/src/main/res/layout/activity_home.xml
diff --git a/ring-android/res/layout/activity_mgmt_accounts.xml b/ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml
similarity index 100%
rename from ring-android/res/layout/activity_mgmt_accounts.xml
rename to ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml
diff --git a/ring-android/res/layout/activity_wizard.xml b/ring-android/app/src/main/res/layout/activity_wizard.xml
similarity index 100%
rename from ring-android/res/layout/activity_wizard.xml
rename to ring-android/app/src/main/res/layout/activity_wizard.xml
diff --git a/ring-android/res/layout/clearable_edit_text.xml b/ring-android/app/src/main/res/layout/clearable_edit_text.xml
similarity index 100%
rename from ring-android/res/layout/clearable_edit_text.xml
rename to ring-android/app/src/main/res/layout/clearable_edit_text.xml
diff --git a/ring-android/res/layout/credentials_pref.xml b/ring-android/app/src/main/res/layout/credentials_pref.xml
similarity index 100%
rename from ring-android/res/layout/credentials_pref.xml
rename to ring-android/app/src/main/res/layout/credentials_pref.xml
diff --git a/ring-android/res/layout/dialog_conference.xml b/ring-android/app/src/main/res/layout/dialog_conference.xml
similarity index 100%
rename from ring-android/res/layout/dialog_conference.xml
rename to ring-android/app/src/main/res/layout/dialog_conference.xml
diff --git a/ring-android/res/layout/dialog_transfer.xml b/ring-android/app/src/main/res/layout/dialog_transfer.xml
similarity index 100%
rename from ring-android/res/layout/dialog_transfer.xml
rename to ring-android/app/src/main/res/layout/dialog_transfer.xml
diff --git a/ring-android/res/layout/frag_about.xml b/ring-android/app/src/main/res/layout/frag_about.xml
similarity index 100%
rename from ring-android/res/layout/frag_about.xml
rename to ring-android/app/src/main/res/layout/frag_about.xml
diff --git a/ring-android/res/layout/frag_account_creation.xml b/ring-android/app/src/main/res/layout/frag_account_creation.xml
similarity index 100%
rename from ring-android/res/layout/frag_account_creation.xml
rename to ring-android/app/src/main/res/layout/frag_account_creation.xml
diff --git a/ring-android/res/layout/frag_accounts_list.xml b/ring-android/app/src/main/res/layout/frag_accounts_list.xml
similarity index 100%
rename from ring-android/res/layout/frag_accounts_list.xml
rename to ring-android/app/src/main/res/layout/frag_accounts_list.xml
diff --git a/ring-android/res/layout/frag_audio_mgmt.xml b/ring-android/app/src/main/res/layout/frag_audio_mgmt.xml
similarity index 100%
rename from ring-android/res/layout/frag_audio_mgmt.xml
rename to ring-android/app/src/main/res/layout/frag_audio_mgmt.xml
diff --git a/ring-android/res/layout/frag_call.xml b/ring-android/app/src/main/res/layout/frag_call.xml
similarity index 100%
rename from ring-android/res/layout/frag_call.xml
rename to ring-android/app/src/main/res/layout/frag_call.xml
diff --git a/ring-android/res/layout/frag_call_list.xml b/ring-android/app/src/main/res/layout/frag_call_list.xml
similarity index 100%
rename from ring-android/res/layout/frag_call_list.xml
rename to ring-android/app/src/main/res/layout/frag_call_list.xml
diff --git a/ring-android/res/layout/frag_contact_list.xml b/ring-android/app/src/main/res/layout/frag_contact_list.xml
similarity index 100%
rename from ring-android/res/layout/frag_contact_list.xml
rename to ring-android/app/src/main/res/layout/frag_contact_list.xml
diff --git a/ring-android/res/layout/frag_contact_list_header.xml b/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
similarity index 100%
rename from ring-android/res/layout/frag_contact_list_header.xml
rename to ring-android/app/src/main/res/layout/frag_contact_list_header.xml
diff --git a/ring-android/res/layout/frag_dialing.xml b/ring-android/app/src/main/res/layout/frag_dialing.xml
similarity index 100%
rename from ring-android/res/layout/frag_dialing.xml
rename to ring-android/app/src/main/res/layout/frag_dialing.xml
diff --git a/ring-android/res/layout/frag_gestures.xml b/ring-android/app/src/main/res/layout/frag_gestures.xml
similarity index 100%
rename from ring-android/res/layout/frag_gestures.xml
rename to ring-android/app/src/main/res/layout/frag_gestures.xml
diff --git a/ring-android/res/layout/frag_history.xml b/ring-android/app/src/main/res/layout/frag_history.xml
similarity index 100%
rename from ring-android/res/layout/frag_history.xml
rename to ring-android/app/src/main/res/layout/frag_history.xml
diff --git a/ring-android/res/layout/frag_history_detail.xml b/ring-android/app/src/main/res/layout/frag_history_detail.xml
similarity index 100%
rename from ring-android/res/layout/frag_history_detail.xml
rename to ring-android/app/src/main/res/layout/frag_history_detail.xml
diff --git a/ring-android/res/layout/frag_home.xml b/ring-android/app/src/main/res/layout/frag_home.xml
similarity index 77%
rename from ring-android/res/layout/frag_home.xml
rename to ring-android/app/src/main/res/layout/frag_home.xml
index c666266..c3ddd10 100644
--- a/ring-android/res/layout/frag_home.xml
+++ b/ring-android/app/src/main/res/layout/frag_home.xml
@@ -1,5 +1,5 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/cx.ring"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
@@ -10,15 +10,16 @@
android:layout_alignParentTop="true"
android:background="@color/sfl_dark_blue" />
- <cx.ring.views.PagerSlidingTabStrip
+ <com.astuetz.PagerSlidingTabStrip
android:id="@+id/pts_main"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:layout_alignParentTop="true"
android:background="@color/sfl_blue_0"
- app:indicatorColor="@color/sfl_light_blue"
- app:shouldExpand="true"
- app:underlineColor="@color/sfl_light_blue" />
+ app:pstsIndicatorColor="@color/sfl_light_blue"
+ app:pstsShouldExpand="true"
+ app:pstsUnderlineColor="@color/sfl_light_blue"
+ />
<android.support.v4.view.ViewPager
android:id="@+id/pager"
diff --git a/ring-android/res/layout/frag_imessaging.xml b/ring-android/app/src/main/res/layout/frag_imessaging.xml
similarity index 100%
rename from ring-android/res/layout/frag_imessaging.xml
rename to ring-android/app/src/main/res/layout/frag_imessaging.xml
diff --git a/ring-android/res/layout/frag_menu.xml b/ring-android/app/src/main/res/layout/frag_menu.xml
similarity index 100%
rename from ring-android/res/layout/frag_menu.xml
rename to ring-android/app/src/main/res/layout/frag_menu.xml
diff --git a/ring-android/res/layout/header.xml b/ring-android/app/src/main/res/layout/header.xml
similarity index 100%
rename from ring-android/res/layout/header.xml
rename to ring-android/app/src/main/res/layout/header.xml
diff --git a/ring-android/res/layout/item_account.xml b/ring-android/app/src/main/res/layout/item_account.xml
similarity index 100%
rename from ring-android/res/layout/item_account.xml
rename to ring-android/app/src/main/res/layout/item_account.xml
diff --git a/ring-android/res/layout/item_account_pref.xml b/ring-android/app/src/main/res/layout/item_account_pref.xml
similarity index 100%
rename from ring-android/res/layout/item_account_pref.xml
rename to ring-android/app/src/main/res/layout/item_account_pref.xml
diff --git a/ring-android/res/layout/item_calllist.xml b/ring-android/app/src/main/res/layout/item_calllist.xml
similarity index 100%
rename from ring-android/res/layout/item_calllist.xml
rename to ring-android/app/src/main/res/layout/item_calllist.xml
diff --git a/ring-android/res/layout/item_codec.xml b/ring-android/app/src/main/res/layout/item_codec.xml
similarity index 100%
rename from ring-android/res/layout/item_codec.xml
rename to ring-android/app/src/main/res/layout/item_codec.xml
diff --git a/ring-android/res/layout/item_contact.xml b/ring-android/app/src/main/res/layout/item_contact.xml
similarity index 100%
rename from ring-android/res/layout/item_contact.xml
rename to ring-android/app/src/main/res/layout/item_contact.xml
diff --git a/ring-android/res/layout/item_contact_starred.xml b/ring-android/app/src/main/res/layout/item_contact_starred.xml
similarity index 100%
rename from ring-android/res/layout/item_contact_starred.xml
rename to ring-android/app/src/main/res/layout/item_contact_starred.xml
diff --git a/ring-android/res/layout/item_history.xml b/ring-android/app/src/main/res/layout/item_history.xml
similarity index 100%
rename from ring-android/res/layout/item_history.xml
rename to ring-android/app/src/main/res/layout/item_history.xml
diff --git a/ring-android/res/layout/item_history_call.xml b/ring-android/app/src/main/res/layout/item_history_call.xml
similarity index 100%
rename from ring-android/res/layout/item_history_call.xml
rename to ring-android/app/src/main/res/layout/item_history_call.xml
diff --git a/ring-android/res/layout/item_menu.xml b/ring-android/app/src/main/res/layout/item_menu.xml
similarity index 100%
rename from ring-android/res/layout/item_menu.xml
rename to ring-android/app/src/main/res/layout/item_menu.xml
diff --git a/ring-android/res/layout/item_menu_header.xml b/ring-android/app/src/main/res/layout/item_menu_header.xml
similarity index 100%
rename from ring-android/res/layout/item_menu_header.xml
rename to ring-android/app/src/main/res/layout/item_menu_header.xml
diff --git a/ring-android/res/layout/item_message.xml b/ring-android/app/src/main/res/layout/item_message.xml
similarity index 100%
rename from ring-android/res/layout/item_message.xml
rename to ring-android/app/src/main/res/layout/item_message.xml
diff --git a/ring-android/app/src/main/res/layout/menuheader.xml b/ring-android/app/src/main/res/layout/menuheader.xml
new file mode 100644
index 0000000..3509b84
--- /dev/null
+++ b/ring-android/app/src/main/res/layout/menuheader.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/ring-android/res/layout/number_picker_dialog.xml b/ring-android/app/src/main/res/layout/number_picker_dialog.xml
similarity index 100%
rename from ring-android/res/layout/number_picker_dialog.xml
rename to ring-android/app/src/main/res/layout/number_picker_dialog.xml
diff --git a/ring-android/res/layout/password_edittext.xml b/ring-android/app/src/main/res/layout/password_edittext.xml
similarity index 100%
rename from ring-android/res/layout/password_edittext.xml
rename to ring-android/app/src/main/res/layout/password_edittext.xml
diff --git a/ring-android/res/layout/quad_number_picker_dialog.xml b/ring-android/app/src/main/res/layout/quad_number_picker_dialog.xml
similarity index 100%
rename from ring-android/res/layout/quad_number_picker_dialog.xml
rename to ring-android/app/src/main/res/layout/quad_number_picker_dialog.xml
diff --git a/ring-android/res/menu/ac_call.xml b/ring-android/app/src/main/res/menu/ac_call.xml
similarity index 100%
rename from ring-android/res/menu/ac_call.xml
rename to ring-android/app/src/main/res/menu/ac_call.xml
diff --git a/ring-android/res/menu/account_creation.xml b/ring-android/app/src/main/res/menu/account_creation.xml
similarity index 100%
rename from ring-android/res/menu/account_creation.xml
rename to ring-android/app/src/main/res/menu/account_creation.xml
diff --git a/ring-android/res/menu/account_edition.xml b/ring-android/app/src/main/res/menu/account_edition.xml
similarity index 100%
rename from ring-android/res/menu/account_edition.xml
rename to ring-android/app/src/main/res/menu/account_edition.xml
diff --git a/ring-android/res/menu/activity_holder.xml b/ring-android/app/src/main/res/menu/activity_holder.xml
similarity index 100%
rename from ring-android/res/menu/activity_holder.xml
rename to ring-android/app/src/main/res/menu/activity_holder.xml
diff --git a/ring-android/res/menu/contact_list_menu.xml b/ring-android/app/src/main/res/menu/contact_list_menu.xml
similarity index 100%
rename from ring-android/res/menu/contact_list_menu.xml
rename to ring-android/app/src/main/res/menu/contact_list_menu.xml
diff --git a/ring-android/res/menu/history.xml b/ring-android/app/src/main/res/menu/history.xml
similarity index 100%
rename from ring-android/res/menu/history.xml
rename to ring-android/app/src/main/res/menu/history.xml
diff --git a/ring-android/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
similarity index 100%
rename from ring-android/res/values-fr/strings.xml
rename to ring-android/app/src/main/res/values-fr/strings.xml
diff --git a/ring-android/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
similarity index 100%
rename from ring-android/res/values-fr/strings_account.xml
rename to ring-android/app/src/main/res/values-fr/strings_account.xml
diff --git a/ring-android/res/values-fr/strings_content_description.xml b/ring-android/app/src/main/res/values-fr/strings_content_description.xml
similarity index 100%
rename from ring-android/res/values-fr/strings_content_description.xml
rename to ring-android/app/src/main/res/values-fr/strings_content_description.xml
diff --git a/ring-android/res/values-sw600dp-xhdpi/dimens.xml b/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml
similarity index 100%
rename from ring-android/res/values-sw600dp-xhdpi/dimens.xml
rename to ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml
diff --git a/ring-android/app/src/main/res/values-v21/styles.xml b/ring-android/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..00080de
--- /dev/null
+++ b/ring-android/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,38 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="AppThemeWithOverlay" parent="android:Theme.Material.Light.DarkActionBar">
+ <item name="android:actionBarStyle">@style/MyActionBar</item>
+ <item name="android:actionMenuTextAppearance">@style/MyActionBar.MenuTextStyle</item>
+ <item name="android:windowActionBarOverlay">true</item>
+ <item name="android:windowBackground">@drawable/bg_72</item>
+ <item name="android:activatedBackgroundIndicator">@drawable/navigation_selector</item>
+ </style>
+
+ <style name="AccountFormContainer">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:padding">16dp</item>
+ </style>
+
+ <style name="AppThemeWithoutOverlay" parent="android:Theme.Material.Light.DarkActionBar">
+ <item name="android:actionBarStyle">@style/MyActionBar</item>
+ <item name="android:actionMenuTextAppearance">@style/MyActionBar.MenuTextStyle</item>
+ <item name="android:windowActionBarOverlay">false</item>
+ </style>
+
+ <style name="MyActionBar" parent="@android:style/Widget.ActionBar">
+ <item name="android:background">@color/sfl_dark_blue</item>
+ <item name="android:titleTextStyle">@style/MyActionBar.Text</item>
+ </style>
+
+ <style name="MyActionBar.Text" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
+ <item name="android:textColor">@color/white</item>
+ <item name="android:textSize">18sp</item>
+ </style>
+
+ <style name="MyActionBar.MenuTextStyle" parent="android:style/TextAppearance.Material.Widget.ActionBar.Menu">
+ <item name="android:textColor">#FF0</item>
+ <item name="android:textSize">20sp</item>
+ </style>
+
+</resources>
\ No newline at end of file
diff --git a/ring-android/res/values/arrays.xml b/ring-android/app/src/main/res/values/arrays.xml
similarity index 100%
rename from ring-android/res/values/arrays.xml
rename to ring-android/app/src/main/res/values/arrays.xml
diff --git a/ring-android/res/values/attrs.xml b/ring-android/app/src/main/res/values/attrs.xml
similarity index 84%
rename from ring-android/res/values/attrs.xml
rename to ring-android/app/src/main/res/values/attrs.xml
index 58665ce..506bbbc 100644
--- a/ring-android/res/values/attrs.xml
+++ b/ring-android/app/src/main/res/values/attrs.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <declare-styleable name="PagerSlidingTabStrip">
- <attr name="indicatorColor" format="color" />
- <attr name="underlineColor" format="color" />
- <attr name="dividerColor" format="color" />
- <attr name="indicatorHeight" format="dimension" />
- <attr name="underlineHeight" format="dimension" />
- <attr name="dividerPadding" format="dimension" />
- <attr name="tabPaddingLeftRight" format="dimension" />
- <attr name="scrollOffset" format="dimension" />
- <attr name="tabBackground" format="reference" />
- <attr name="shouldExpand" format="boolean" />
- <attr name="textAllCaps" format="boolean" />
- </declare-styleable>
+ <!-- <declare-styleable name="PagerSlidingTabStrip">
+ <attr name="indicatorColor" format="color" />
+ <attr name="underlineColor" format="color" />
+ <attr name="shouldExpand" format="boolean" />
+ <attr name="dividerColor" format="color" />
+ <attr name="indicatorHeight" format="dimension" />
+ <attr name="underlineHeight" format="dimension" />
+ <attr name="dividerPadding" format="dimension" />
+ <attr name="tabPaddingLeftRight" format="dimension" />
+ <attr name="scrollOffset" format="dimension" />
+ <attr name="tabBackground" format="reference" />
+ <attr name="textAllCaps" format="boolean" />
+ </declare-styleable>-->
<declare-styleable name="StickyListHeadersListView">
<!-- Android attributes -->
diff --git a/ring-android/res/values/colors.xml b/ring-android/app/src/main/res/values/colors.xml
similarity index 100%
rename from ring-android/res/values/colors.xml
rename to ring-android/app/src/main/res/values/colors.xml
diff --git a/ring-android/res/values/dimens.xml b/ring-android/app/src/main/res/values/dimens.xml
similarity index 100%
rename from ring-android/res/values/dimens.xml
rename to ring-android/app/src/main/res/values/dimens.xml
diff --git a/ring-android/res/values/ids.xml b/ring-android/app/src/main/res/values/ids.xml
similarity index 100%
rename from ring-android/res/values/ids.xml
rename to ring-android/app/src/main/res/values/ids.xml
diff --git a/ring-android/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
similarity index 100%
rename from ring-android/res/values/strings.xml
rename to ring-android/app/src/main/res/values/strings.xml
diff --git a/ring-android/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml
similarity index 100%
rename from ring-android/res/values/strings_account.xml
rename to ring-android/app/src/main/res/values/strings_account.xml
diff --git a/ring-android/res/values/strings_content_description.xml b/ring-android/app/src/main/res/values/strings_content_description.xml
similarity index 100%
rename from ring-android/res/values/strings_content_description.xml
rename to ring-android/app/src/main/res/values/strings_content_description.xml
diff --git a/ring-android/res/values/styles.xml b/ring-android/app/src/main/res/values/styles.xml
similarity index 100%
rename from ring-android/res/values/styles.xml
rename to ring-android/app/src/main/res/values/styles.xml
diff --git a/ring-android/res/xml/account_advanced_prefs.xml b/ring-android/app/src/main/res/xml/account_advanced_prefs.xml
similarity index 100%
rename from ring-android/res/xml/account_advanced_prefs.xml
rename to ring-android/app/src/main/res/xml/account_advanced_prefs.xml
diff --git a/ring-android/res/xml/account_audio_prefs.xml b/ring-android/app/src/main/res/xml/account_audio_prefs.xml
similarity index 100%
rename from ring-android/res/xml/account_audio_prefs.xml
rename to ring-android/app/src/main/res/xml/account_audio_prefs.xml
diff --git a/ring-android/res/xml/account_credentials.xml b/ring-android/app/src/main/res/xml/account_credentials.xml
similarity index 100%
rename from ring-android/res/xml/account_credentials.xml
rename to ring-android/app/src/main/res/xml/account_credentials.xml
diff --git a/ring-android/res/xml/account_general_prefs.xml b/ring-android/app/src/main/res/xml/account_general_prefs.xml
similarity index 100%
rename from ring-android/res/xml/account_general_prefs.xml
rename to ring-android/app/src/main/res/xml/account_general_prefs.xml
diff --git a/ring-android/res/xml/account_sdes.xml b/ring-android/app/src/main/res/xml/account_sdes.xml
similarity index 100%
rename from ring-android/res/xml/account_sdes.xml
rename to ring-android/app/src/main/res/xml/account_sdes.xml
diff --git a/ring-android/res/xml/account_security_prefs.xml b/ring-android/app/src/main/res/xml/account_security_prefs.xml
similarity index 100%
rename from ring-android/res/xml/account_security_prefs.xml
rename to ring-android/app/src/main/res/xml/account_security_prefs.xml
diff --git a/ring-android/res/xml/account_tls.xml b/ring-android/app/src/main/res/xml/account_tls.xml
similarity index 100%
rename from ring-android/res/xml/account_tls.xml
rename to ring-android/app/src/main/res/xml/account_tls.xml
diff --git a/ring-android/res/xml/account_zrtp.xml b/ring-android/app/src/main/res/xml/account_zrtp.xml
similarity index 100%
rename from ring-android/res/xml/account_zrtp.xml
rename to ring-android/app/src/main/res/xml/account_zrtp.xml
diff --git a/ring-android/build.gradle b/ring-android/build.gradle
new file mode 100644
index 0000000..8c299f5
--- /dev/null
+++ b/ring-android/build.gradle
@@ -0,0 +1,20 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.2.3'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+allprojects {
+ repositories {
+ mavenCentral()
+ }
+}
+
+dependencies {
+}
\ No newline at end of file
diff --git a/ring-android/libs/android-support-v13.jar b/ring-android/libs/android-support-v13.jar
deleted file mode 100644
index 68da3a8..0000000
--- a/ring-android/libs/android-support-v13.jar
+++ /dev/null
Binary files differ
diff --git a/ring-android/libs/ormlite-android-4.48.jar b/ring-android/libs/ormlite-android-4.48.jar
deleted file mode 100644
index 75c2af4..0000000
--- a/ring-android/libs/ormlite-android-4.48.jar
+++ /dev/null
Binary files differ
diff --git a/ring-android/libs/ormlite-core-4.48.jar b/ring-android/libs/ormlite-core-4.48.jar
deleted file mode 100644
index e3e1337..0000000
--- a/ring-android/libs/ormlite-core-4.48.jar
+++ /dev/null
Binary files differ
diff --git a/ring-android/libs/robotium-solo-5.0.1.jar b/ring-android/libs/robotium-solo-5.0.1.jar
deleted file mode 100644
index 88b45a4..0000000
--- a/ring-android/libs/robotium-solo-5.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/ring-android/make-swig.sh b/ring-android/make-swig.sh
index f92d5ae..7afd694 100755
--- a/ring-android/make-swig.sh
+++ b/ring-android/make-swig.sh
@@ -37,9 +37,9 @@
# ringserviceJNI.java
# ManagerImpl.java
-SRCDIR=jni
+SRCDIR=app/src/main/jni
PACKAGE=cx.ring.service
-PACKAGEDIR=src/cx/ring/service
+PACKAGEDIR=app/src/main/java/cx/ring/service
ROOT=`pwd`
echo "in $ROOT"
diff --git a/ring-android/ring-android.iml b/ring-android/ring-android.iml
index 32f50c7..aa770af 100644
--- a/ring-android/ring-android.iml
+++ b/ring-android/ring-android.iml
@@ -1,19 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module external.linked.project.id="ring-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
- <facet type="android" name="Android">
- <configuration />
+ <facet type="java-gradle" name="Java-Gradle">
+ <configuration>
+ <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+ <option name="BUILDABLE" value="false" />
+ </configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
+ <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+ <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
- <orderEntry type="inheritedJdk" />
+ <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="libs" level="project" />
</component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/ring-android/settings.gradle b/ring-android/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/ring-android/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/ring-android/src/cx/ring/views/PagerSlidingTabStrip.java b/ring-android/src/cx/ring/views/PagerSlidingTabStrip.java
deleted file mode 100644
index ff363c5..0000000
--- a/ring-android/src/cx/ring/views/PagerSlidingTabStrip.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
- * Copyright (C) 2013 Andreas Stuetz <andreas.stuetz@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cx.ring.views;
-
-import java.util.Locale;
-
-import cx.ring.R;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.widget.HorizontalScrollView;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-public class PagerSlidingTabStrip extends HorizontalScrollView {
-
- public interface IconTabProvider {
- public int getPageIconResId(int position);
- }
-
- // @formatter:off
- private static final int[] ATTRS = new int[] { android.R.attr.textSize, android.R.attr.textColor };
- // @formatter:on
-
- private LinearLayout.LayoutParams defaultTabLayoutParams;
- private LinearLayout.LayoutParams expandedTabLayoutParams;
-
- private final PageListener pageListener = new PageListener();
- public OnPageChangeListener delegatePageListener;
-
- private LinearLayout tabsContainer;
- private ViewPager pager;
-
- private int tabCount;
-
- private int currentPosition = 0;
- private float currentPositionOffset = 0f;
-
- private Paint rectPaint;
- private Paint dividerPaint;
-
- private boolean checkedTabWidths = false;
-
- private int indicatorColor = 0xFF666666;
- private int underlineColor = 0x1A000000;
- private int dividerColor = 0x1A000000;
-
- private boolean shouldExpand = false;
- private boolean textAllCaps = true;
-
- private int scrollOffset = 52;
- private int indicatorHeight = 8;
- private int underlineHeight = 2;
- private int dividerPadding = 12;
- private int tabPadding = 24;
- private int dividerWidth = 1;
-
- private int tabTextSize = 12;
- private int tabTextColor = 0xFF666666;
- private Typeface tabTypeface = null;
- private int tabTypefaceStyle = Typeface.BOLD;
-
- private int lastScrollX = 0;
-
- private int tabBackgroundResId = R.drawable.background_tabs;
-
- private Locale locale;
-
- public PagerSlidingTabStrip(Context context) {
- this(context, null);
- }
-
- public PagerSlidingTabStrip(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public PagerSlidingTabStrip(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- setFillViewport(true);
- setWillNotDraw(false);
-
- tabsContainer = new LinearLayout(context);
- tabsContainer.setOrientation(LinearLayout.HORIZONTAL);
- tabsContainer.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
- addView(tabsContainer);
-
- DisplayMetrics dm = getResources().getDisplayMetrics();
-
- scrollOffset = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, scrollOffset, dm);
- indicatorHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, indicatorHeight, dm);
- underlineHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, underlineHeight, dm);
- dividerPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dividerPadding, dm);
- tabPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, tabPadding, dm);
- dividerWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dividerWidth, dm);
- tabTextSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, tabTextSize, dm);
-
- // get system attrs (android:textSize and android:textColor)
-
- TypedArray a = context.obtainStyledAttributes(attrs, ATTRS);
-
- tabTextSize = a.getDimensionPixelSize(0, tabTextSize);
- tabTextColor = a.getColor(1, tabTextColor);
-
- a.recycle();
-
- // get custom attrs
-
- a = context.obtainStyledAttributes(attrs, R.styleable.PagerSlidingTabStrip);
-
- indicatorColor = a.getColor(R.styleable.PagerSlidingTabStrip_indicatorColor, indicatorColor);
- underlineColor = a.getColor(R.styleable.PagerSlidingTabStrip_underlineColor, underlineColor);
- dividerColor = a.getColor(R.styleable.PagerSlidingTabStrip_dividerColor, dividerColor);
- indicatorHeight = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_indicatorHeight, indicatorHeight);
- underlineHeight = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_underlineHeight, underlineHeight);
- dividerPadding = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_dividerPadding, dividerPadding);
- tabPadding = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_tabPaddingLeftRight, tabPadding);
- tabBackgroundResId = a.getResourceId(R.styleable.PagerSlidingTabStrip_tabBackground, tabBackgroundResId);
- shouldExpand = a.getBoolean(R.styleable.PagerSlidingTabStrip_shouldExpand, shouldExpand);
- scrollOffset = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_scrollOffset, scrollOffset);
- textAllCaps = a.getBoolean(R.styleable.PagerSlidingTabStrip_textAllCaps, textAllCaps);
-
- a.recycle();
-
- rectPaint = new Paint();
- rectPaint.setAntiAlias(true);
- rectPaint.setStyle(Style.FILL);
-
- dividerPaint = new Paint();
- dividerPaint.setAntiAlias(true);
- dividerPaint.setStrokeWidth(dividerWidth);
-
- defaultTabLayoutParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
- expandedTabLayoutParams = new LinearLayout.LayoutParams(0, LayoutParams.MATCH_PARENT, 1.0f);
-
- if (locale == null) {
- locale = getResources().getConfiguration().locale;
- }
- }
-
- public void setViewPager(ViewPager pager) {
- this.pager = pager;
-
- if (pager.getAdapter() == null) {
- throw new IllegalStateException("ViewPager does not have adapter instance.");
- }
-
- pager.setOnPageChangeListener(pageListener);
-
- notifyDataSetChanged();
- }
-
- public void setOnPageChangeListener(OnPageChangeListener listener) {
- this.delegatePageListener = listener;
- }
-
- public void notifyDataSetChanged() {
-
- tabsContainer.removeAllViews();
-
- tabCount = pager.getAdapter().getCount();
-
- for (int i = 0; i < tabCount; i++) {
-
- if (pager.getAdapter() instanceof IconTabProvider) {
- addIconTab(i, ((IconTabProvider) pager.getAdapter()).getPageIconResId(i));
- } else {
- addTextTab(i, pager.getAdapter().getPageTitle(i).toString());
- }
-
- }
-
- updateTabStyles();
-
- checkedTabWidths = false;
-
- getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-
- @SuppressWarnings("deprecation")
- @SuppressLint("NewApi")
- @Override
- public void onGlobalLayout() {
-
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
- getViewTreeObserver().removeGlobalOnLayoutListener(this);
- } else {
- getViewTreeObserver().removeOnGlobalLayoutListener(this);
- }
-
- currentPosition = pager.getCurrentItem();
- scrollToChild(currentPosition, 0);
- }
- });
-
- }
-
- private void addTextTab(final int position, String title) {
-
- TextView tab = new TextView(getContext());
- tab.setText(title);
- tab.setFocusable(true);
- tab.setGravity(Gravity.CENTER);
- tab.setSingleLine();
-
- tab.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
-
- pager.setCurrentItem(position);
- }
- });
-
- tabsContainer.addView(tab);
-
- }
-
- private void addIconTab(final int position, int resId) {
-
- ImageButton tab = new ImageButton(getContext());
- tab.setFocusable(true);
- tab.setImageResource(resId);
-
- tab.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- pager.setCurrentItem(position);
- }
- });
-
- tabsContainer.addView(tab);
-
- }
-
- private void updateTabStyles() {
-
- for (int i = 0; i < tabCount; i++) {
-
- View v = tabsContainer.getChildAt(i);
-
- v.setLayoutParams(defaultTabLayoutParams);
- v.setBackgroundResource(tabBackgroundResId);
- if (shouldExpand) {
- v.setPadding(0, 0, 0, 0);
- } else {
- v.setPadding(tabPadding, 0, tabPadding, 0);
- }
-
- if (v instanceof TextView) {
-
- TextView tab = (TextView) v;
- tab.setTextSize(TypedValue.COMPLEX_UNIT_PX, tabTextSize);
- tab.setTypeface(tabTypeface, tabTypefaceStyle);
- tab.setTextColor(tabTextColor);
-
- // setAllCaps() is only available from API 14, so the upper case is made manually if we are on a
- // pre-ICS-build
- if (textAllCaps) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
- tab.setAllCaps(true);
- } else {
- tab.setText(tab.getText().toString().toUpperCase(locale));
- }
- }
- }
- }
-
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
- if (!shouldExpand || MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.UNSPECIFIED) {
- return;
- }
-
- int myWidth = getMeasuredWidth();
- int childWidth = 0;
- for (int i = 0; i < tabCount; i++) {
- childWidth += tabsContainer.getChildAt(i).getMeasuredWidth();
- }
-
- if (!checkedTabWidths && childWidth > 0 && myWidth > 0) {
-
- if (childWidth <= myWidth) {
- for (int i = 0; i < tabCount; i++) {
- tabsContainer.getChildAt(i).setLayoutParams(expandedTabLayoutParams);
- }
- }
-
- checkedTabWidths = true;
- }
- }
-
- private void scrollToChild(int position, int offset) {
-
- if (tabCount == 0) {
- return;
- }
-
- int newScrollX = tabsContainer.getChildAt(position).getLeft() + offset;
-
- if (position > 0 || offset > 0) {
- newScrollX -= scrollOffset;
- }
-
- if (newScrollX != lastScrollX) {
- lastScrollX = newScrollX;
- scrollTo(newScrollX, 0);
- }
-
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
-
- if (isInEditMode() || tabCount == 0) {
- return;
- }
-
- final int height = getHeight();
-
- // draw indicator line
-
- rectPaint.setColor(indicatorColor);
-
- // default: line below current tab
- View currentTab = tabsContainer.getChildAt(currentPosition);
- float lineLeft = currentTab.getLeft();
- float lineRight = currentTab.getRight();
-
- // if there is an offset, start interpolating left and right coordinates between current and next tab
- if (currentPositionOffset > 0f && currentPosition < tabCount - 1) {
-
- View nextTab = tabsContainer.getChildAt(currentPosition + 1);
- final float nextTabLeft = nextTab.getLeft();
- final float nextTabRight = nextTab.getRight();
-
- lineLeft = (currentPositionOffset * nextTabLeft + (1f - currentPositionOffset) * lineLeft);
- lineRight = (currentPositionOffset * nextTabRight + (1f - currentPositionOffset) * lineRight);
- }
-
- canvas.drawRect(lineLeft, height - indicatorHeight, lineRight, height, rectPaint);
-
- // draw underline
-
- rectPaint.setColor(underlineColor);
- canvas.drawRect(0, height - underlineHeight, tabsContainer.getWidth(), height, rectPaint);
-
- // draw divider
-
- dividerPaint.setColor(dividerColor);
- for (int i = 0; i < tabCount - 1; i++) {
- View tab = tabsContainer.getChildAt(i);
- canvas.drawLine(tab.getRight(), dividerPadding, tab.getRight(), height - dividerPadding, dividerPaint);
- }
- }
-
- private class PageListener implements OnPageChangeListener {
-
- @Override
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
- currentPosition = position;
- currentPositionOffset = positionOffset;
-
- scrollToChild(position, (int) (positionOffset * tabsContainer.getChildAt(position).getWidth()));
-
- invalidate();
-
- if (delegatePageListener != null) {
- delegatePageListener.onPageScrolled(position, positionOffset, positionOffsetPixels);
- }
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- if (state == ViewPager.SCROLL_STATE_IDLE) {
- scrollToChild(pager.getCurrentItem(), 0);
- }
-
- if (delegatePageListener != null) {
- delegatePageListener.onPageScrollStateChanged(state);
- }
- }
-
- @Override
- public void onPageSelected(int position) {
- if (delegatePageListener != null) {
- delegatePageListener.onPageSelected(position);
- }
- }
-
- }
-
- public void setIndicatorColor(int indicatorColor) {
- this.indicatorColor = indicatorColor;
- invalidate();
- }
-
- public void setIndicatorColorResource(int resId) {
- this.indicatorColor = getResources().getColor(resId);
- invalidate();
- }
-
- public int getIndicatorColor() {
- return this.indicatorColor;
- }
-
- public void setIndicatorHeight(int indicatorLineHeightPx) {
- this.indicatorHeight = indicatorLineHeightPx;
- invalidate();
- }
-
- public int getIndicatorHeight() {
- return indicatorHeight;
- }
-
- public void setUnderlineColor(int underlineColor) {
- this.underlineColor = underlineColor;
- invalidate();
- }
-
- public void setUnderlineColorResource(int resId) {
- this.underlineColor = getResources().getColor(resId);
- invalidate();
- }
-
- public int getUnderlineColor() {
- return underlineColor;
- }
-
- public void setDividerColor(int dividerColor) {
- this.dividerColor = dividerColor;
- invalidate();
- }
-
- public void setDividerColorResource(int resId) {
- this.dividerColor = getResources().getColor(resId);
- invalidate();
- }
-
- public int getDividerColor() {
- return dividerColor;
- }
-
- public void setUnderlineHeight(int underlineHeightPx) {
- this.underlineHeight = underlineHeightPx;
- invalidate();
- }
-
- public int getUnderlineHeight() {
- return underlineHeight;
- }
-
- public void setDividerPadding(int dividerPaddingPx) {
- this.dividerPadding = dividerPaddingPx;
- invalidate();
- }
-
- public int getDividerPadding() {
- return dividerPadding;
- }
-
- public void setScrollOffset(int scrollOffsetPx) {
- this.scrollOffset = scrollOffsetPx;
- invalidate();
- }
-
- public int getScrollOffset() {
- return scrollOffset;
- }
-
- public void setShouldExpand(boolean shouldExpand) {
- this.shouldExpand = shouldExpand;
- requestLayout();
- }
-
- public boolean getShouldExpand() {
- return shouldExpand;
- }
-
- public boolean isTextAllCaps() {
- return textAllCaps;
- }
-
- public void setAllCaps(boolean textAllCaps) {
- this.textAllCaps = textAllCaps;
- }
-
- public void setTextSize(int textSizePx) {
- this.tabTextSize = textSizePx;
- updateTabStyles();
- }
-
- public int getTextSize() {
- return tabTextSize;
- }
-
- public void setTextColor(int textColor) {
- this.tabTextColor = textColor;
- updateTabStyles();
- }
-
- public void setTextColorResource(int resId) {
- this.tabTextColor = getResources().getColor(resId);
- updateTabStyles();
- }
-
- public int getTextColor() {
- return tabTextColor;
- }
-
- public void setTypeface(Typeface typeface, int style) {
- this.tabTypeface = typeface;
- this.tabTypefaceStyle = style;
- updateTabStyles();
- }
-
- public void setTabBackground(int resId) {
- this.tabBackgroundResId = resId;
- }
-
- public int getTabBackground() {
- return tabBackgroundResId;
- }
-
- public void setTabPaddingLeftRight(int paddingPx) {
- this.tabPadding = paddingPx;
- updateTabStyles();
- }
-
- public int getTabPaddingLeftRight() {
- return tabPadding;
- }
-
- @Override
- public void onRestoreInstanceState(Parcelable state) {
- SavedState savedState = (SavedState) state;
- super.onRestoreInstanceState(savedState.getSuperState());
- currentPosition = savedState.currentPosition;
- requestLayout();
- }
-
- @Override
- public Parcelable onSaveInstanceState() {
- Parcelable superState = super.onSaveInstanceState();
- SavedState savedState = new SavedState(superState);
- savedState.currentPosition = currentPosition;
- return savedState;
- }
-
- static class SavedState extends BaseSavedState {
- int currentPosition;
-
- public SavedState(Parcelable superState) {
- super(superState);
- }
-
- private SavedState(Parcel in) {
- super(in);
- currentPosition = in.readInt();
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- super.writeToParcel(dest, flags);
- dest.writeInt(currentPosition);
- }
-
- public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in) {
- return new SavedState(in);
- }
-
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- };
- }
-
-}
diff --git a/ring-android/Tests/AndroidManifest.xml b/ring-android/tests/AndroidManifest.xml
similarity index 100%
rename from ring-android/Tests/AndroidManifest.xml
rename to ring-android/tests/AndroidManifest.xml
diff --git a/ring-android/Tests/build.xml b/ring-android/tests/build.xml
similarity index 100%
rename from ring-android/Tests/build.xml
rename to ring-android/tests/build.xml
diff --git a/ring-android/Tests/src/cx/ring/client/HomeActivityTest.java b/ring-android/tests/java/cx/ring/client/HomeActivityTest.java
similarity index 100%
rename from ring-android/Tests/src/cx/ring/client/HomeActivityTest.java
rename to ring-android/tests/java/cx/ring/client/HomeActivityTest.java
diff --git a/ring-android/Tests/proguard-project.txt b/ring-android/tests/proguard-project.txt
similarity index 100%
rename from ring-android/Tests/proguard-project.txt
rename to ring-android/tests/proguard-project.txt
diff --git a/ring-android/Tests/project.properties b/ring-android/tests/project.properties
similarity index 100%
rename from ring-android/Tests/project.properties
rename to ring-android/tests/project.properties
