Skip to content

Commit 6f670a2

Browse files
vogellavogella
committed
Merge branch 'master' of github.com:vogella/vogella
Conflicts: HelloWorld/.classpath HelloWorld/.project HelloWorld/proguard-project.txt HelloWorld/project.properties aaa_test/.classpath aaa_test/.project aaa_test/AndroidManifest.xml aaa_test/ic_launcher-web.png aaa_test/libs/android-support-v4.jar aaa_test/proguard-project.txt aaa_test/project.properties aaa_test/res/drawable-hdpi/ic_launcher.png aaa_test/res/drawable-mdpi/ic_launcher.png aaa_test/res/drawable-xhdpi/ic_launcher.png aaa_test/res/drawable-xxhdpi/ic_launcher.png aaa_test/res/layout/activity_main.xml aaa_test/res/menu/main.xml aaa_test/res/values-sw600dp/dimens.xml aaa_test/res/values-sw720dp-land/dimens.xml aaa_test/res/values-v11/styles.xml aaa_test/res/values-v14/styles.xml aaa_test/res/values/dimens.xml aaa_test/res/values/strings.xml aaa_test/res/values/styles.xml com.vogella.android.actionbar.actionview.search/.classpath com.vogella.android.actionbar.actionview.search/libs/android-support-v4.jar com.vogella.android.actionbar.actionview.search/proguard-project.txt com.vogella.android.actionbar.actionview.search/res/layout/activity_main.xml com.vogella.android.actionbar.actionview.search/res/values-sw600dp/dimens.xml com.vogella.android.actionbar.actionview.search/res/values-sw720dp-land/dimens.xml com.vogella.android.actionbar.actionview.search/res/values-v11/styles.xml com.vogella.android.actionbar.actionview.search/res/values-v14/styles.xml com.vogella.android.actionbar.actionview.search/res/values/dimens.xml com.vogella.android.actionbar.actionview.search/res/values/styles.xml com.vogella.android.actionbarsherlock.usage/ic_launcher-web.png com.vogella.android.actionbarsherlock.usage/res/drawable-hdpi/ic_launcher.png com.vogella.android.actionbarsherlock.usage/res/drawable-mdpi/ic_launcher.png com.vogella.android.actionbarsherlock.usage/res/drawable-xhdpi/ic_launcher.png com.vogella.android.actionbarsherlock.usage/res/drawable-xxhdpi/ic_launcher.png com.vogella.android.actionbarsherlock.usage/res/menu/main.xml com.vogella.android.build.firstant/ic_launcher-web.png com.vogella.android.build.firstant/libs/android-support-v4.jar com.vogella.android.build.firstant/res/drawable-hdpi/ic_launcher.png com.vogella.android.build.firstant/res/drawable-mdpi/ic_launcher.png com.vogella.android.build.firstant/res/drawable-xhdpi/ic_launcher.png com.vogella.android.build.firstant/res/drawable-xxhdpi/ic_launcher.png com.vogella.android.build.firstant/res/layout/activity_main.xml com.vogella.android.build.firstant/res/menu/main.xml com.vogella.android.build.firstant/res/values-sw600dp/dimens.xml com.vogella.android.build.firstant/res/values-sw720dp-land/dimens.xml com.vogella.android.build.firstant/res/values-v11/styles.xml com.vogella.android.build.firstant/res/values-v14/styles.xml com.vogella.android.build.firstant/res/values/dimens.xml com.vogella.android.build.firstant/res/values/styles.xml com.vogella.android.build.firstgradle/res/values/strings.xml com.vogella.android.pulltorefresh/.project com.vogella.android.pulltorefresh/AndroidManifest.xml com.vogella.android.pulltorefresh/res/values/strings.xml com.vogella.android.test.simpleactivity/AndroidManifest.xml de.vogella.android.intentservice.download_draft/project.properties
2 parents e93c859 + 9dcd3b2 commit 6f670a2

File tree

224 files changed

+3489
-3
lines changed

Some content is hidden

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

224 files changed

+3489
-3
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
bin
22
gen
3-
build
3+
build/
44
.metadata
5+
.gradle
56
classes
67
External Plug-in Libraries/
78

‎HelloWorld/.classpath‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="src" path="gen"/>
5+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
6+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7+
<classpathentry kind="output" path="bin/classes"/>
8+
</classpath>

‎HelloWorld/.project‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>HelloWorld</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.jdt.core.javabuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
31+
<nature>org.eclipse.jdt.core.javanature</nature>
32+
</natures>
33+
</projectDescription>

‎HelloWorld/AndroidManifest.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="in.wptrafficanalyzer.helloworld"
3+
android:versionCode="1"
4+
android:versionName="1.0" >
5+
6+
<uses-sdk
7+
android:minSdkVersion="4"
8+
android:targetSdkVersion="15" />
9+
10+
<application
11+
android:icon="@drawable/ic_launcher"
12+
android:label="@string/app_name"
13+
android:theme="@style/AppTheme" >
14+
<activity
15+
android:name=".MainActivity"
16+
android:label="@string/title_activity_main" >
17+
<intent-filter>
18+
<action android:name="android.intent.action.MAIN" />
19+
<category android:name="android.intent.category.LAUNCHER" />
20+
</intent-filter>
21+
</activity>
22+
</application>
23+
24+
</manifest>

‎HelloWorld/ic_launcher-web.png‎

32.9 KB
Loading

‎HelloWorld/proguard-project.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# To enable ProGuard in your project, edit project.properties
2+
# to define the proguard.config property as described in that file.
3+
#
4+
# Add project specific ProGuard rules here.
5+
# By default, the flags in this file are appended to flags specified
6+
# in ${sdk.dir}/tools/proguard/proguard-android.txt
7+
# You can edit the include path and order by changing the ProGuard
8+
# include property in project.properties.
9+
#
10+
# For more details, see
11+
# http://developer.android.com/guide/developing/tools/proguard.html
12+
13+
# Add any project specific keep options here:
14+
15+
# If your project uses WebView with JS, uncomment the following
16+
# and specify the fully qualified class name to the JavaScript interface
17+
# class:
18+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
19+
# public *;
20+
#}

‎HelloWorld/project.properties‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This file is automatically generated by Android Tools.
2+
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
3+
#
4+
# This file must be checked in Version Control Systems.
5+
#
6+
# To customize properties used by the Ant build system edit
7+
# "ant.properties", and override values to adapt the script to your
8+
# project structure.
9+
#
10+
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
11+
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12+
13+
# Project target.
14+
target=android-17

‎HelloWorld/res/drawable-hdpi/ic_action_search.png‎

3.05 KB
Loading

‎HelloWorld/res/drawable-hdpi/ic_launcher.png‎

2.99 KB
Loading

‎HelloWorld/res/drawable-ldpi/ic_launcher.png‎

1.51 KB
Loading

0 commit comments

Comments
 (0)