Add format settings to the project

Change-Id: Id45e05582426ecf29d73a4b4ee60d8858cd30c2c
google · Oct 21, 2016 · 9e0e845 · 9e0e845
1 parent d0b508a
commit 9e0e845
Show file tree

Hide file tree

Showing 18 changed files with 414 additions and 76 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,10 @@
 *.iml
 .gradle
 /local.properties
-.idea
 .DS_Store
 /build
 /captures
+
+.idea/
+!.idea/copyright/*.xml
+!.idea/codeStyleSettings.xml
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/copyright/Apache_License_2_0.xml b/.idea/copyright/Apache_License_2_0.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
@@ -14,7 +14,9 @@
 <manifest package="com.google.android.cameraview.demo"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/>
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="18"/>
 
     <application
         android:allowBackup="true"