Skip to content

Commit 8517efd

Browse files
vogellavogella
committed
updates
1 parent 385eb58 commit 8517efd

File tree

25 files changed

+123
-126
lines changed

25 files changed

+123
-126
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ bin
22
gen
33
build
44
.metadata
5-
classes
5+
classes
6+
External Plug-in Libraries/
7+

‎.gitignore~‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
bin
2+
gen
3+
build
4+
.metadata
5+
classes

‎de.vogella.android.temperature/.settings/org.eclipse.jdt.core.prefs‎

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

‎de.vogella.android.temperature/AndroidManifest.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
32
package="de.vogella.android.temperature"
43
android:versionCode="1"
54
android:versionName="1.0" >
65

7-
<uses-sdk android:minSdkVersion="14" />
6+
<uses-sdk
7+
android:minSdkVersion="14"
8+
android:targetSdkVersion="15" />
89

910
<application
1011
android:icon="@drawable/ic_launcher"
11-
android:label="@string/app_name" >
12+
android:label="@string/app_name"
13+
android:theme="@style/AppTheme" >
1214
<activity
13-
android:label="@string/app_name"
14-
android:name=".ConvertActivity" >
15-
<intent-filter >
15+
android:name=".MainActivity"
16+
android:label="@string/title_activity_main" >
17+
<intent-filter>
1618
<action android:name="android.intent.action.MAIN" />
1719

1820
<category android:name="android.intent.category.LAUNCHER" />

‎de.vogella.android.temperature/ic_launcher-web.png‎

36.2 KB
Loading

‎de.vogella.android.temperature/libs/android-support-v4.jar‎

341 KB
Binary file not shown.

‎de.vogella.android.temperature/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+
#}

‎de.vogella.android.temperature/proguard.cfg‎

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

‎de.vogella.android.temperature/project.properties‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
#
44
# This file must be checked in Version Control Systems.
55
#
6-
# To customize properties used by the Ant build system use,
6+
# To customize properties used by the Ant build system edit
77
# "ant.properties", and override values to adapt the script to your
88
# 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
912

1013
# Project target.
11-
target=android-15
14+
target=android-16

‎de.vogella.android.temperature/res/drawable-hdpi/ic_action_search.png‎

3.05 KB
Loading

0 commit comments

Comments
 (0)