Skip to content

Commit 3fa0943

Browse files
author
davidgraeff
committed
Add tab for overview of all outlets
Require at least Android 2.3.2; Renamed DeviceControl in DeviceControlActivity. Added new DeviceControl class that extends a linear layout by Switches for each outlet of all configured devices (works the same as the inner mechanisms of DeviceControlActivity).
1 parent 40d04bc commit 3fa0943

11 files changed

+405
-191
lines changed

.classpath

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="gen"/>
53
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
6-
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
4+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
75
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
6+
<classpathentry kind="src" path="src"/>
7+
<classpathentry kind="src" path="gen"/>
8+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
89
<classpathentry kind="output" path="bin/classes"/>
910
</classpath>

.settings/org.eclipse.jdt.core.prefs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.compliance=1.6
4+
org.eclipse.jdt.core.compiler.source=1.6

AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
android:versionCode="1"
55
android:versionName="1.0" >
66

7-
<uses-sdk android:minSdkVersion="7"
7+
<uses-sdk android:minSdkVersion="8"
88
android:targetSdkVersion="17" />
99

1010
<uses-permission android:name="android.permission.INTERNET"/>
@@ -40,7 +40,7 @@
4040
</activity>
4141

4242
<activity
43-
android:name=".DeviceControl"
43+
android:name=".DeviceControlActivity"
4444
android:configChanges="keyboardHidden|orientation|screenSize"
4545
android:theme="@style/Theme.CustomLightTheme">
4646
</activity>

project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-14
14+
target=android-16

res/layout/main.xml

+16-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,22 @@
2424
android:id="@android:id/tabcontent"
2525
android:layout_width="fill_parent"
2626
android:layout_height="fill_parent">
27-
27+
28+
<ScrollView
29+
android:id="@+id/lvAllOutlets"
30+
android:layout_width="fill_parent"
31+
android:layout_height="fill_parent"
32+
android:layout_marginLeft="10dp"
33+
android:layout_marginRight="10dp" >
34+
35+
<LinearLayout
36+
android:id="@+id/llAllOutlets"
37+
android:layout_width="fill_parent"
38+
android:layout_height="wrap_content"
39+
android:orientation="vertical" >
40+
</LinearLayout>
41+
</ScrollView>
42+
2843
<ListView
2944
android:id="@+id/lvConfiguredDevices"
3045
android:layout_width="fill_parent"

res/values-de/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,5 @@
6969
<string name="outlet_delete">Löschen</string>
7070

7171
<string name="choose_widget_device">Bitte wählen Sie ein Gerät für dieses Widget</string>
72+
<string name="all_outlets">Steckdosen</string>
7273
</resources>

res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,5 @@
7171
<string name="outlet_delete">Delete</string>
7272

7373
<string name="choose_widget_device">Please choose a device for this widget</string>
74+
<string name="all_outlets">Outlets</string>
7475
</resources>

0 commit comments

Comments
 (0)