add base code for settings

this provides the UI to allow a user to configure were
the logo should be drawn on the screen

6 files changed, 53 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f3a2f73..4b11b86 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,5 +20,10 @@
 				</intent-filter>
 				<meta-data android:name="android.service.wallpaper" android:resource="@xml/logo1" />
 		</service>
+		<activity
+			android:label="@string/logo1_settings"
+			android:name=".LogoSettings"
+			android:exported="true"
+		/>
 	</application>
 </manifest>
\ No newline at end of file
diff --git a/res/values/logo1_locations.xml b/res/values/logo1_locations.xml
new file mode 100644
index 0000000..19a0520
--- /dev/null
+++ b/res/values/logo1_locations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string-array name="logo1_locations">
+	    <item>Center</item>
+		<item>Top-Left</item>
+		<item>Top-Right</item>
+		<item>Bottom-Left</item>
+		<item>Bottom-Right</item>		
+	</string-array>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3f9aa8b..5fe6b68 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,4 +2,8 @@
 <resources>
 	<string name="app_name">Linaro Live Wallpaper</string>
 	<string name="wallpaper_logo1">Linaro Animated Logo</string>
+	
+	<string name="logo1_settings">Settings</string>
+	<string name="logo1_settings_title">Select location</string>
+	<string name="logo1_settings_summary">Choose where to display the logo</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/logo1.xml b/res/xml/logo1.xml
index 49eee72..4be0151 100644
--- a/res/xml/logo1.xml
+++ b/res/xml/logo1.xml
@@ -4,4 +4,5 @@
 
 <wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
 			android:thumbnail="@drawable/icon"
+			android:settingsActivity="org.linaro.wallpaper.LogoSettings"
 />
diff --git a/res/xml/logo1_settings.xml b/res/xml/logo1_settings.xml
new file mode 100644
index 0000000..b2abc1e
--- /dev/null
+++ b/res/xml/logo1_settings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+		android:title="@string/logo1_settings"
+		android:key="logo1_settings">
+
+	<ListPreference
+		android:key="location"
+		android:title="@string/logo1_settings_title"
+		android:summary="@string/logo1_settings_summary"
+		android:entries="@array/logo1_locations"
+		android:entryValues="@array/logo1_locations"
+	/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/org/linaro/wallpaper/LogoSettings.java b/src/org/linaro/wallpaper/LogoSettings.java
new file mode 100644
index 0000000..7a662af
--- /dev/null
+++ b/src/org/linaro/wallpaper/LogoSettings.java
@@ -0,0 +1,18 @@
+package org.linaro.wallpaper;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+
+public class LogoSettings extends PreferenceActivity {
+
+	public final static String PREFS_NAME = "logo1_settings";
+	public final static String KEY_NAME = "location";
+
+	@Override
+	protected void onCreate(Bundle icicle) {
+		super.onCreate(icicle);
+
+		getPreferenceManager().setSharedPreferencesName(PREFS_NAME);
+		addPreferencesFromResource(R.xml.logo1_settings);
+	}
+}