Merge "commons" into the project root directory

Author: whym

.gitignore

@@ -7,9 +7,9 @@
 # Gradle
 .gradle
 local.properties
-/commons/.gradle
-/commons/build
-/commons/app/build
+/.gradle
+/build
+/app/build
 
 # IDE / Text editor files
 .nb-gradle

README.md

@@ -1,7 +1,7 @@
-diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
+diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
 index 5ad1c77..50b16ff 100644
---- a/commons/AndroidManifest.xml
-+++ b/commons/AndroidManifest.xml
+--- a/app/src/main/AndroidManifest.xml
++++ b/app/src/main/AndroidManifest.xml
 @@ -82,14 +82,6 @@
              android:label="@string/title_activity_settings"
              />

commons/app/build.gradle app/build.gradle

@@ -2,11 +2,11 @@
 # Spot malformed string replacement patterns in Android localization files.
 # First install Lint from the Android SDK
 
-grep -R "%1$ s" commons/res/values*
-grep -R "%1$ d" commons/res/values*
-grep -R "%1" commons/res/values* | grep -v "%1\\$"
+grep -R "%1$ s" res/values*
+grep -R "%1$ d" res/values*
+grep -R "%1" res/values* | grep -v "%1\\$"
 
-grep -RH '%' commons/res/values* | 
+grep -RH '%' res/values* | 
  sed -e 's/%/\n%/g' | # Split lines that contain several expressions
  grep '%'           | # Filter out lines that do not contain expressions
  grep -v ' % '      | # Lone % character, not a variable
@@ -23,10 +23,10 @@ grep -RH '%' commons/res/values* |
  grep -v '%20'        # Ignore URL whitespace
 exit
 # Double-width percent sign
-grep -R '％' commons/res/values*
+grep -R '％' res/values*
 
 # Broken CDATA syntax
-grep -R "CDATA " commons/res/values*
+grep -R "CDATA " res/values*
 
 # Android SDK Lint (does not detect most syntax errors)
 lint --check StringFormatInvalid commons