Added localization (now English and Italian) and a new tab where is

Timer/.classpath

@@ -6,6 +6,6 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="lib" path="libs/android-support-v13.jar" sourcepath="C:/Users/dan/android-sdks/extras/android/support/v4/src"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ActionBarSherlock"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/actionbarsherlock"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

Timer/AndroidManifest.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dpadgett.timer"
-    android:versionCode="7"
-    android:versionName="1.3" >
+    android:versionCode="8"
+    android:versionName="1.4" >
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="15" />
+        android:targetSdkVersion="19" />
 
     <application
-        android:debuggable="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
@@ -22,7 +21,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <service android:name=".AlarmService" />
         <activity
             android:name=".StopwatchAutostartActivity"

Timer/project.properties

@@ -9,4 +9,4 @@
 
 # Project target.
 target=android-16
-android.library.reference.1=../../../Downloads/JakeWharton-ActionBarSherlock-df676ad/library
+android.library.reference.1=../../../workspace/actionbarsherlock

Timer/res/layout/about.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+       <TextView
+        android:id="@+id/textVersion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/imageView1"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="30dp"
+        android:text="Large Text"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+       <ImageView
+           android:id="@+id/imageView1"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:layout_centerHorizontal="true"
+           android:layout_centerVertical="true"
+           android:src="@drawable/icon_big" />
+
+</RelativeLayout>

Timer/res/layout/countdown_simplified.xml

@@ -73,7 +73,7 @@
 	    <TextView
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-	        android:text="On finish:"
+	        android:text="@string/countdown_onfinish"
 	        android:textAppearance="?android:attr/textAppearanceMedium" />
 
 		<Spinner
@@ -94,7 +94,7 @@
             android:id="@+id/startButton"
             android:layout_width="120sp"
             android:layout_height="wrap_content"
-            android:text="Start" />
+            android:text="@string/countdown_start" />
 
     </LinearLayout>
 </LinearLayout>

Timer/res/layout/stopwatch.xml

@@ -66,7 +66,7 @@
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Start" />
+                android:text="@string/stopwatch_start" />
 
             <org.dpadgett.compat.Space
                 android:layout_width="20sp"
@@ -77,7 +77,7 @@
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Reset" />
+                android:text="@string/stopwatch_reset" />
 
             <org.dpadgett.compat.Space
                 android:layout_width="20sp"

Timer/res/layout/world_clock.xml

@@ -32,7 +32,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="+ Add" />
+            android:text="@string/wordclock_plusadd" />
     </LinearLayout>
 
 </org.dpadgett.compat.LinearLayout>

Timer/res/values-it/strings.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="hello">Sup World, TimerActivity!</string>
+    <string name="app_name">Timer</string>
+
+    <!-- NumberPicker - accessibility support -->
+    <!-- Description of the button to increment the NumberPicker value. [CHAR LIMIT=NONE] -->
+    <string name="number_picker_increment_button">Incrementa</string>
+    <!-- Description of the button to decrement the NumberPicker value. [CHAR LIMIT=NONE] -->
+    <string name="number_picker_decrement_button">Decrementa</string>
+    <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+    <string name="number_picker_increment_scroll_mode"><xliff:g id="value" example="3">%s</xliff:g> clicca e tieni.</string>
+    <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+    <string name="number_picker_increment_scroll_action">Slide su per incrementare e giù per decrementare.</string>
+
+    <string name="title_activity_stopwatch_autostart">StopwatchAutostartActivity</string>
+
+    <string name="gen_version">Versione</string>
+    <string name="gen_dismiss">Chiudi</string>
+
+    <string name="tab_worldclock">Orologio Mondiale</string>
+    <string name="tab_stopwatch">Cronometro</string>
+    <string name="tab_countdown">Timer</string>
+    <string name="tab_about">About</string>
+
+    <string name="wordclock_plusadd">+ Aggiungi</string>
+    <string name="wordclock_selecttimezone">Seleziona una timezone</string>
+    <string name="wordclock_remove">Rimuovi</string>
+
+    <string name="stopwatch_start">Avvia</string>
+    <string name="stopwatch_stop">Ferma</string>
+    <string name="stopwatch_reset">Azzera</string>
+    <string name="stopwatch_lap">Giro</string>
+
+    <string name="countdown_start">Avvia</string>
+    <string name="countdown_cancel">Annulla</string>
+    <string name="countdown_onfinish">Alla fine:</string>
+    <string name="countdown_finished">Conteggio timer completato</string>
+    <string name="countdown_taptodismiss">Premi qui per terminare</string>
+
+</resources>

Timer/res/values/strings.xml

@@ -16,4 +16,27 @@
 
     <string name="title_activity_stopwatch_autostart">StopwatchAutostartActivity</string>
 
+    <string name="gen_version">Version</string>
+    <string name="gen_dismiss">Dismiss</string>
+
+    <string name="tab_worldclock">World Clock</string>
+    <string name="tab_stopwatch">Stopwatch</string>
+    <string name="tab_countdown">Countdown</string>
+    <string name="tab_about">About</string>
+
+    <string name="wordclock_plusadd">+ Add</string>
+    <string name="wordclock_selecttimezone">Select a timezone</string>
+    <string name="wordclock_remove">Remove</string>
+
+    <string name="stopwatch_start">Start</string>
+    <string name="stopwatch_stop">Stop</string>
+    <string name="stopwatch_reset">Reset</string>
+    <string name="stopwatch_lap">Lap</string>
+
+    <string name="countdown_start">Start</string>
+    <string name="countdown_cancel">Cancel</string>
+    <string name="countdown_onfinish">On finish:</string>
+    <string name="countdown_finished">Countdown timer finished</string>
+    <string name="countdown_taptodismiss">Tap here to dismiss</string>
+
 </resources>

Timer/src/org/dpadgett/timer/AboutFragment.java

@@ -0,0 +1,40 @@
+package org.dpadgett.timer;
+
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+public class AboutFragment extends Fragment {
+
+	private View rootView;
+
+	/* (non-Javadoc)
+	 * @see android.support.v4.app.Fragment#onCreate(android.os.Bundle)
+	 */
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+	}
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        rootView = inflater.inflate(R.layout.about, container, false);
+        ResourceFinder finder = ResourceFinders.from(rootView);
+        TextView tv = (TextView)finder.findViewById(R.id.textVersion);
+        String version = getActivity().getResources().getString(R.string.gen_version)+" ";
+        try {
+			version += getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName;
+		} catch (NameNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        tv.setText(version);
+        return rootView;
+    }
+}

Timer/src/org/dpadgett/timer/AlarmService.java

@@ -104,14 +104,14 @@ private void countdownFinished() {
 		NotificationManager mNotificationManager = 
 				(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 		int icon = drawable.ic_dialog_info;
-		String tickerText = "Countdown timer finished";
+		String tickerText = context.getResources().getString(R.string.countdown_finished);
 		long when = System.currentTimeMillis();
 
 		Notification notification = new Notification(icon, tickerText, when);
 		notification.flags |= Notification.FLAG_AUTO_CANCEL | Notification.FLAG_ONGOING_EVENT;
 
-		String contentTitle = "Countdown timer finished";
-		String contentText = "Tap here to dismiss";
+		String contentTitle = context.getResources().getString(R.string.countdown_finished);
+		String contentText = context.getResources().getString(R.string.countdown_taptodismiss);
 		Intent notificationIntent = new Intent(context, AlarmService.class)
 			.putExtra("startAlarm", false).putExtra("fromFragment", false)
 			.setAction("internalStopAlarm");

Timer/src/org/dpadgett/timer/CountdownFragment.java

@@ -186,7 +186,7 @@ private void restoreState() {
 				Button startButton = (Button) rootView.findViewById(R.id.startButton);
 				inputs.removeAllViews();
 				inputs.addView(timerLayout);
-				startButton.setText("Cancel");
+				startButton.setText(getContext().getResources().getString(R.string.countdown_cancel));
 				// timing thread will auto start itself
 	    	}
         }
@@ -262,7 +262,7 @@ public void run() {
 
 			inputs.removeAllViews();
 			inputs.addView(timerLayout);
-			startButton.setText("Cancel");
+			startButton.setText(getContext().getResources().getString(R.string.countdown_cancel));
 
 			AlarmManager alarmMgr = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE);
 			// should be unique
@@ -295,7 +295,7 @@ public void run() {
 	    	handler.removeCallbacks(inputModeOn);
 			inputs.removeAllViews();
 			inputs.addView(inputLayout);
-			startButton.setText("Start");
+			startButton.setText(getContext().getResources().getString(R.string.countdown_start));
 			timingState.stopTimer();
 			if (alarmPendingIntent == null) {
 				// should be unique

Timer/src/org/dpadgett/timer/LapTimes.java

@@ -86,7 +86,7 @@ public void add(long lapTime) {
 				.inflate(R.layout.single_lap_time, (ViewGroup) lapTimesView, false);
 
 		TextView lapLabel = (TextView) lapLayout.findViewById(R.id.lapLabel);
-		lapLabel.setText("lap " + (lapTimes.size() + 1));
+		lapLabel.setText(context.getResources().getString(R.string.stopwatch_lap)+" "+(lapTimes.size() + 1));
 
 		TextView lapTimeView = (TextView) lapLayout.findViewById(R.id.lapTime);
 		lapTimeView.setText(getTimerText(lapTime));

Timer/src/org/dpadgett/timer/StopwatchFragment.java

@@ -19,15 +19,13 @@
 import org.dpadgett.compat.LinearLayout;
 import org.dpadgett.timer.TimerActivity.StartReason;
 import org.dpadgett.widget.TimerTextView;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.MeasureSpec;
@@ -73,17 +71,17 @@ public void start() {
 		lapTimeText.resume();
 		timerText.forceUpdate(timeStarted);
 		lapTimeText.forceUpdate(timeStarted);
-		startButton.setText("Stop");
-		resetButton.setText("Lap");
+		startButton.setText(getResources().getString(R.string.stopwatch_stop));
+		resetButton.setText(getResources().getString(R.string.stopwatch_lap));
 		saveState();
 	}
 
 	public void stop() {
 		Button startButton = (Button) rootView.findViewById(R.id.startButton);
 		Button resetButton = (Button) rootView.findViewById(R.id.stopButton);
 		long timeStopped = System.currentTimeMillis();
-		startButton.setText("Start");
-		resetButton.setText("Reset");
+		startButton.setText(getResources().getString(R.string.stopwatch_start));
+		resetButton.setText(getResources().getString(R.string.stopwatch_reset));
 		additionalElapsed += timeStopped - timeStarted;
 		timerText.pause(timeStopped);
 		lapTimeText.pause(timeStopped);
@@ -142,7 +140,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         timerText = (TimerTextView) rootView.findViewById(R.id.timerText);
         lapTimeText = (TimerTextView) rootView.findViewById(R.id.liveLapTime);
-        lapTimeText.setTextPrefix("lap: ");
+        lapTimeText.setTextPrefix(getResources().getString(R.string.stopwatch_lap)+": ");
 
         lapTimes = new LapTimes((ScrollView) rootView.findViewById(R.id.scrollView1));
 
@@ -219,8 +217,8 @@ private void restoreState() {
 		if (isTimerRunning) {
     		timerText.resume();
     		lapTimeText.resume();
-			startButton.setText("Stop");
-			resetButton.setText("Lap");
+			startButton.setText(getResources().getString(R.string.stopwatch_stop));
+			resetButton.setText(getResources().getString(R.string.stopwatch_lap));
     	}
 		timerText.forceUpdate(timeStarted);
 		lapTimeText.forceUpdate(timeStarted);