Yahoo weather provider fixed

.classpath

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="lib" path="libs/bugsense3.0.6.jar"/>
 	<classpathentry kind="src" path="lib-src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

.gitignore

@@ -1,7 +1,13 @@
 ###################
 # Compiled source #
 ###################
-bin
+bin/AndroidManifest.xml
+bin/classes
+bin/classes.dex
+bin/dexedLibs
+bin/res
+bin/resources.ap_
+bin/jarlist.cache
 gen
 assets/bugsense.txt
 assets/Thumbs.db

AndroidManifest.xml

@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.metawatch.communityedition"
-      android:versionCode="21"
-      android:installLocation="internalOnly" android:versionName="1.24.0.0">
+      android:versionCode="23"
+      android:installLocation="internalOnly" android:versionName="1.26.0.0">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19"/>
     <supports-screens android:resizeable="true" android:normalScreens="true" android:anyDensity="true" 
     	android:largeScreens="true" android:smallScreens="true"/>
 
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-	<uses-permission android:name="android.permission.ACCOUNT_MANAGER"/>
 	<uses-permission android:name="android.permission.BATTERY_STATS"/>
 	<uses-permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE"/>
 	<uses-permission android:name="android.permission.BLUETOOTH"/>
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
 	<uses-permission android:name="android.permission.CALL_PHONE"/>
-	<uses-permission android:name="android.permission.CALL_PRIVILEGED"/>
 	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 	<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-	<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
 	<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
 	<uses-permission android:name="android.permission.READ_CALENDAR"/>
 	<uses-permission android:name="android.permission.READ_CONTACTS"/>
@@ -34,7 +31,7 @@
 	<uses-permission android:name="android.permission.RECEIVE_MMS"/>
 	<uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
+		
 	<uses-permission android:name="com.fsck.k9.permission.READ_MESSAGES"/>
 
 	<uses-permission android:name="com.google.android.gm.permission.READ_GMAIL"/>
@@ -56,6 +53,12 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"></action>
+                <category android:name="android.intent.category.DEFAULT"></category>
+                <category android:name="android.intent.category.BROWSABLE"></category>
+                <data android:scheme="metawatch"></data>
+            </intent-filter>              
         </activity>
 		<activity
 			android:label="Send to Watch"
@@ -107,6 +110,7 @@
             	<action android:name="com.android.alarmclock.ALARM_ALERT" />
             	<action android:name="com.android.deskclock.ALARM_ALERT" />
             	<action android:name="com.android.music.metachanged" />
+            	<action android:name="com.android.music.playstatechanged" />
             	<action android:name="com.htc.android.worldclock.ALARM_ALERT" />
             	<action android:name="com.motorola.blur.alarmclock.ALARM_ALERT" />
             	<action android:name="com.motorola.blur.alarmclock.COUNT_DOWN" />
@@ -175,7 +179,8 @@
             	<action android:name="org.metawatch.manager.NOTIFICATION"/>	
             	<action android:name="org.metawatch.manager.VIBRATE"/>	
             	<action android:name="org.metawatch.manager.SILENTMODE"/>			            	
-            </intent-filter>            
+              <action android:name="org.metawatch.manager.START_SERVICE"/>                   
+            	</intent-filter>            
         </receiver> 
         <receiver android:name="org.metawatch.manager.AlarmReceiver"></receiver>
         <service android:name="org.metawatch.manager.MetaWatchService"></service>
@@ -186,7 +191,7 @@
 			</intent-filter>
 		</service>      
 		<activity android:name="org.metawatch.manager.MetaWatchStatus" 
-                  android:launchMode="standard">
+                  android:launchMode="standard">		
         </activity>  
         <activity android:name="org.metawatch.manager.Settings" 
         		  android:launchMode="standard">

lib-src/com/google/android/gm/contentprovider/GmailContract.java

@@ -118,13 +118,46 @@ public static final class Labels {
          * Label canonical names for default Gmail system labels.
          */
         public static final class LabelCanonicalNames {
+            /**
+             * <p>Canonical name for the Primary inbox category</p>
+             * <p><i>Note: This label may not exist, based on the user's inbox configuration</i></p>
+             */
+            public static final String CANONICAL_NAME_INBOX_CATEGORY_PRIMARY = "^sq_ig_i_personal";
+
+            /**
+             * Canonical name for the Social inbox category
+             * <p><i>Note: This label may not exist, based on the user's inbox configuration</i></p>
+             */
+            public static final String CANONICAL_NAME_INBOX_CATEGORY_SOCIAL = "^sq_ig_i_social";
+
+            /**
+             * Canonical name for the Promotions inbox category
+             * <p><i>Note: This label may not exist, based on the user's inbox configuration</i></p>
+             */
+            public static final String CANONICAL_NAME_INBOX_CATEGORY_PROMOTIONS = "^sq_ig_i_promo";
+
+            /**
+             * Canonical name for the Updates inbox category
+             * <p><i>Note: This label may not exist, based on the user's inbox configuration</i></p>
+             */
+            public static final String CANONICAL_NAME_INBOX_CATEGORY_UPDATES =
+                    "^sq_ig_i_notification";
+
+            /**
+             * Canonical name for the Forums inbox category
+             * <p><i>Note: This label may not exist, based on the user's inbox configuration</i></p>
+             */
+            public static final String CANONICAL_NAME_INBOX_CATEGORY_FORUMS = "^sq_ig_i_group";
+
             /**
              * Canonical name for the Inbox label
+             * <p><i>Note: This label may not exist, based on the user's inbox configuration</i></p>
              */
             public static final String CANONICAL_NAME_INBOX = "^i";
 
             /**
              * Canonical name for the Priority Inbox label
+             * <p><i>Note: This label may not exist, based on the user's inbox configuration</i></p>
              */
             public static final String CANONICAL_NAME_PRIORITY_INBOX = "^iim";
 

project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-17
+target=android-19

res/layout/settings.xml

@@ -491,7 +491,7 @@
 				/>
 
 		</PreferenceScreen>
-
+        	    
 		<PreferenceScreen
 		    android:title="@string/settings_calendar_widgets"
 		    >	    
@@ -523,6 +523,13 @@
 				android:summary="@string/settings_Display_location_in_small_calendar_widget_desc"
 				android:defaultValue="false"
 				/>
+      <EditTextPreference
+			  android:title="@string/settings_Location_regexp"
+        android:key="LocationRegexp"
+        android:summary="@string/settings_Location_regexp_desc"
+        android:inputType="text"
+        android:defaultValue="Room:\\s*([0-9]+)\\s*([a-zA-Z]*)-*([a-zA-Z]*)|^([0-9]+)\\s*([a-zA-Z]*)-*([a-zA-Z]*)\\s*$|\\s*\\S*\\s*\\S*\\s*(\\S*)"
+        />
 			<CheckBoxPreference
 				android:title="@string/settings_Event_date_in_calendar_widget"
 				android:key="EventDateInCalendarWidget"
@@ -531,7 +538,32 @@
 				/>
 		</PreferenceScreen>
 
-	</PreferenceScreen>
+    <PreferenceScreen
+      android:title="@string/settings_withings_widgets"
+      >
+
+      <EditTextPreference
+        android:title="@string/settings_Withings_API_key"
+        android:key="WithingsAPIKey"
+        android:summary="@string/settings_Withings_API_key_desc"
+        android:defaultValue=""
+        />
+      <EditTextPreference
+        android:title="@string/settings_Withings_API_secret"
+        android:key="WithingsAPISecret"
+        android:summary="@string/settings_Withings_API_secret_desc"
+        android:defaultValue=""
+        />
+      <CheckBoxPreference
+        android:title="@string/settings_Authenticate_withings_account"
+        android:key="WithingsAccountAuthenticated"
+        android:summary="@string/settings_Authenticate_withings_account_desc"
+        android:defaultValue="false"
+        />
+
+    </PreferenceScreen>
+
+  </PreferenceScreen>
 
 	<PreferenceScreen
 	    android:title="@string/settings_watch_apps"
@@ -567,6 +599,17 @@
 			android:defaultValue="false"
 			/>
 
+    <ListPreference 
+      android:entries="@array/settings_calendar_view_names" 
+      android:entryValues="@array/settings_calendar_view_values" 
+      android:dialogTitle="@string/settings_default_calendar_view" 
+      android:key="DefaultCalendarView" 
+      android:title="@string/settings_default_calendar_view" 
+      android:negativeButtonText="@string/settings_CancelButton" 
+      android:enabled="true" 
+      android:defaultValue="0"
+      />  
+
 		<PreferenceCategory
 		    android:title="@string/settings_active_apps"
 		    android:key="ActiveApps">

res/layout/test.xml

@@ -49,11 +49,19 @@
         <Preference android:key="discover_apps" android:title="Send App Discovery Message" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="Firmware Debugging">
+      <Preference android:key="rate_test" android:title="Rate Test"/>
+      <Preference android:key="random_idle_bitmap_rate_test" android:title="Random Idle Bitmap Rate Test"/>
+      <Preference android:key="enable_log" android:title="Enable Debug Log (Gen2 only)"/>
+      <Preference android:key="disable_log" android:title="Disable Debug Log (Gen2 only)"/>
+      <Preference android:key="read_log" android:title="Read Debug Log (Gen2 only)"/>
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="Misc">
 	    <Preference android:key="application_start" android:title="Application Start (LCD)"/>
     	<Preference android:key="application_update" android:title="Application Update (LCD)"/>
     	<Preference android:key="application_stop" android:title="Application Stop (LCD)"/>
-    	<Preference android:key="vibrate" android:title="Vibrate (LCD/OLED)"/>
+      <Preference android:key="vibrate" android:title="Vibrate (LCD/OLED)"/>
     	<Preference android:key="load_template" android:title="Load Template (Idle) (LCD)"/>
     	<Preference android:key="write_buffer" android:title="Write Buffer (Idle) (LCD)"/>
     	<Preference android:key="update_display" android:title="Update Display (Idle) (LCD)"/>    

res/values-de/strings.xml

@@ -66,10 +66,12 @@
 
     <string name="settings_Read_calendar_during_meeting">Aktualisiere Kalender auch währed eines laufenden Meetings</string>
     <string name="settings_Read_calendar_during_meeting_desc">Passe die Kalenderinformationen während eines Meetings an</string>
-    <string name="settings_Read_calendar_min_duration_to_meeting_end">Minimale Dauer zum Meetingende</string>
-    <string name="settings_Read_calendar_min_duration_to_meeting_end_desc">Minimale Dauer (in Minuten) zum Meetingende bevor Kalender gelesen wird.</string>
+    <string name="settings_Read_calendar_min_duration_to_meeting_end">Minimale Dauer zum Terminende</string>
+    <string name="settings_Read_calendar_min_duration_to_meeting_end_desc">Minimale Dauer (in Minuten) zum Terminende bevor Kalender gelesen wird.</string>
     <string name="settings_Display_location_in_small_calendar_widget">Zeige Ort im kleinen Kalenderwidget</string>
     <string name="settings_Display_location_in_small_calendar_widget_desc">Zeige Ort statt dem Datum im 24x32 Kalenderwidget, falls genug Platz vorhanden.</string>
+    <string name="settings_Location_regexp">Regulärer Ausdruck zum Extrahieren des Orts</string>
+    <string name="settings_Location_regexp_desc">Nutzt den regulären Ausdruck um die Ortsinformation in der Terminbeschreibung zu finden</string>
     <string name="settings_Event_date_in_calendar_widget">Datum im Kalenderwidget anzeigen</string>
     <string name="settings_Event_date_in_calendar_widget_desc">Zeigt das Datum (des Events) im *x32 Kalenderwidget an (statt des aktuellen Datums).</string>
 
@@ -83,6 +85,14 @@
     <string name="settings_Overlay_weather_text">Text darf das Wetterwidget überlappen</string>
     <string name="settings_Overlay_weather_text_desc">Text (Aktuelles Wetter und Ortsinformation) darf das Wetterwidget überlappen</string>
 
+    <string name="settings_withings_widgets">Withings Widget</string>
+    <string name="settings_Withings_API_key">Withings API Schlüssel</string>
+    <string name="settings_Withings_API_key_desc">Der zu benutzende Applikationsschlüssel beim Zugriff auf die "Body Metrics Service API".</string>
+    <string name="settings_Withings_API_secret">Withings API Geheimnis</string>
+    <string name="settings_Withings_API_secret_desc">Das zu benutzende Applikationsgeheimnis beim Zugriff auf die "Body Metrics Service API".</string>
+    <string name="settings_Authenticate_withings_account">Benutzer angemeldet</string>
+    <string name="settings_Authenticate_withings_account_desc">Fragt Withings um Erlaubnis, das "Body Metrics Service API" zu benutzen.</string>
+
     <string name="settings_phoneCalls">Anrufe</string>
 
     <string name="settings_call_actions">Aktionen während Anruf</string>
@@ -341,8 +351,8 @@
     <string name="settings_calendars_to_show">Calendars to show</string>
     <string name="settings_calendars_to_show_desc">Specify which calendars should be shown in the calendar widgets and app.</string>
     <string name="settings_calendar_all">All</string>
-    <string name="settings_calendar_lookahead">Calendar lookahead (hours))</string>
-    <string name="settings_calendar_lookahead_desc">How many hours ahead the calendar widgets should search</string>
+    <string name="settings_calendar_lookahead">Vorwärtssuche (Stunden)</string>
+    <string name="settings_calendar_lookahead_desc">Anzahl Stunden, die das Kalendar Widget in der Zukunft nach Terminen suchen soll</string>
 
   	<string-array name="settings_calendar_values"> 
 	<item>#ALL#</item>

res/values/strings.xml

@@ -70,6 +70,8 @@
     <string name="settings_Read_calendar_min_duration_to_meeting_end_desc">Duration in minutes to the end of an ongoing meeting before calendar read is allowed</string>
     <string name="settings_Display_location_in_small_calendar_widget">Display location in small calendar widget</string>
     <string name="settings_Display_location_in_small_calendar_widget_desc">Displays the location instead of the date in the 24x32 next calendar appointment widget if there is enough space</string>
+    <string name="settings_Location_regexp">Regular expression for extracting the location</string>
+    <string name="settings_Location_regexp_desc">Uses the regular expression to find the location information in the calendar location string</string>
     <string name="settings_Event_date_in_calendar_widget">Event date in calendar widget</string>
     <string name="settings_Event_date_in_calendar_widget_desc">Displays the event date instead of today\'s date in the *x32 calendar widgets (when showing an event)</string>
 
@@ -82,7 +84,15 @@
 
     <string name="settings_Overlay_weather_text">Overlay text in weather widget</string>
     <string name="settings_Overlay_weather_text_desc">Draws the text (condition and location) over the weather icon</string>
-
+
+    <string name="settings_withings_widgets">Withings widget</string>
+    <string name="settings_Withings_API_key">Withings API key</string>
+    <string name="settings_Withings_API_key_desc">The key to use for accessing the Body Metrics Service API.</string>
+    <string name="settings_Withings_API_secret">Withings API secret</string>
+    <string name="settings_Withings_API_secret_desc">The secret to use for accessing the Body Metrics Service API.</string>
+    <string name="settings_Authenticate_withings_account">User authenticated</string>
+    <string name="settings_Authenticate_withings_account_desc">Asks Withings to allow access to the body metrics of a user.</string>
+
     <string name="settings_phoneCalls">Phonecalls</string>
 
     <string name="settings_call_actions">Show actions in call</string>
@@ -114,6 +124,8 @@
     <string name="settings_idle_app_buffer">Use App Buffer for Clock-less Widget Pages</string>
     <string name="settings_idle_app_buffer_desc">Makes the clock and status icon visible when the watch connection is lost, but loses built-in button actions on affected pages.</string>    
 
+    <string name="settings_default_calendar_view">Default calendar view</string>
+
     <string name="settings_apps_show_clock">Clock on App screens</string>
     <string name="settings_apps_show_clock_desc">Show a small clock on App screens, instead of the page switch widgets.</string>    
 
@@ -170,18 +182,28 @@
    	<item>60</item>  
 	</string-array>
 
-    <string-array name="settings_media_control_method_names">
+  <string-array name="settings_media_control_method_names">
     <item>MusicServiceCommand messages (Stock music player)</item>
     <item>Emulate headset buttons (Winamp, and other players)</item>
-    </string-array>
+  </string-array>
 
-    <string-array name="settings_media_control_method_values"> 
+  <string-array name="settings_media_control_method_values"> 
 	<item>0</item>
 	<item>1</item>
 	<item>2</item>
 	</string-array>
 
-	<string-array name="settings_weather_provider_names">
+	<string-array name="settings_calendar_view_names">
+		<item>Month overview</item>
+		<item>Agenda</item>
+	</string-array>
+
+	<string-array name="settings_calendar_view_values"> 
+		<item>0</item>
+		<item>1</item>
+	</string-array>
+
+  	<string-array name="settings_weather_provider_names">
 	<item>Disabled</item>
     <item>Weather Underground</item>
     <item>Yahoo! Weather</item>
@@ -340,7 +362,7 @@
     <string name="settings_calendars_to_show">Calendars to show</string>
     <string name="settings_calendars_to_show_desc">Specify which calendars should be shown in the calendar widgets and app.</string>
     <string name="settings_calendar_all">All</string>
-    <string name="settings_calendar_lookahead">Calendar lookahead (hours))</string>
+    <string name="settings_calendar_lookahead">Calendar lookahead (hours)</string>
     <string name="settings_calendar_lookahead_desc">How many hours ahead the calendar widgets should search</string>
 
   	<string-array name="settings_calendar_values"> 

src/org/metawatch/manager/ApiIntentReceiver.java

@@ -224,6 +224,10 @@ else if (action.equals("org.metawatch.manager.SILENTMODE")) {
 				MetaWatchService.setSilentMode(intent.getBooleanExtra("enabled", false));
 			}
 		}
+
+		else if (action.equals("org.metawatch.manager.START_SERVICE")) {
+			context.startService(new Intent(context, MetaWatchService.class));
+		}
 
 	}