Commit 49a460e8 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge branch '2-check-in-android-studio-project' into 'master' 

Resolve "Check in Android Studio Project"

Closes #2

See merge request ec327_projects/group7project!6
parents c7a4a96e 6d9bd0fe

EmptyProject/.gitignore

0 → 100644
+15 −0
Original line number Diff line number Diff line 
*.iml

.gradle

/local.properties

/.idea/caches

/.idea/libraries

/.idea/modules.xml

/.idea/workspace.xml

/.idea/navEditor.xml

/.idea/assetWizardSettings.xml

.DS_Store

/build

/captures

.externalNativeBuild

.cxx

local.properties

EmptyProject/.idea/.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# Default ignored files

/shelf/

/workspace.xml

EmptyProject/.idea/gradle.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="GradleSettings">

    <option name="linkedExternalProjectsSettings">

      <GradleProjectSettings>

        <option name="testRunner" value="GRADLE" />

        <option name="distributionType" value="DEFAULT_WRAPPED" />

        <option name="externalProjectPath" value="$PROJECT_DIR$" />

        <option name="modules">

          <set>

            <option value="$PROJECT_DIR$" />

            <option value="$PROJECT_DIR$/app" />

          </set>

        </option>

      </GradleProjectSettings>

    </option>

  </component>

</project>
 
 No newline at end of file

EmptyProject/.idea/misc.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="ExternalStorageConfigurationManager" enabled="true" />

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/build/classes" />

  </component>

  <component name="ProjectType">

    <option name="id" value="Android" />

  </component>

</project>
 
 No newline at end of file

EmptyProject/app/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/build
 
 No newline at end of file