Commit 05a5f2d

committed

Merge pull request hongyangAndroid#45 from xiaolongyuan/master

去除本地配置文件,因为每个人的配置都不同,方便协作开发; 补全FrameLayout、LinearLayout、RelativeLayout构造参数

2 parents 1a0de97 + 543d70c commit 05a5f2dCopy full SHA for 05a5f2d

18 files changed

Lines changed: 68 additions & 566 deletions

File tree

Lines changed: 37 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,38 @@`
`1`		`-.gradle`
`2`		`-/local.properties`
`3`		`-/.idea/workspace.xml`
`4`		`-/.idea/libraries`
`5`		`-.DS_Store`
`6`		`-/build`
	`1`	`+`
`7`	`2`	`/captures`
	`3`	`+`
	`4`	`+# Built application files`
	`5`	`+*.apk`
	`6`	`+*.ap_`
	`7`	`+`
	`8`	`+# Generated files`
	`9`	`+bin/`
	`10`	`+gen/`
	`11`	`+`
	`12`	`+# Gradle files`
	`13`	`+.gradle/`
	`14`	`+/build`
	`15`	`+/*/build/`
	`16`	`+`
	`17`	`+# Local configuration file (sdk path, etc)`
	`18`	`+local.properties`
	`19`	`+`
	`20`	`+# Proguard folder generated by Eclipse`
	`21`	`+proguard/`
	`22`	`+`
	`23`	`+# Log Files`
	`24`	`+*.log`
	`25`	`+`
	`26`	`+# Eclipse project files`
	`27`	`+.classpath`
	`28`	`+.project`
	`29`	`+.settings/`
	`30`	`+`
	`31`	`+# Intellij project files`
	`32`	`+*.iml`
	`33`	`+*.ipr`
	`34`	`+*.iws`
	`35`	`+.idea/`
	`36`	`+`
	`37`	`+# System files`
	`38`	`+.DS_Store`