Skip to content

Commit d494392

Browse files
committed
updates
1 parent c011ea6 commit d494392

File tree

20 files changed

+204
-8
lines changed

20 files changed

+204
-8
lines changed

com.vogella.android.view.compoundview/res/values/attrs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<declare-styleable name="Options">
3+
<declare-styleable name="ColorOptionsView">
44
<attr name="titleText" format="string" localization="suggested" />
55
<attr name="valueColor" format="color" />
66
</declare-styleable>

com.vogella.android.view.compoundview/src/com/vogella/android/view/compoundview/ColorOptionsView.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public ColorOptionsView(Context context, AttributeSet attrs) {
1919
super(context, attrs);
2020

2121
TypedArray a = context.obtainStyledAttributes(attrs,
22-
R.styleable.Options, 0, 0);
23-
String titleText = a.getString(R.styleable.Options_titleText);
24-
int valueColor = a.getColor(R.styleable.Options_valueColor,
22+
R.styleable.ColorOptionsView, 0, 0);
23+
String titleText = a.getString(R.styleable.ColorOptionsView_titleText);
24+
int valueColor = a.getColor(R.styleable.ColorOptionsView_valueColor,
2525
android.R.color.holo_blue_light);
2626
a.recycle();
2727

de.vogella.android.handler/src/de/vogella/android/handler/ProgressTestActivity.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ public void onCreate(Bundle savedInstanceState) {
1919
setContentView(R.layout.main);
2020
progress = (ProgressBar) findViewById(R.id.progressBar1);
2121
text = (TextView) findViewById(R.id.textView1);
22-
// Reuse existing hander from Activity
23-
// Avoid the creation of a new object via new Handler();
24-
handler = getWindow().getDecorView().getHandler();
2522

2623
}
2724

@@ -37,7 +34,7 @@ public void run() {
3734
} catch (InterruptedException e) {
3835
e.printStackTrace();
3936
}
40-
handler.post(new Runnable() {
37+
progress.post(new Runnable() {
4138
@Override
4239
public void run() {
4340
text.setText("Updating");

de.vogella.styles/.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>

de.vogella.styles/.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>de.vogella.styles</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>
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="de.vogella.styles"
4+
android:versionCode="1"
5+
android:versionName="1.0" >
6+
7+
<uses-sdk android:minSdkVersion="7"
8+
android:targetSdkVersion="11" />
9+
10+
<application
11+
android:allowBackup="true"
12+
android:icon="@drawable/ic_launcher"
13+
android:label="@string/app_name" >
14+
15+
<activity
16+
android:name="de.vogella.styles.WallpaperActivity"
17+
android:label="@string/wallpaper"
18+
android:theme="@style/WallpaperTheme"
19+
>
20+
<intent-filter>
21+
<action android:name="android.intent.action.MAIN" />
22+
<category android:name="android.intent.category.LAUNCHER" />
23+
</intent-filter>
24+
</activity>
25+
26+
<activity
27+
android:name="de.vogella.styles.DialogActivity"
28+
android:label="@string/dialog"
29+
android:theme="@android:style/Theme.Dialog"
30+
>
31+
<intent-filter>
32+
<action android:name="android.intent.action.MAIN" />
33+
<category android:name="android.intent.category.LAUNCHER" />
34+
</intent-filter>
35+
</activity>
36+
37+
</application>
38+
39+
</manifest>
54.4 KB
Loading
377 KB
Binary file not shown.
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+
#}
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

0 commit comments

Comments
 (0)