Skip to content

Commit 05a5f2d

Browse files
Merge pull request hongyangAndroid#45 from xiaolongyuan/master
去除本地配置文件,因为每个人的配置都不同,方便协作开发; 补全FrameLayout、LinearLayout、RelativeLayout构造参数
2 parents 1a0de97 + 543d70c commit 05a5f2d

File tree

18 files changed

+68
-566
lines changed

18 files changed

+68
-566
lines changed

.gitignore

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,38 @@
1-
.gradle
2-
/local.properties
3-
/.idea/workspace.xml
4-
/.idea/libraries
5-
.DS_Store
6-
/build
1+
72
/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

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

AutoLayout.iml

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/app.iml

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)