Skip to content

Commit 8485d1b

Browse files
authored
Merge pull request #4 from deton/merge341
Merge AndroidSKK 3.4.1
2 parents ef4824b + 2ea4062 commit 8485d1b

62 files changed

Lines changed: 1575 additions & 1414 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,41 @@
1+
*.apk
2+
*.ap_
3+
*.dex
4+
*.class
5+
bin/
6+
gen/
7+
out/
8+
19
*.iml
210
.gradle
3-
/local.properties
4-
/.idea/workspace.xml
5-
/.idea/libraries
6-
/.idea/misc.xml
7-
/.idea/caches
8-
/.idea/codeStyles
11+
!/gradle/wrapper/gradle-wrapper.jar
12+
13+
local.properties
14+
.idea/workspace.xml
15+
.idea/libraries
16+
.idea/.name
17+
.idea/compiler.xml
18+
.idea/copyright/profiles_settings.xml
19+
.idea/encodings.xml
20+
.idea/misc.xml
21+
.idea/modules.xml
22+
.idea/scopes/scope_settings.xml
23+
.idea/dictionaries
24+
.idea/vcs.xml
25+
.idea/jsLibraryMappings.xml
26+
.idea/datasources.xml
27+
.idea/dataSources.ids
28+
.idea/sqlDataSources.xml
29+
.idea/dynamic.xml
30+
.idea/uiDesigner.xml
31+
.idea/caches
32+
.idea/codeStyles
33+
.idea/assetWizardSettings.xml
34+
35+
.DS_Store
936
/build
1037
/captures
1138
/app/release/output.json
39+
.externalNativeBuild
1240

13-
/svg
41+
/svg

.idea/compiler.xml

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetDropDown.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

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

.project

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>AndroidSKK</name>
4+
<comment>Project AndroidSKK created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1

app/.classpath

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin/default"/>
6+
</classpath>

0 commit comments

Comments
 (0)