Convert to google style.

opacapp · Feb 15, 2015 · f389e91 · f389e91
1 parent 0e91adf
commit f389e91
Show file tree

Hide file tree

Showing 403 changed files with 30,452 additions and 30,114 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -150,7 +150,7 @@
         <module name="StringLiteralEquality" />
         <module name="UnnecessaryParentheses" />
         <module name="LineLength">
-            <property name="max" value="120" />
+            <property name="max" value="100" />
         </module>
 
         <!-- Checks for class design. -->

diff --git a/integration/gifencoder/build.gradle b/integration/gifencoder/build.gradle
@@ -14,7 +14,7 @@ android {
 
     sourceSets {
         main {
-          java.srcDirs = ['src/main/java', '../../third_party/gif_encoder/src/main/java']
+            java.srcDirs = ['src/main/java', '../../third_party/gif_encoder/src/main/java']
         }
     }
 

diff --git a/integration/gifencoder/gifencoder.iml b/integration/gifencoder/gifencoder.iml
@@ -60,6 +60,7 @@
       <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/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

diff --git a/integration/gifencoder/lint.xml b/integration/gifencoder/lint.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <issue id="AllowBackup" severity="ignore" />
+    <issue id="AllowBackup" severity="ignore"/>
     <!-- See https://github.com/square/okio/issues/58 -->
-    <issue id="InvalidPackage" severity="ignore" >
-      <ignore regexp="okio-1.0.0.jar" />
+    <issue id="InvalidPackage" severity="ignore">
+        <ignore regexp="okio-1.0.0.jar"/>
     </issue>
 </lint>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ android { @@
         sourceSets {
             main {
-              java.srcDirs = ['src/main/java', '../../third_party/gif_encoder/src/main/java']
+                java.srcDirs = ['src/main/java', '../../third_party/gif_encoder/src/main/java']
             }
         }
@@ Expand Down @@