Merge remote branch 'cyanogen/eclair' into eclair

21 files changed, 445 insertions, 407 deletions

diff --git a/apps/SpareParts/res/values-de/arrays.xml b/apps/SpareParts/res/values-de/arrays.xml
index 967e8448e..caa545617 100644
--- a/apps/SpareParts/res/values-de/arrays.xml
+++ b/apps/SpareParts/res/values-de/arrays.xml
@@ -30,4 +30,20 @@
     <item>Schlafmodus</item>
     <item>Home, dann Schlaf</item>
   </string-array>
+
+  <string-array name="colors">
+    <item>Schwarz</item>
+    <item>Blau</item>
+    <item>Dunkelblau</item>
+    <item>Cyan</item>
+    <item>Dunkel Grau</item>
+    <item>Grau</item>
+    <item>Grün</item>
+    <item>Hellgrau</item>
+    <item>Magenta</item>
+    <item>Rot</item>
+    <item>Weiss</item>
+    <item>Gelb</item>
+    <item>Transparent</item>
+  </string-array>
 </resources>
diff --git a/apps/SpareParts/res/values-de/strings.xml b/apps/SpareParts/res/values-de/strings.xml
index 60094ab89..578b78d99 100644
--- a/apps/SpareParts/res/values-de/strings.xml
+++ b/apps/SpareParts/res/values-de/strings.xml
@@ -20,8 +20,8 @@
   <string name="title_battery_history">Batterie Nutzung</string>
   <string name="summary_battery_history">Zusammenfassung der Batterienutzung</string>
 
-  <string name="title_battery_information">Infos zur Batterie</string>
-  <string name="summary_battery_information">Batterie Statusinformationen</string>
+  <string name="title_battery_information">Batterie Informationen</string>
+  <string name="summary_battery_information">Statusinformationen der Batterie</string>
 
   <string name="title_usage_statistics">Nutzungsstatistiken</string>
   <string name="summary_usage_statistics">Zusammenfassung zur Nutzung von Anwendungen</string>
@@ -54,12 +54,12 @@
 
   <string name="applications_title">Anwendungen</string>
 
-  <string name="title_pin_home">Launcher im Speicher</string>
-  <string name="summary_on_pin_home">Versuchen die Home-App (Launcher) im Speicher zu halten.</string>
-  <string name="summary_off_pin_home">Launcher wird nicht gezwungen im Speicher zu bleiben.</string>
+  <string name="title_pin_home">Home-App im Speicher</string>
+  <string name="summary_on_pin_home">Versuchen die Home-App im Speicher zu halten.</string>
+  <string name="summary_off_pin_home">Home-App nicht zwingen im Speicher zu bleiben.</string>
 
   <string name="title_launcher_orientation">Launcher Drehung</string>
-  <string name="summary_on_launcher_orientation">Launcher richtet sich neu aus bei Drehung.</string>
+  <string name="summary_on_launcher_orientation">Launcher richtet sich bei Drehung neu aus.</string>
   <string name="summary_off_launcher_orientation">Launcher reagiert nicht auf Drehung des Gerätes</string>
 
   <string name="title_launcher_columns">Spalten im Launcher</string>
@@ -69,15 +69,63 @@
   <string name="battery_status_title">Batterie Statusanzeige</string>
   <string name="battery_status_summary_on">Batterieladung in Prozent wird in der Statusleiste angezeigt.</string>
   <string name="battery_status_summary_off">Batterieladung in Prozent wird nicht in der Statusleiste angezeigt.</string>
+  <string name="battery_status_color_title">Batterieladung Farbe</string>
 
   <string name="title_compcache_enabled">Compcache einschalten</string>
   <string name="summary_on_compcache_enabled">Komprimiertes Caching ist eingeschaltet.</string>
   <string name="summary_off_compcache_enabled">Komprimiertes Caching ist ausgeschaltet.</string>
 
+  <!-- Double Carrier -->
+
+  <string name="title_plmn">Einstellungen für Anzeige des Netzbetreibers</string>
+
+  <string name="title_show_plmn_ls">Netzbetreiber (Lockscreen)</string>
+  <string name="summary_on_show_plmn_ls">Netzbetreiber wird angezeigt auf dem Lockscreen</string>
+  <string name="summary_off_show_plmn_ls">Netzbetreiber wird nicht angezeigt auf dem Lockscreen</string>
+
+  <string name="title_show_plmn_sb">Netzbetreiber (Statuszeile)</string>
+  <string name="summary_on_show_plmn_sb">Netzbetreiber wird angezeigt in der Statuszeile</string>
+  <string name="summary_off_show_plmn_sb">Netzbetreiber wird nicht angezeigt in der Statuszeile</string>
+
+  <string name="title_spn">Einstellungen für Anzeige des Providers</string>
+  <string name="title_show_spn_ls">Provider (Lockscreen)</string>
+  <string name="summary_on_show_spn_ls">Provider wird angezeigt auf dem Lockscreen</string>
+  <string name="summary_off_show_spn_ls">Provider wird nicht angezeigt auf dem Lockscreen</string>
+
+  <string name="title_show_spn_sb">Provider (Statuszeile)</string>
+  <string name="summary_on_show_spn_sb">Provider wird angezeigt in der Statuszeile</string>
+  <string name="summary_off_show_spn_sb">Provider wird nicht angezeigt in der Statuszeile</string>
+
   <!-- Sound & display settings screen, compatibility mode check box label -->
   <string name="compatibility_mode_title">Kompatibilitätsmodus</string>
   <!-- Sound & display settings screen, compatibility mode option summary text when check box is selected -->
-  <string name="compatibility_mode_summary_on">Führe ältere Anwedungen im Kompatibilitätsmodus aus. Neustart erforderlich.</string>
+  <string name="compatibility_mode_summary_on">Führe ältere Anwendungen im Kompatibilitätsmodus aus. (Neustart erforderlich)</string>
   <!-- Sound & display settings screen, compatibility mode option summary text when check box is clear -->
-  <string name="compatibility_mode_summary_off">Führe ältere Anwedungen im Kompatibilitätsmodus aus. Neustart erforderlich.</string>
+  <string name="compatibility_mode_summary_off">Führe ältere Anwendungen im Kompatibilitätsmodus aus. (Neustart erforderlich)</string>
+
+  <string name="title_ui_tweaks">Tweaks für Oberfläche (nach Neustart)</string>
+
+  <string name="title_general_color_tweaks">Allgemein</string>
+  <string name="summary_general_color_tweaks">Uhr, Datum, Batterie, Betreiber, etc.</string>
+
+  <string name="title_show_clock">Zeige Uhr</string>
+  <string name="title_clock_color">Farbe Uhr</string>
+  <string name="title_date_color">Farbe Datum</string>
+  <string name="title_spn_label_color">Farbe Provider</string>
+  <string name="title_plmn_label_color">Farbe Netzbetreiber</string>
+
+  <string name="title_notifications_color_tweaks">Farbeinstellungen für Benachrichtigungen</string>
+  <string name="summary_notifications_color_tweaks">Ticker, dauerhafte und letzte Benachrichtigung, Löschen, etc.</string>
+  <string name="title_notifications_ticker_color">Benachrichtigungsticker</string>
+  <string name="title_no_notifications_color">Keine Benachrichtigungen</string>
+  <string name="title_clear_button_label_color">Löschen-Schaltfläche</string>
+  <string name="title_ongoing_notifications_color">Dauerhafte Benachrichtigungen</string>
+  <string name="title_latest_notifications_color">Letzte Benachrichtigung</string>
+  <string name="title_notifications_items">Benachrichtigungselemente</string>
+  <string name="title_notifications_items_title">Titelelement</string>
+  <string name="title_notifications_items_text">Textelement</string>
+  <string name="title_notifications_items_time">Zeitelement</string>
+
+  <string name="dialog_title_color">Farbe wählen</string>
+  <string name="title_reset_ui_tweaks_to_defaults">Änderungen zurücksetzen</string>
 </resources>
diff --git a/apps/SpareParts/res/values-it/strings.xml b/apps/SpareParts/res/values-it/strings.xml
index f5775472a..b11fe11fa 100644
--- a/apps/SpareParts/res/values-it/strings.xml
+++ b/apps/SpareParts/res/values-it/strings.xml
@@ -84,12 +84,13 @@
     <!-- Sound & display settings screen, compatibility mode option summary text when check box is clear -->
     <string name="compatibility_mode_summary_off">Non avviare le vecchie apps in modalità compatibilità</string>
 
-<string name="title_ui_tweaks">Modifiche ai colori della UI</string>
+<string name="title_ui_tweaks">Modifiche alla UI</string>
     
     <string name="title_general_color_tweaks">Generale</string>
-    <string name="summary_general_color_tweaks">Orologio, data, operatore, etc.</string>
-    <string name="title_clock_color">Orologio</string>
-    <string name="title_date_color">Data</string>
+    <string name="summary_general_color_tweaks">Orologio, data, batteria, operatore, etc.</string>
+    <string name="title_show_clock">Mostra orologio</string>
+    <string name="title_clock_color">Colore orologio</string>
+    <string name="title_date_color">Colore data</string>
     <string name="title_spn_label_color">Etichetta SPN operatore</string>
     <string name="title_plmn_label_color">Etichetta PLMN operatore</string>
     
diff --git a/apps/SpareParts/res/values/arrays.xml b/apps/SpareParts/res/values/arrays.xml
index ec287d2dc..dde5b541c 100644
--- a/apps/SpareParts/res/values/arrays.xml
+++ b/apps/SpareParts/res/values/arrays.xml
@@ -53,37 +53,5 @@
         <item>2</item>
         <item>3</item>
     </string-array>
-    
-    <string-array name="colors">
-        <item>Black</item>
-        <item>Blue</item>
-        <item>Dark Blue</item>
-        <item>Cyan</item>
-        <item>Dark Gray</item>
-        <item>Gray</item>
-        <item>Green</item>
-        <item>Light Gray</item>
-        <item>Magenta</item>
-        <item>Red</item>
-        <item>White</item>
-        <item>Yellow</item>
-        <item>Transparent</item>
-   </string-array>
-   
-   <string-array name="colors_values">
-        <item>-16777216</item>
-        <item>-16776961</item>
-        <item>-16764007</item>
-        <item>-16711681</item>
-        <item>-12303292</item>
-        <item>-7829368</item>
-        <item>-16711936</item>
-        <item>-3355444</item>
-        <item>-65281</item>
-        <item>-65536</item>
-        <item>-1</item>
-        <item>-256</item>
-        <item>0</item>
-  </string-array>
   
 </resources>
diff --git a/apps/SpareParts/res/values/strings.xml b/apps/SpareParts/res/values/strings.xml
index 971625655..04f1abd80 100644
--- a/apps/SpareParts/res/values/strings.xml
+++ b/apps/SpareParts/res/values/strings.xml
@@ -125,6 +125,7 @@
     <string name="title_notifications_color_tweaks">Notifications</string>
     <string name="summary_notifications_color_tweaks">Notifications ticker, ongoing notifications, latest notifications, clear notifications, etc.</string>    
     <string name="title_notifications_ticker_color">Notifications ticker color</string>
+    <string name="title_notifications_count_color">Notifications count color</string>
     <string name="title_no_notifications_color">No notification title color</string>
     <string name="title_clear_button_label_color">Clear notifications label color</string>    
     <string name="title_ongoing_notifications_color">Ongoing notifications title color</string>    
@@ -133,8 +134,7 @@
     <string name="title_notifications_items_title">Items title color</string>
     <string name="title_notifications_items_text">Items text color</string>
     <string name="title_notifications_items_time">Items time color</string>
-    
-    <string name="dialog_title_color">Select a color</string>
     <string name="title_reset_ui_tweaks_to_defaults">Reset UI tweaks to default</string>
+    <string name="title_color_picker">Pick a color</string>
     
 </resources>
diff --git a/apps/SpareParts/res/xml/spare_parts.xml b/apps/SpareParts/res/xml/spare_parts.xml
index 2bcbd6b66..c75af703c 100644
--- a/apps/SpareParts/res/xml/spare_parts.xml
+++ b/apps/SpareParts/res/xml/spare_parts.xml
@@ -229,6 +229,11 @@
                 android:defaultValue="-16777216" />
                 
             <Preference
+                android:key="notifications_count_color"
+                android:title="@string/title_notifications_count_color"
+                android:defaultValue="-1" />
+                
+            <Preference
                 android:key="no_notifications_color"
                 android:title="@string/title_no_notifications_color"
                 android:defaultValue="-1" />
diff --git a/apps/SpareParts/src/com/android/spare_parts/ColorPickerDialog.java b/apps/SpareParts/src/com/android/spare_parts/ColorPickerDialog.java
index eb09fe655..7ec813ebd 100644
--- a/apps/SpareParts/src/com/android/spare_parts/ColorPickerDialog.java
+++ b/apps/SpareParts/src/com/android/spare_parts/ColorPickerDialog.java
@@ -332,7 +332,7 @@ public class ColorPickerDialog extends Dialog {
         layout.addView(mEditText, layoutParams);
 
         setContentView(layout);
-        setTitle("Pick a color.");
+        setTitle(com.android.spare_parts.R.string.title_color_picker);
     }
     
     private OnColorChangedListener onColorChangedListener = new OnColorChangedListener() {
diff --git a/apps/SpareParts/src/com/android/spare_parts/SpareParts.java b/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
index e105b1c15..88650eb25 100644
--- a/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
+++ b/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
@@ -62,14 +62,12 @@ public class SpareParts extends PreferenceActivity
     private static final String LAUNCHER_COLUMN_PREF = "launcher_columns";
     private static final String BATTERY_STATUS_PREF = "battery_status";
     private static final String COMPCACHE_PREF = "compcache_enabled";
-// Double Carrier - bcrook
-	private static final String SHOW_PLMN_LS_PREF = "show_plmn_ls";
-	private static final String SHOW_SPN_LS_PREF = "show_spn_ls";
-	private static final String SHOW_PLMN_SB_PREF = "show_plmn_sb";
-	private static final String SHOW_SPN_SB_PREF = "show_spn_sb";
-	
-    
-    //Wysie_Soh
+    
+    private static final String SHOW_PLMN_LS_PREF = "show_plmn_ls";
+    private static final String SHOW_SPN_LS_PREF = "show_spn_ls";
+    private static final String SHOW_PLMN_SB_PREF = "show_plmn_sb";
+    private static final String SHOW_SPN_SB_PREF = "show_spn_sb";   
+    
     private static final String RECENT_APPS_NUM_PREF = "recent_apps_num";
     private static final String UI_SHOW_STATUS_CLOCK = "show_status_clock";
     private static final String UI_CLOCK_COLOR = "clock_color";
@@ -82,6 +80,7 @@ public class SpareParts extends PreferenceActivity
     private static final String UI_CLEAR_LABEL_COLOR = "clear_button_label_color";
     private static final String UI_BATTERY_PERCENT_COLOR = "battery_status_color_title";
     private static final String UI_NOTIF_TICKER_COLOR = "new_notifications_ticker_color";
+    private static final String UI_NOTIF_COUNT_COLOR = "notifications_count_color";
     private static final String UI_NOTIF_ITEM_TITLE_COLOR = "notifications_title_color";
     private static final String UI_NOTIF_ITEM_TEXT_COLOR = "notifications_text_color";
     private static final String UI_NOTIF_ITEM_TIME_COLOR = "notifications_time_color";
@@ -89,15 +88,14 @@ public class SpareParts extends PreferenceActivity
     
     private final Configuration mCurConfig = new Configuration();
     
-    //Wysie_Soh
-    private ListPreference mRecentAppsNumPref;
-    
+    private ListPreference mRecentAppsNumPref;    
     private Preference mBatteryPercentColorPreference;
     private Preference mClockColorPref;
     private Preference mDateColorPref;
     private Preference mSpnLabelColorPref;
     private Preference mPlmnLabelColorPref;
     private Preference mNotifTickerColor;
+    private Preference mNotifCountColor;
     private Preference mNoNotifColorPref;
     private Preference mClearLabelColorPref;
     private Preference mOngoingNotifColorPref;
@@ -118,11 +116,10 @@ public class SpareParts extends PreferenceActivity
     private CheckBoxPreference mBatteryStatusPref;
     private CheckBoxPreference mCompcachePref;
     private CheckBoxPreference mShowClockPref;
-	//Double Carrier - bcrook
-	private CheckBoxPreference mShowPlmnLsPref;
-	private CheckBoxPreference mShowSpnLsPref;
-	private CheckBoxPreference mShowPlmnSbPref;
-	private CheckBoxPreference mShowSpnSbPref;
+    private CheckBoxPreference mShowPlmnLsPref;
+    private CheckBoxPreference mShowSpnLsPref;
+    private CheckBoxPreference mShowPlmnSbPref;
+    private CheckBoxPreference mShowSpnSbPref;
     
     private Preference mResetToDefaults;
 
@@ -193,11 +190,11 @@ public class SpareParts extends PreferenceActivity
         mLauncherOrientationPref = (CheckBoxPreference) prefSet.findPreference(LAUNCHER_ORIENTATION_PREF);
         mLauncherColumnPref = (CheckBoxPreference) prefSet.findPreference(LAUNCHER_COLUMN_PREF);
         mCompcachePref = (CheckBoxPreference) prefSet.findPreference(COMPCACHE_PREF);
-		// Double carrier
-		mShowPlmnLsPref = (CheckBoxPreference) prefSet.findPreference(SHOW_PLMN_LS_PREF);
-		mShowSpnLsPref = (CheckBoxPreference) prefSet.findPreference(SHOW_SPN_LS_PREF);
-		mShowPlmnSbPref = (CheckBoxPreference) prefSet.findPreference(SHOW_PLMN_SB_PREF);
-		mShowSpnSbPref = (CheckBoxPreference) prefSet.findPreference(SHOW_SPN_SB_PREF);
+        // Double carrier
+        mShowPlmnLsPref = (CheckBoxPreference) prefSet.findPreference(SHOW_PLMN_LS_PREF);
+        mShowSpnLsPref = (CheckBoxPreference) prefSet.findPreference(SHOW_SPN_LS_PREF);
+        mShowPlmnSbPref = (CheckBoxPreference) prefSet.findPreference(SHOW_PLMN_SB_PREF);
+        mShowSpnSbPref = (CheckBoxPreference) prefSet.findPreference(SHOW_SPN_SB_PREF);
         
         mBatteryStatusPref = (CheckBoxPreference) prefSet.findPreference(BATTERY_STATUS_PREF);
         mBatteryPercentColorPreference = prefSet.findPreference(UI_BATTERY_PERCENT_COLOR);
@@ -208,6 +205,7 @@ public class SpareParts extends PreferenceActivity
         mPlmnLabelColorPref = prefSet.findPreference(UI_PLMN_LABEL_COLOR);
         
         mNotifTickerColor = prefSet.findPreference(UI_NOTIF_TICKER_COLOR);
+        mNotifCountColor = prefSet.findPreference(UI_NOTIF_COUNT_COLOR);
         mNoNotifColorPref = prefSet.findPreference(UI_NO_NOTIF_COLOR);
         mClearLabelColorPref = prefSet.findPreference(UI_CLEAR_LABEL_COLOR);
         mOngoingNotifColorPref = prefSet.findPreference(UI_ONGOING_NOTIF_COLOR);        
@@ -259,24 +257,23 @@ public class SpareParts extends PreferenceActivity
                     getContentResolver(),
                     Settings.System.BATTERY_PERCENTAGE_STATUS_ICON, 0) != 0);
             mCompcachePref.setChecked(Settings.Secure.getInt(
-            		getContentResolver(),
-            		Settings.Secure.COMPCACHE_ENABLED, 0) != 0);
+                    getContentResolver(),
+                    Settings.Secure.COMPCACHE_ENABLED, 0) != 0);
             mShowClockPref.setChecked(Settings.System.getInt(
-            		getContentResolver(),
-            		Settings.System.SHOW_STATUS_CLOCK, 0) != 0);
-// Double Carrier - bcrook
+                    getContentResolver(),
+                    Settings.System.SHOW_STATUS_CLOCK, 0) != 0);
             mShowPlmnLsPref.setChecked(Settings.System.getInt(
-            		getContentResolver(),
-            		Settings.System.SHOW_PLMN_LS, 0) != 0);
+                    getContentResolver(),
+                    Settings.System.SHOW_PLMN_LS, 0) != 0);
             mShowSpnLsPref.setChecked(Settings.System.getInt(
-            		getContentResolver(),
-            		Settings.System.SHOW_SPN_LS, 0) != 0);
+                    getContentResolver(),
+                    Settings.System.SHOW_SPN_LS, 0) != 0);
             mShowPlmnSbPref.setChecked(Settings.System.getInt(
-            		getContentResolver(),
-            		Settings.System.SHOW_PLMN_SB, 0) != 0);
+                    getContentResolver(),
+                    Settings.System.SHOW_PLMN_SB, 0) != 0);
             mShowSpnSbPref.setChecked(Settings.System.getInt(
-            		getContentResolver(),
-            		Settings.System.SHOW_SPN_SB, 0) != 0);
+                    getContentResolver(),
+                    Settings.System.SHOW_SPN_SB, 0) != 0);
     }
     
     public boolean onPreferenceChange(Preference preference, Object objValue) {
@@ -303,95 +300,102 @@ public class SpareParts extends PreferenceActivity
             return true;
         }
         else if (preference == mClockColorPref) {
-			ColorPickerDialog cp = new ColorPickerDialog(this,
-				mClockFontColorListener,
-				readClockFontColor());
-			cp.show();
-			return true;           
+            ColorPickerDialog cp = new ColorPickerDialog(this,
+                mClockFontColorListener,
+                readClockFontColor());
+            cp.show();
+            return true;           
         }
         else if (preference == mDateColorPref) {
-			ColorPickerDialog cp = new ColorPickerDialog(this,
-				mDateFontColorListener,
-				readDateFontColor());
-			cp.show();
-			return true;
+            ColorPickerDialog cp = new ColorPickerDialog(this,
+                mDateFontColorListener,
+                readDateFontColor());
+            cp.show();
+            return true;
         }
         else if (preference == mSpnLabelColorPref) {
-			ColorPickerDialog cp = new ColorPickerDialog(this,
-				mSpnLabelColorListener,
-				readSpnLabelColor());
-			cp.show();
-			return true;
+            ColorPickerDialog cp = new ColorPickerDialog(this,
+                mSpnLabelColorListener,
+                readSpnLabelColor());
+            cp.show();
+            return true;
         }
         else if (preference == mPlmnLabelColorPref) {
-			ColorPickerDialog cp = new ColorPickerDialog(this,
-				mPlmnLabelColorListener,
-				readPlmnLabelColor());
-			cp.show();
-			return true;
+            ColorPickerDialog cp = new ColorPickerDialog(this,
+                mPlmnLabelColorListener,
+                readPlmnLabelColor());
+            cp.show();
+            return true;
         }
         else if (preference == mBatteryPercentColorPreference) {
-			ColorPickerDialog cp = new ColorPickerDialog(this,
-				mBatteryColorListener,
-				readBatteryColor());
-			cp.show();
-			return true;
+            ColorPickerDialog cp = new ColorPickerDialog(this,
+                mBatteryColorListener,
+                readBatteryColor());
+            cp.show();
+            return true;
         }
         else if (preference == mNotifTickerColor) {
             ColorPickerDialog cp = new ColorPickerDialog(this,
-				mNotifTickerColorListener,
-				readNotifTickerColor());
-			cp.show();
-			return true;
+                mNotifTickerColorListener,
+                readNotifTickerColor());
+            cp.show();
+            return true;
+        }
+        else if (preference == mNotifCountColor) {
+            ColorPickerDialog cp = new ColorPickerDialog(this,
+                mNotifCountColorListener,
+                readNotifCountColor());
+            cp.show();
+            return true;
         }
         else if (preference == mNoNotifColorPref) {
             ColorPickerDialog cp = new ColorPickerDialog(this,
-				mNoNotifColorListener,
-				readNoNotifColor());
-			cp.show();
-			return true;
+                mNoNotifColorListener,
+                readNoNotifColor());
+            cp.show();
+            return true;
         }
         else if (preference == mClearLabelColorPref) {
             ColorPickerDialog cp = new ColorPickerDialog(this,
-				mClearLabelColorListener,
-				readClearLabelColor());
-			cp.show();
-			return true;
+                mClearLabelColorListener,
+                readClearLabelColor());
+            cp.show();
+            return true;
         }
         else if (preference == mOngoingNotifColorPref) {
             ColorPickerDialog cp = new ColorPickerDialog(this,
-				mOngoingNotifColorListener,
-				readOngoingNotifColor());
-			cp.show();
-			return true;
+                mOngoingNotifColorListener,
+                readOngoingNotifColor());
+            cp.show();
+            return true;
         }
         else if (preference == mLatestNotifColorPref) {
             ColorPickerDialog cp = new ColorPickerDialog(this,
-				mLatestNotifColorListener,
-				readLatestNotifColor());
-			cp.show();
-			return true;
+                mLatestNotifColorListener,
+                readLatestNotifColor());
+            cp.show();
+            return true;
         }
         else if (preference == mNotifItemTitlePref) {
             ColorPickerDialog cp = new ColorPickerDialog(this,
-				mNotifItemTitleColorListener,
-				readNotifItemTitleColor());
-			cp.show();
-			return true;
+                mNotifItemTitleColorListener,
+                readNotifItemTitleColor());
+            cp.show();
+            return true;
         }
         else if (preference == mNotifItemTextPref) {
             ColorPickerDialog cp = new ColorPickerDialog(this,
-				mNotifItemTextColorListener,
-				readNotifItemTextColor());
-			cp.show();
-			return true;
+                mNotifItemTextColorListener,
+                readNotifItemTextColor());
+            cp.show();
+            return true;
         }
         else if (preference == mNotifItemTimePref) {
             ColorPickerDialog cp = new ColorPickerDialog(this,
-				mNotifItemTimeColorListener,
-				readNotifItemTimeColor());
-			cp.show();
-			return true;
+                mNotifItemTimeColorListener,
+                readNotifItemTimeColor());
+            cp.show();
+            return true;
         }
         else if (preference == mResetToDefaults) {
             AlertDialog alertDialog = new AlertDialog.Builder(this).create();
@@ -422,6 +426,7 @@ public class SpareParts extends PreferenceActivity
         Settings.System.putInt(getContentResolver(), Settings.System.PLMN_LABEL_COLOR, -16777216);
         Settings.System.putInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_COLOR, -1);
         Settings.System.putInt(getContentResolver(), Settings.System.NEW_NOTIF_TICKER_COLOR, -16777216);
+        Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_COUNT_COLOR, -1);
         Settings.System.putInt(getContentResolver(), Settings.System.NO_NOTIF_COLOR, -1);
         Settings.System.putInt(getContentResolver(), Settings.System.CLEAR_BUTTON_LABEL_COLOR, -16777216);
         Settings.System.putInt(getContentResolver(), Settings.System.ONGOING_NOTIF_COLOR, -1);
@@ -431,13 +436,18 @@ public class SpareParts extends PreferenceActivity
         Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_ITEM_TIME_COLOR, -16777216);
         Settings.System.putInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_ICON,1);
         Settings.System.putInt(getContentResolver(), Settings.System.SHOW_STATUS_CLOCK, 1);
-// Double carrier
         Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_LS, 1);
         Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_LS, 1);
         Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_SB, 1);
         Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_SB, 1);
-        mBatteryStatusPref.setChecked(Settings.System.getInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_ICON, 0) != 0);
-        mShowClockPref.setChecked(Settings.System.getInt(getContentResolver(), Settings.System.SHOW_STATUS_CLOCK, 0) != 0);
+        
+        //Update Spare Parts UI to defaults
+        mBatteryStatusPref.setChecked(true);
+        mShowClockPref.setChecked(true);
+        mShowPlmnLsPref.setChecked(true);
+        mShowSpnLsPref.setChecked(true);
+        mShowPlmnSbPref.setChecked(true);
+        mShowSpnSbPref.setChecked(true);
     }
 
     public void writeAnimationPreference(int which, Object objValue) {
@@ -497,7 +507,6 @@ public class SpareParts extends PreferenceActivity
         }
     }
     
-    //Wysie_Soh
     public void readRecentAppsNumPreference(ListPreference pref) {
         try {
             int value = Settings.System.getInt(getContentResolver(), Settings.System.RECENT_APPS_NUMBER);
@@ -521,214 +530,230 @@ public class SpareParts extends PreferenceActivity
         }
     }
     
-	private int readClockFontColor() {
+    private int readClockFontColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.CLOCK_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.CLOCK_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mClockFontColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.CLOCK_COLOR, color);
-			}
-	};
-	
-	private int readDateFontColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mClockFontColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.CLOCK_COLOR, color);
+            }
+    };
+    
+    private int readDateFontColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.DATE_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.DATE_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mDateFontColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.DATE_COLOR, color);
-			}
-	};
-	
-	private int readSpnLabelColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mDateFontColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.DATE_COLOR, color);
+            }
+    };
+    
+    private int readSpnLabelColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.SPN_LABEL_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.SPN_LABEL_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mSpnLabelColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.SPN_LABEL_COLOR, color);
-			}
-	};
-	
-	private int readPlmnLabelColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mSpnLabelColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.SPN_LABEL_COLOR, color);
+            }
+    };
+    
+    private int readPlmnLabelColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.PLMN_LABEL_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.PLMN_LABEL_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mPlmnLabelColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.PLMN_LABEL_COLOR, color);
-			}
-	};
-	
-	private int readBatteryColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mPlmnLabelColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.PLMN_LABEL_COLOR, color);
+            }
+    };
+    
+    private int readBatteryColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -1;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mBatteryColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_COLOR, color);
-			}
-	};
-	
-	private int readNotifTickerColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mBatteryColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.BATTERY_PERCENTAGE_STATUS_COLOR, color);
+            }
+    };
+    
+    private int readNotifTickerColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.NEW_NOTIF_TICKER_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.NEW_NOTIF_TICKER_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mNotifTickerColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.NEW_NOTIF_TICKER_COLOR, color);
-			}
-	};
-	
-	private int readNoNotifColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mNotifTickerColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.NEW_NOTIF_TICKER_COLOR, color);
+            }
+    };
+    
+    private int readNotifCountColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.NO_NOTIF_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.NOTIF_COUNT_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -1;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mNoNotifColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.NO_NOTIF_COLOR, color);
-			}
-	};
-	
-	private int readClearLabelColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mNotifCountColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_COUNT_COLOR, color);
+            }
+    };
+    
+    private int readNoNotifColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.CLEAR_BUTTON_LABEL_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.NO_NOTIF_COLOR);
+        }
+        catch (SettingNotFoundException e) {
+            return -1;
+        }
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mNoNotifColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.NO_NOTIF_COLOR, color);
+            }
+    };
+    
+    private int readClearLabelColor() {
+        try {
+            return Settings.System.getInt(getContentResolver(), Settings.System.CLEAR_BUTTON_LABEL_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mClearLabelColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.CLEAR_BUTTON_LABEL_COLOR, color);
-			}
-	};
-	
-	private int readOngoingNotifColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mClearLabelColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.CLEAR_BUTTON_LABEL_COLOR, color);
+            }
+    };
+    
+    private int readOngoingNotifColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.ONGOING_NOTIF_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.ONGOING_NOTIF_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -1;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mOngoingNotifColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.ONGOING_NOTIF_COLOR, color);
-			}
-	};
-	
-	private int readLatestNotifColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mOngoingNotifColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.ONGOING_NOTIF_COLOR, color);
+            }
+    };
+    
+    private int readLatestNotifColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.LATEST_NOTIF_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.LATEST_NOTIF_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -1;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mLatestNotifColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.LATEST_NOTIF_COLOR, color);
-			}
-	};
-	
-	private int readNotifItemTitleColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mLatestNotifColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.LATEST_NOTIF_COLOR, color);
+            }
+    };
+    
+    private int readNotifItemTitleColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.NOTIF_ITEM_TITLE_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.NOTIF_ITEM_TITLE_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mNotifItemTitleColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_ITEM_TITLE_COLOR, color);
-			}
-	};
-	
-	private int readNotifItemTextColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mNotifItemTitleColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_ITEM_TITLE_COLOR, color);
+            }
+    };
+    
+    private int readNotifItemTextColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.NOTIF_ITEM_TEXT_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.NOTIF_ITEM_TEXT_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mNotifItemTextColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_ITEM_TEXT_COLOR, color);
-			}
-	};
-	
-	private int readNotifItemTimeColor() {
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mNotifItemTextColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_ITEM_TEXT_COLOR, color);
+            }
+    };
+    
+    private int readNotifItemTimeColor() {
         try {
-    		return Settings.System.getInt(getContentResolver(), Settings.System.NOTIF_ITEM_TIME_COLOR);
+            return Settings.System.getInt(getContentResolver(), Settings.System.NOTIF_ITEM_TIME_COLOR);
         }
         catch (SettingNotFoundException e) {
             return -16777216;
         }
-	}
-	
-	ColorPickerDialog.OnColorChangedListener mNotifItemTimeColorListener = 
-		new ColorPickerDialog.OnColorChangedListener() {
-			public void colorChanged(int color) {
-				Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_ITEM_TIME_COLOR, color);
-			}
-	};
-	
+    }
+    
+    ColorPickerDialog.OnColorChangedListener mNotifItemTimeColorListener = 
+        new ColorPickerDialog.OnColorChangedListener() {
+            public void colorChanged(int color) {
+                Settings.System.putInt(getContentResolver(), Settings.System.NOTIF_ITEM_TIME_COLOR, color);
+            }
+    };
+    
     public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
         if (FANCY_IME_ANIMATIONS_PREF.equals(key)) {
             Settings.System.putInt(getContentResolver(),
@@ -753,24 +778,24 @@ public class SpareParts extends PreferenceActivity
                     Settings.System.BATTERY_PERCENTAGE_STATUS_ICON,
                     mBatteryStatusPref.isChecked() ? 1 : 0);
         } else if (COMPCACHE_PREF.equals(key)) {
-        	Settings.Secure.putInt(getContentResolver(), Settings.Secure.COMPCACHE_ENABLED,
-        			mCompcachePref.isChecked() ? 1 : 0);
+            Settings.Secure.putInt(getContentResolver(), Settings.Secure.COMPCACHE_ENABLED,
+                    mCompcachePref.isChecked() ? 1 : 0);
 // Double Carrier
         } else if (SHOW_PLMN_LS_PREF.equals(key)) {
-        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_LS,
-        			mShowPlmnLsPref.isChecked() ? 1 : 0);
+            Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_LS,
+                    mShowPlmnLsPref.isChecked() ? 1 : 0);
         } else if (SHOW_SPN_LS_PREF.equals(key)) {
-        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_LS,
-        			mShowSpnLsPref.isChecked() ? 1 : 0);
+            Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_LS,
+                    mShowSpnLsPref.isChecked() ? 1 : 0);
         } else if (SHOW_PLMN_SB_PREF.equals(key)) {
-        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_SB,
-        			mShowPlmnSbPref.isChecked() ? 1 : 0);
+            Settings.System.putInt(getContentResolver(), Settings.System.SHOW_PLMN_SB,
+                    mShowPlmnSbPref.isChecked() ? 1 : 0);
         } else if (SHOW_SPN_SB_PREF.equals(key)) {
-        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_SB,
-        			mShowSpnSbPref.isChecked() ? 1 : 0);
+            Settings.System.putInt(getContentResolver(), Settings.System.SHOW_SPN_SB,
+                    mShowSpnSbPref.isChecked() ? 1 : 0);
         } else if (UI_SHOW_STATUS_CLOCK.equals(key)) {
-        	Settings.System.putInt(getContentResolver(), Settings.System.SHOW_STATUS_CLOCK,
-        			mShowClockPref.isChecked() ? 1 : 0);
+            Settings.System.putInt(getContentResolver(), Settings.System.SHOW_STATUS_CLOCK,
+                    mShowClockPref.isChecked() ? 1 : 0);
         }
     }
     
diff --git a/apps/Term/src/com/android/term/Term.java b/apps/Term/src/com/android/term/Term.java
index 057d2cc86..3b9833fb7 100644
--- a/apps/Term/src/com/android/term/Term.java
+++ b/apps/Term/src/com/android/term/Term.java
@@ -2625,7 +2625,7 @@ class EmulatorView extends View implements GestureDetector.OnGestureListener {
 
     public EmulatorView(Context context) {
         super(context);
-        commonConstructor();
+        commonConstructor(context);
     }
 
     public void register(TermKeyListener listener) {
@@ -2762,17 +2762,17 @@ class EmulatorView extends View implements GestureDetector.OnGestureListener {
                 context.obtainStyledAttributes(android.R.styleable.View);
         initializeScrollbars(a);
         a.recycle();
-        commonConstructor();
+        commonConstructor(context);
     }
 
-    private void commonConstructor() {
+    private void commonConstructor(Context context) {
         mTextRenderer = null;
         mCursorPaint = new Paint();
         mCursorPaint.setARGB(255,128,128,128);
         mBackgroundPaint = new Paint();
         mTopRow = 0;
         mLeftColumn = 0;
-        mGestureDetector = new GestureDetector(this);
+        mGestureDetector = new GestureDetector(context, this, null);
         mGestureDetector.setIsLongpressEnabled(false);
         setVerticalScrollBarEnabled(true);
     }
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index ae047a883..ad72b993e 100755
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -17,7 +17,6 @@
 	<classpathentry kind="src" path="packages/apps/Settings/src"/>
 	<classpathentry kind="src" path="packages/apps/SoundRecorder/src"/>
 	<classpathentry kind="src" path="packages/apps/Stk/src"/>
-	<classpathentry kind="src" path="packages/apps/Updater/src"/>
 	<classpathentry kind="src" path="packages/apps/VoiceDialer/src"/>
 	<classpathentry kind="src" path="packages/providers/CalendarProvider/src"/>
 	<classpathentry kind="src" path="packages/providers/ContactsProvider/src"/>
@@ -33,19 +32,15 @@
 	<classpathentry kind="src" path="frameworks/base/core/java"/>
 	<classpathentry kind="src" path="frameworks/base/core/config/sdk"/>
 	<classpathentry kind="src" path="frameworks/base/graphics/java"/>
-	<classpathentry kind="src" path="frameworks/base/im/java"/>
 	<classpathentry kind="src" path="frameworks/base/keystore/java"/>
 	<classpathentry kind="src" path="frameworks/base/location/java"/>
 	<classpathentry kind="src" path="frameworks/base/media/java"/>
 	<classpathentry kind="src" path="frameworks/base/opengl/java"/>
 	<classpathentry kind="src" path="frameworks/base/packages/SettingsProvider/src"/>
-	<classpathentry kind="src" path="frameworks/base/packages/SubscribedFeedsProvider/src"/>
 	<classpathentry kind="src" path="frameworks/base/sax/java"/>
 	<classpathentry kind="src" path="frameworks/base/services/java"/>
 	<classpathentry kind="src" path="frameworks/base/telephony/java"/>
 	<classpathentry kind="src" path="frameworks/base/test-runner"/>
-	<classpathentry kind="src" path="frameworks/base/tts/java"/>
-	<classpathentry kind="src" path="frameworks/base/vpn/java"/>
 	<classpathentry kind="src" path="frameworks/base/wifi/java"/>
 	<classpathentry kind="src" path="frameworks/policies/base/phone"/>
 	<classpathentry kind="src" path="development/samples/ApiDemos/src"/>
@@ -94,12 +89,10 @@
 	<classpathentry kind="src" path="out/target/common/obj/APPS/Email_intermediates/src/src"/>
 	<classpathentry kind="src" path="out/target/common/obj/APPS/Music_intermediates/src/src"/>
 	<classpathentry kind="src" path="out/target/common/obj/APPS/Phone_intermediates/src/src"/>
-	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/com.android.im.plugin_intermediates/src"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/location/java"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java"/>
-	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/vpn/java"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java"/>
 	<classpathentry kind="src" path="out/target/common/R"/>
 	<classpathentry kind="src" path="external/tagsoup/src"/>
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java b/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
index 38e69d031..a52b01ba3 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
@@ -101,7 +101,7 @@ public class Transition3d extends Activity implements
         mContainer.startAnimation(rotation);
     }
 
-    public void onItemClick(AdapterView parent, View v, int position, long id) {
+    public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
         // Pre-load the image then start the animation
         mImageView.setImageResource(PHOTOS_RESOURCES[position]);
         applyRotation(position, 0, 90);
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java b/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
index 0ef79b3a6..67141751b 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
@@ -30,7 +30,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.Toast;
 import android.database.Cursor;
-import android.provider.Contacts;
+import android.provider.ContactsContract;
 
 import com.example.android.apis.R;
 
@@ -135,13 +135,15 @@ public class AlertDialogSamples extends Activity {
             mProgressDialog.setTitle(R.string.select_dialog);
             mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
             mProgressDialog.setMax(MAX_PROGRESS);
-            mProgressDialog.setButton(getText(R.string.alert_dialog_hide), new DialogInterface.OnClickListener() {
+            mProgressDialog.setButton(DialogInterface.BUTTON_POSITIVE,
+                    getText(R.string.alert_dialog_hide), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int whichButton) {
 
                     /* User clicked Yes so do some stuff */
                 }
             });
-            mProgressDialog.setButton2(getText(R.string.alert_dialog_cancel), new DialogInterface.OnClickListener() {
+            mProgressDialog.setButton(DialogInterface.BUTTON_NEGATIVE,
+                    getText(R.string.alert_dialog_cancel), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int whichButton) {
 
                     /* User clicked No so do some stuff */
@@ -184,13 +186,15 @@ public class AlertDialogSamples extends Activity {
                                 /* User clicked on a check box do some stuff */
                             }
                         })
-                .setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.alert_dialog_ok,
+                        new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
 
                         /* User clicked Yes so do some stuff */
                     }
                 })
-                .setNegativeButton(R.string.alert_dialog_cancel, new DialogInterface.OnClickListener() {
+                .setNegativeButton(R.string.alert_dialog_cancel,
+                        new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
 
                         /* User clicked No so do some stuff */
@@ -199,17 +203,18 @@ public class AlertDialogSamples extends Activity {
                .create();
             case DIALOG_MULTIPLE_CHOICE_CURSOR:
                 String[] projection = new String[] {
-                        Contacts.People._ID,
-                        Contacts.People.NAME,
-                        Contacts.People.SEND_TO_VOICEMAIL
+                        ContactsContract.Contacts._ID,
+                        ContactsContract.Contacts.DISPLAY_NAME,
+                        ContactsContract.Contacts.SEND_TO_VOICEMAIL
                 };
-                Cursor cursor = managedQuery(Contacts.People.CONTENT_URI, projection, null, null, null);
+                Cursor cursor = managedQuery(ContactsContract.Contacts.CONTENT_URI,
+                        projection, null, null, null);
                 return new AlertDialog.Builder(AlertDialogSamples.this)
                     .setIcon(R.drawable.ic_popup_reminder)
                     .setTitle(R.string.alert_dialog_multi_choice_cursor)
                     .setMultiChoiceItems(cursor,
-                            Contacts.People.SEND_TO_VOICEMAIL,
-                            Contacts.People.NAME,
+                            ContactsContract.Contacts.SEND_TO_VOICEMAIL,
+                            ContactsContract.Contacts.DISPLAY_NAME,
                             new DialogInterface.OnMultiChoiceClickListener() {
                                 public void onClick(DialogInterface dialog, int whichButton,
                                         boolean isChecked) {
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java b/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java
index dcb8b839a..e34f4cfea 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java
@@ -20,14 +20,11 @@ import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.IBinder;
 import android.view.KeyEvent;
-import android.provider.Contacts;
+import android.provider.ContactsContract;
 import android.os.Bundle;
 import android.util.Log;
 
-import java.util.Map;
-
 /**
  * This is an example implementation of the {@link android.app.Instrumentation}
  * class, allowing you to run tests against application code.  The
@@ -61,7 +58,7 @@ public class ContactsSelectInstrumentation extends Instrumentation {
 
         // Monitor for the expected start activity call.
         ActivityMonitor am = addMonitor(IntentFilter.create(
-            Intent.ACTION_VIEW, Contacts.People.CONTENT_ITEM_TYPE), null, true);
+            Intent.ACTION_VIEW, ContactsContract.Contacts.CONTENT_ITEM_TYPE), null, true);
 
         // We are going to enqueue a couple key events to simulate the user
         // selecting an item in the list.
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java b/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
index 97f6199c1..9b911cca5 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
@@ -174,7 +174,7 @@ public class StatusBarNotifications extends Activity {
 
         // Send the notification.
         // We use a layout id because it is a unique number.  We use it later to cancel.
-        mNotificationManager.notify(R.layout.status_bar_notifications, notification);
+        mNotificationManager.notify(MOOD_NOTIFICATIONS, notification);
     }
 
     private void setMoodView(int moodId, int textId) {
@@ -202,7 +202,7 @@ public class StatusBarNotifications extends Activity {
 
         // we use a string id because is a unique number.  we use it later to cancel the
         // notification
-        mNotificationManager.notify(R.layout.status_bar_notifications, notif);
+        mNotificationManager.notify(MOOD_NOTIFICATIONS, notif);
     }
     
     private void setDefault(int defaults) {
@@ -231,8 +231,8 @@ public class StatusBarNotifications extends Activity {
         notification.defaults = defaults;
         
         mNotificationManager.notify(
-                   R.layout.status_bar_notifications, // we use a string id because it is a unique
-                                                      // number.  we use it later to cancel the
-                   notification);                     // notification
+                MOOD_NOTIFICATIONS, // we use a string id because it is a unique
+                                    // number.  we use it later to cancel the notification
+                notification);
     }    
 }
diff --git a/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java b/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
index 5f8874cab..e2cd1ca0b 100644
--- a/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
+++ b/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
@@ -22,7 +22,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java b/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java
index d2a990751..d3b0981da 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java
@@ -16,15 +16,13 @@
 
 package com.example.android.apis.graphics;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.*;
-import android.hardware.SensorListener;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
 import android.util.Config;
 import android.util.Log;
 import android.view.View;
@@ -33,23 +31,22 @@ public class Compass extends GraphicsActivity {
 
     private static final String TAG = "Compass";
 
-	private SensorManager mSensorManager;
+    private SensorManager mSensorManager;
+    private Sensor mSensor;
     private SampleView mView;
     private float[] mValues;
     
-    private final SensorListener mListener = new SensorListener() {
-    
-        public void onSensorChanged(int sensor, float[] values) {
-            if (Config.LOGD) Log.d(TAG, "sensorChanged (" + values[0] + ", " + values[1] + ", " + values[2] + ")");
-            mValues = values;
+    private final SensorEventListener mListener = new SensorEventListener() {
+        public void onSensorChanged(SensorEvent event) {
+            if (Config.LOGD) Log.d(TAG,
+                    "sensorChanged (" + event.values[0] + ", " + event.values[1] + ", " + event.values[2] + ")");
+            mValues = event.values;
             if (mView != null) {
                 mView.invalidate();
             }
         }
 
-        public void onAccuracyChanged(int sensor, int accuracy) {
-            // TODO Auto-generated method stub
-            
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
         }
     };
 
@@ -57,6 +54,7 @@ public class Compass extends GraphicsActivity {
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mSensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
+        mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
         mView = new SampleView(this);
         setContentView(mView);
     }
@@ -66,9 +64,9 @@ public class Compass extends GraphicsActivity {
     {
         if (Config.LOGD) Log.d(TAG, "onResume");
         super.onResume();
-        mSensorManager.registerListener(mListener, 
-        		SensorManager.SENSOR_ORIENTATION,
-        		SensorManager.SENSOR_DELAY_GAME);
+
+        mSensorManager.registerListener(mListener, mSensor,
+                SensorManager.SENSOR_DELAY_GAME);
     }
     
     @Override
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java b/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java
index ed5b5ae61..87e0461fe 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java
@@ -16,22 +16,21 @@
 
 package com.example.android.apis.graphics;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.*;
-import android.hardware.SensorListener;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
 import android.util.Config;
-import android.util.Log;
 import android.view.View;
 
 public class SensorTest extends GraphicsActivity {
+    private final String TAG = "SensorTest";
 
-	private SensorManager mSensorManager;
+    private SensorManager mSensorManager;
+    private Sensor mSensor;
     private SampleView mView;
     private float[] mValues;
     
@@ -76,29 +75,31 @@ public class SensorTest extends GraphicsActivity {
         }
     };
 
-    private final SensorListener mListener = new SensorListener() {
+    private final SensorEventListener mListener = new SensorEventListener() {
 
         private final float[] mScale = new float[] { 2, 2.5f, 0.5f };   // accel
-
         private float[] mPrev = new float[3];
-            
-        public void onSensorChanged(int sensor, float[] values) {
+        private long mLastGestureTime;
+
+        public void onSensorChanged(SensorEvent event) {
             boolean show = false;
             float[] diff = new float[3];
 
             for (int i = 0; i < 3; i++) {
-                diff[i] = Math.round(mScale[i] * (values[i] - mPrev[i]) * 0.45f);
+                diff[i] = Math.round(mScale[i] * (event.values[i] - mPrev[i]) * 0.45f);
                 if (Math.abs(diff[i]) > 0) {
                     show = true;
                 }
-                mPrev[i] = values[i];
+                mPrev[i] = event.values[i];
             }
             
             if (show) {
                 // only shows if we think the delta is big enough, in an attempt
                 // to detect "serious" moves left/right or up/down
-                android.util.Log.e("test", "sensorChanged " + sensor + " (" + values[0] + ", " + values[1] + ", " + values[2] + ")"
-                                   + " diff(" + diff[0] + " " + diff[1] + " " + diff[2] + ")");
+                android.util.Log.e(TAG, "sensorChanged " + event.sensor.getName() +
+                        " (" + event.values[0] + ", " + event.values[1] + ", " +
+                        event.values[2] + ")" + " diff(" + diff[0] +
+                        " " + diff[1] + " " + diff[2] + ")");
             }
             
             long now = android.os.SystemClock.uptimeMillis();
@@ -128,12 +129,8 @@ public class SensorTest extends GraphicsActivity {
                 }
             }
         }
-        
-        private long mLastGestureTime;
 
-        public void onAccuracyChanged(int sensor, int accuracy) {
-            // TODO Auto-generated method stub
-            
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
         }
     };
 
@@ -141,28 +138,24 @@ public class SensorTest extends GraphicsActivity {
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mSensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
+        mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
         mView = new SampleView(this);
         setContentView(mView);
-//        android.util.Log.d("skia", "create " + mSensorManager);
+        if (Config.LOGD) android.util.Log.d(TAG, "create " + mSensorManager);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        
-        int mask = 0;
-//        mask |= SensorManager.SENSOR_ORIENTATION;
-        mask |= SensorManager.SENSOR_ACCELEROMETER;
-        
-        mSensorManager.registerListener(mListener, mask, SensorManager.SENSOR_DELAY_FASTEST);
-//        android.util.Log.d("skia", "resume " + mSensorManager);
+        mSensorManager.registerListener(mListener, mSensor, SensorManager.SENSOR_DELAY_FASTEST);
+        if (Config.LOGD) android.util.Log.d(TAG, "resume " + mSensorManager);
     }
     
     @Override
     protected void onStop() {
         mSensorManager.unregisterListener(mListener);
         super.onStop();
-//        android.util.Log.d("skia", "stop " + mSensorManager);
+        if (Config.LOGD) android.util.Log.d(TAG, "stop " + mSensorManager);
     }
 
     private class SampleView extends View {
@@ -182,7 +175,8 @@ public class SensorTest extends GraphicsActivity {
             mPath.close();
         }
     
-        @Override protected void onDraw(Canvas canvas) {
+        @Override
+        protected void onDraw(Canvas canvas) {
             Paint paint = mPaint;
 
             canvas.drawColor(Color.WHITE);
@@ -216,4 +210,3 @@ public class SensorTest extends GraphicsActivity {
         }
     }
 }
-
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java b/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
index 223300a8d..183a8ece1 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
@@ -23,7 +23,6 @@ import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;
 
-import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
diff --git a/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java b/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java
index dafa192b6..b8ae074c9 100644
--- a/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java
+++ b/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java
@@ -49,14 +49,9 @@ OS / Morse Code Vibrator
  */
 public class MorseCode extends Activity
 {
-    /** Tag string for our debug logs */
-    private static final String TAG = "MorseCode";
-
     /** Our text view */
     private TextView mTextView;
 
-    ;
-
     /**
      * Initialization of the Activity after it is first created.  Must at least
      * call {@link android.app.Activity#setContentView setContentView()} to
diff --git a/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java b/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java
index 910961d13..98632225c 100644
--- a/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java
+++ b/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java
@@ -20,9 +20,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.hardware.SensorListener;
-import android.util.Log;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -47,13 +48,10 @@ OS / Sensors
  * </table> 
  */
 public class Sensors extends Activity {
-    /** Tag string for our debug logs */
-    private static final String TAG = "Sensors";
-
     private SensorManager mSensorManager;
     private GraphView mGraphView;
 
-    private class GraphView extends View implements SensorListener
+    private class GraphView extends View implements SensorEventListener
     {
         private Bitmap  mBitmap;
         private Paint   mPaint = new Paint();
@@ -172,29 +170,29 @@ public class Sensors extends Activity {
             }
         }
 
-        public void onSensorChanged(int sensor, float[] values) {
+        public void onSensorChanged(SensorEvent event) {
             //Log.d(TAG, "sensor: " + sensor + ", x: " + values[0] + ", y: " + values[1] + ", z: " + values[2]);
             synchronized (this) {
                 if (mBitmap != null) {
                     final Canvas canvas = mCanvas;
                     final Paint paint = mPaint;
-                    if (sensor == SensorManager.SENSOR_ORIENTATION) {
+                    if (event.sensor.getType() == Sensor.TYPE_ORIENTATION) {
                         for (int i=0 ; i<3 ; i++) {
-                            mOrientationValues[i] = values[i];
+                            mOrientationValues[i] = event.values[i];
                         }
                     } else {
                         float deltaX = mSpeed;
                         float newX = mLastX + deltaX;
 
-                        int j = (sensor == SensorManager.SENSOR_MAGNETIC_FIELD) ? 1 : 0;
+                        int j = (event.sensor.getType() == Sensor.TYPE_MAGNETIC_FIELD) ? 1 : 0;
                         for (int i=0 ; i<3 ; i++) {
                             int k = i+j*3;
-                            final float v = mYOffset + values[i] * mScale[j];
+                            final float v = mYOffset + event.values[i] * mScale[j];
                             paint.setColor(mColors[k]);
                             canvas.drawLine(mLastX, mLastValues[k], newX, v, paint);
                             mLastValues[k] = v;
                         }
-                        if (sensor == SensorManager.SENSOR_MAGNETIC_FIELD)
+                        if (event.sensor.getType() == Sensor.TYPE_MAGNETIC_FIELD)
                             mLastX += mSpeed;
                     }
                     invalidate();
@@ -202,9 +200,7 @@ public class Sensors extends Activity {
             }
         }
 
-        public void onAccuracyChanged(int sensor, int accuracy) {
-            // TODO Auto-generated method stub
-            
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
         }
     }
     
@@ -226,10 +222,14 @@ public class Sensors extends Activity {
     @Override
     protected void onResume() {
         super.onResume();
+        mSensorManager.registerListener(mGraphView,
+                mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
+                SensorManager.SENSOR_DELAY_FASTEST);
+        mSensorManager.registerListener(mGraphView,
+                mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD),
+                SensorManager.SENSOR_DELAY_FASTEST);
         mSensorManager.registerListener(mGraphView, 
-                SensorManager.SENSOR_ACCELEROMETER | 
-                SensorManager.SENSOR_MAGNETIC_FIELD | 
-                SensorManager.SENSOR_ORIENTATION,
+                mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION),
                 SensorManager.SENSOR_DELAY_FASTEST);
     }
     
diff --git a/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java b/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java
index c78b54b70..09957c5bf 100644
--- a/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java
+++ b/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java
@@ -20,13 +20,9 @@ import android.widget.TextView;
 import android.content.Context;
 import android.text.method.ScrollingMovementMethod;
 import android.text.method.MovementMethod;
-import android.text.method.KeyListener;
-import android.text.method.TransformationMethod;
 import android.text.Editable;
 import android.util.AttributeSet;
 
-import java.util.Map;
-
 /**
  * This is a TextView that is Editable and by default scrollable,
  * like EditText without a cursor.