Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

intellij reformat. delete unused layout file

  • Loading branch information...
commit 22375d41fcd01931a154100dc38d4473d2fded4c 1 parent 62c7708
@jonasb authored
Showing with 29 additions and 42 deletions.
  1. +8 −8 AndroidManifest.xml
  2. +21 −21 build.xml
  3. +0 −13 res/layout/main.xml
View
16 AndroidManifest.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="se.forskningsavd"
- android:versionCode="1"
- android:versionName="1.0">
- <uses-permission android:name="android.permission.INTERNET" />
- <application android:label="@string/app_name" >
+ package="se.forskningsavd"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <application android:label="@string/app_name">
<activity android:name="MainActivity"
- android:label="@string/app_name">
+ android:label="@string/app_name">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
View
42 build.xml
@@ -4,7 +4,7 @@
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
- <property file="local.properties" />
+ <property file="local.properties"/>
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
@@ -26,7 +26,7 @@
application and should be checked into Version Control Systems.
-->
- <property file="ant.properties" />
+ <property file="ant.properties"/>
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
@@ -37,29 +37,29 @@
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
- <loadproperties srcFile="project.properties" />
+ <loadproperties srcFile="project.properties"/>
<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
unless="sdk.dir"
- />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
- in between standard targets -->
-<!--
- <target name="-pre-build">
- </target>
- <target name="-pre-compile">
- </target>
-
- /* This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir} */
- <target name="-post-compile">
- </target>
--->
+ />
+
+
+ <!-- extension targets. Uncomment the ones where you want to do custom work
+in between standard targets -->
+ <!--
+ <target name="-pre-build">
+ </target>
+ <target name="-pre-compile">
+ </target>
+
+ /* This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir} */
+ <target name="-post-compile">
+ </target>
+ -->
<!-- Import the actual build file.
@@ -80,6 +80,6 @@
in order to avoid having your file be overridden by tools such as "android update project"
-->
<!-- version-tag: 1 -->
- <import file="${sdk.dir}/tools/ant/build.xml" />
+ <import file="${sdk.dir}/tools/ant/build.xml"/>
</project>
View
13 res/layout/main.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
-<TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Hello World, MainActivity"
- />
-</LinearLayout>
-
Please sign in to comment.
Something went wrong with that request. Please try again.