Merge branch 'update_currentwidget' into 'master'

CurrentWidget: Update to 0.4a (46)

Build, installation and short functionality tested.

patch removes the dependency to play services

See merge request !625

metadata/com.manor.currentwidget.txt

@@ -72,6 +72,23 @@ Build:0.39a,39
     disable=Proprietary dependencies just so you can 'rate' the widget!?
     commit=290
 
+Build:0.4a,46
+    commit=310
+    subdir=CurrentWidget
+    target=android-19
+    extlibs=android/android-support-v4.jar
+    srclibs=AChartEngine@r534,DashClock@d043bbca9ca7,Color-Picker-2@61a1f01e404b
+    rm=CurrentWidgetLibrary/libs/*,CurrentWidgetLibrary/src/com/manor/currentwidget/library/PlusOnePreference.java
+    prebuild=mv libs/android-support-v4.jar ../CurrentWidgetLibrary/libs/ && \
+        printf "android.library=true\ntarget=19\nandroid.library.reference.1=$$Color-Picker-2$$" > ../CurrentWidgetLibrary/project.properties && \
+	cp -R $$DashClock$$/api/src/main/java/* ../CurrentWidgetLibrary/src/ && \
+	cp -R $$DashClock$$/api/src/main/aidl/* ../CurrentWidgetLibrary/src/ && \
+	mkdir -p src/
+    update=.,../CurrentWidgetLibrary
+    patch=rm_one_plus.patch
+    build=pushd $$AChartEngine$$ && $$MVN3$$ package && popd && \
+        cp $$AChartEngine$$/target/achartengine-1.1.0.jar ../CurrentWidgetLibrary/libs
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:0.4a

metadata/com.manor.currentwidget/rm_one_plus.patch

@@ -0,0 +1,39 @@
+diff --git a/CurrentWidgetLibrary/res/xml/prefs.xml b/CurrentWidgetLibrary/res/xml/prefs.xml
+index fb7bb6a..6036b47 100644
+--- a/CurrentWidgetLibrary/res/xml/prefs.xml
++++ b/CurrentWidgetLibrary/res/xml/prefs.xml
+@@ -220,12 +220,6 @@
+         </PreferenceScreen>
+     </PreferenceCategory>
+     <PreferenceCategory android:title="About" >
+-        <com.manor.currentwidget.library.PlusOnePreference
+-            android:key="rate"
+-            android:selectable="true"
+-            android:title="Rate CurrentWidget"
+-            android:widgetLayout="@layout/plusone_pref" />
+-
+         <Preference
+             android:key="moreApps"
+             android:summary="Browse for more applications"
+@@ -304,4 +298,4 @@
+         </PreferenceScreen>
+     </PreferenceCategory>
+ 
+-</PreferenceScreen>
+\ No newline at end of file
++</PreferenceScreen>
+diff --git a/CurrentWidgetLibrary/src/com/manor/currentwidget/library/CurrentWidgetConfigure.java b/CurrentWidgetLibrary/src/com/manor/currentwidget/library/CurrentWidgetConfigure.java
+index da0c85f..897ed60 100644
+--- a/CurrentWidgetLibrary/src/com/manor/currentwidget/library/CurrentWidgetConfigure.java
++++ b/CurrentWidgetLibrary/src/com/manor/currentwidget/library/CurrentWidgetConfigure.java
+@@ -92,10 +92,6 @@ public class CurrentWidgetConfigure extends PreferenceActivity implements
+ 		super.onResume();
+ 		getPreferenceScreen().getSharedPreferences()
+ 				.registerOnSharedPreferenceChangeListener(this);
+-		PlusOnePreference p = ((PlusOnePreference)findPreference("rate"));
+-		if (p != null) {
+-			p.Initialize();
+-		}
+ 	}
+ 
+ 	@SuppressWarnings("deprecation")