diff --git a/samples/ApiDemos/src/com/example/android/apis/app/Animation.java b/samples/ApiDemos/src/com/example/android/apis/app/Animation.java index 90831f5d5..5ba41c497 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/Animation.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/Animation.java @@ -22,7 +22,6 @@ import com.example.android.apis.R; import com.example.android.apis.view.Controls1; import android.app.Activity; -import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; import android.view.View; diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilter.java b/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilter.java index bb843e57f..d5b3debfd 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilter.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilter.java @@ -20,8 +20,6 @@ package com.example.android.apis.app; // class is in a sub-package. import android.app.Activity; import android.content.ComponentName; -import android.content.Context; -import android.os.RemoteException; import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; @@ -29,7 +27,6 @@ import android.widget.Button; import com.example.android.apis.R; - /** * Front-end for launching {@link ContactsFilterInstrumentation} example * instrumentation class. diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilterInstrumentation.java b/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilterInstrumentation.java index 04bb671a1..68953630f 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilterInstrumentation.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilterInstrumentation.java @@ -23,8 +23,6 @@ import android.view.KeyEvent; 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 diff --git a/samples/ApiDemos/src/com/example/android/apis/app/DefaultValues.java b/samples/ApiDemos/src/com/example/android/apis/app/DefaultValues.java index 35bdf13fd..494a2ea02 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/DefaultValues.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/DefaultValues.java @@ -19,7 +19,6 @@ package com.example.android.apis.app; import com.example.android.apis.ApiDemosApplication; import com.example.android.apis.R; -import android.app.Application; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceActivity; diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java b/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java index 27708f4c5..6e71207be 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java @@ -43,9 +43,9 @@ public class ForegroundService extends Service { static final String ACTION_FOREGROUND = "com.example.android.apis.FOREGROUND"; static final String ACTION_BACKGROUND = "com.example.android.apis.BACKGROUND"; - private static final Class[] mStartForegroundSignature = new Class[] { + private static final Class[] mStartForegroundSignature = new Class[] { int.class, Notification.class}; - private static final Class[] mStopForegroundSignature = new Class[] { + private static final Class[] mStopForegroundSignature = new Class[] { boolean.class}; private NotificationManager mNM; diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ForegroundServiceController.java b/samples/ApiDemos/src/com/example/android/apis/app/ForegroundServiceController.java index a6a6ef366..4849a6b73 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/ForegroundServiceController.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/ForegroundServiceController.java @@ -21,14 +21,12 @@ package com.example.android.apis.app; import com.example.android.apis.R; import android.app.Activity; -import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; - /** *

Example of explicitly starting and stopping the {@link ForegroundService}. */ diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java b/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java index aa151fec8..32d128022 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java @@ -28,7 +28,6 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; import android.widget.LinearLayout.LayoutParams; /** diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LocalSample.java b/samples/ApiDemos/src/com/example/android/apis/app/LocalSample.java index 1bb26e936..0e4b66e97 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/LocalSample.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/LocalSample.java @@ -20,8 +20,6 @@ package com.example.android.apis.app; // class is in a sub-package. import android.app.Activity; import android.content.ComponentName; -import android.content.Context; -import android.os.RemoteException; import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; @@ -29,7 +27,6 @@ import android.widget.Button; import com.example.android.apis.R; - /** * Front-end for launching {@link LocalSampleInstrumentation} example * instrumentation class. diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LocalSampleInstrumentation.java b/samples/ApiDemos/src/com/example/android/apis/app/LocalSampleInstrumentation.java index e0f6163aa..aabfec38f 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/LocalSampleInstrumentation.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/LocalSampleInstrumentation.java @@ -23,8 +23,6 @@ import android.view.KeyEvent; import android.os.Bundle; import android.util.Log; -import java.util.Map; - /** * This is an example implementation of the {@link android.app.Instrumentation} * class demonstrating instrumentation against one of this application's sample diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LocalService.java b/samples/ApiDemos/src/com/example/android/apis/app/LocalService.java index 79324a43c..815fa6baa 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/LocalService.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/LocalService.java @@ -23,7 +23,6 @@ import android.app.Service; import android.content.Intent; import android.os.Binder; import android.os.IBinder; -import android.os.Parcel; import android.util.Log; import android.widget.Toast; @@ -45,6 +44,10 @@ import com.example.android.apis.R; public class LocalService extends Service { private NotificationManager mNM; + // Unique Identification Number for the Notification. + // We use it on Notification start, and to cancel it. + private int NOTIFICATION = R.string.local_service_started; + /** * Class for clients to access. Because we know this service always * runs in the same process as its clients, we don't need to deal with @@ -75,7 +78,7 @@ public class LocalService extends Service { @Override public void onDestroy() { // Cancel the persistent notification. - mNM.cancel(R.string.local_service_started); + mNM.cancel(NOTIFICATION); // Tell the user we stopped. Toast.makeText(this, R.string.local_service_stopped, Toast.LENGTH_SHORT).show(); @@ -110,8 +113,7 @@ public class LocalService extends Service { text, contentIntent); // Send the notification. - // We use a layout id because it is a unique number. We use it later to cancel. - mNM.notify(R.string.local_service_started, notification); + mNM.notify(NOTIFICATION, notification); } } diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceBinding.java b/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceBinding.java index ddcfad5fc..6f72d76bd 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceBinding.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceBinding.java @@ -30,7 +30,6 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.Toast; - /** *

Example of binding and unbinding to the {@link LocalService}. * This demonstrates the implementation of a service which the client will @@ -61,7 +60,7 @@ public class LocalServiceBinding extends Activity { // service that we know is running in our own process, we can // cast its IBinder to a concrete class and directly access it. mBoundService = ((LocalService.LocalBinder)service).getService(); - + // Tell the user about this for our demo. Toast.makeText(LocalServiceBinding.this, R.string.local_service_connected, Toast.LENGTH_SHORT).show(); diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceController.java b/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceController.java index 604124912..b663340c4 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceController.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceController.java @@ -21,14 +21,12 @@ package com.example.android.apis.app; import com.example.android.apis.R; import android.app.Activity; -import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; - /** *

Example of explicitly starting and stopping the {@link LocalService}. * This demonstrates the implementation of a service that runs in the same diff --git a/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java b/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java index f51b3b80f..42599ab27 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java @@ -19,14 +19,11 @@ package com.example.android.apis.app; import com.example.android.apis.R; import android.app.Activity; -import android.app.NotificationManager; -import android.content.Context; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.widget.ArrayAdapter; -import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; diff --git a/samples/ApiDemos/src/com/example/android/apis/app/NotificationDisplay.java b/samples/ApiDemos/src/com/example/android/apis/app/NotificationDisplay.java index a6c20ea0c..25b5d56ce 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/NotificationDisplay.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/NotificationDisplay.java @@ -24,14 +24,11 @@ import android.app.Activity; import android.app.NotificationManager; import android.content.Intent; import android.os.Bundle; -import android.view.Gravity; import android.view.View; import android.view.WindowManager; import android.widget.ImageButton; -import android.widget.LinearLayout; import android.widget.RelativeLayout; - /** * Activity used by StatusBarNotification to show the notification to the user. */ diff --git a/samples/ApiDemos/src/com/example/android/apis/app/NotifyingController.java b/samples/ApiDemos/src/com/example/android/apis/app/NotifyingController.java index a0de699bb..b8b4e3f7f 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/NotifyingController.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/NotifyingController.java @@ -21,14 +21,12 @@ package com.example.android.apis.app; import com.example.android.apis.R; import android.app.Activity; -import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; - /** * Controller to start and stop a service. The serivce will update a status bar * notification every 5 seconds for a minute. diff --git a/samples/ApiDemos/src/com/example/android/apis/app/NotifyingService.java b/samples/ApiDemos/src/com/example/android/apis/app/NotifyingService.java index e580978eb..3b8139f93 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/NotifyingService.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/NotifyingService.java @@ -30,7 +30,6 @@ import android.os.ConditionVariable; import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; -import android.widget.RemoteViews; /** * This is an example of service that will update its status bar balloon diff --git a/samples/ApiDemos/src/com/example/android/apis/app/PreferencesFromXml.java b/samples/ApiDemos/src/com/example/android/apis/app/PreferencesFromXml.java index 23461c6bf..63bbac224 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/PreferencesFromXml.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/PreferencesFromXml.java @@ -18,9 +18,7 @@ package com.example.android.apis.app; import com.example.android.apis.R; -import android.content.SharedPreferences; import android.os.Bundle; -import android.preference.Preference; import android.preference.PreferenceActivity; public class PreferencesFromXml extends PreferenceActivity { diff --git a/samples/ApiDemos/src/com/example/android/apis/app/QuickContactsDemo.java b/samples/ApiDemos/src/com/example/android/apis/app/QuickContactsDemo.java index 1ee574299..004e568bf 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/QuickContactsDemo.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/QuickContactsDemo.java @@ -75,8 +75,6 @@ public class QuickContactsDemo extends ListActivity { @Override public void bindView(View view, Context context, Cursor cursor) { final ContactListItemCache cache = (ContactListItemCache) view.getTag(); - TextView nameView = cache.nameView; - QuickContactBadge photoView = cache.photoView; // Set the name cursor.copyStringToBuffer(SUMMARY_NAME_COLUMN_INDEX, cache.nameBuffer); int size = cache.nameBuffer.sizeCopied; diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ReceiveResult.java b/samples/ApiDemos/src/com/example/android/apis/app/ReceiveResult.java index 4e248b984..22ae7f442 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/ReceiveResult.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/ReceiveResult.java @@ -18,8 +18,6 @@ package com.example.android.apis.app; // Need the following import to get access to the app resources, since this // class is in a sub-package. -import java.util.Map; - import com.example.android.apis.R; import android.app.Activity; @@ -31,8 +29,6 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; -import java.util.Map; - /** * Shows how an activity can send data to its launching activity when done.y. *

This can be used, for example, to implement a dialog alowing the user to diff --git a/samples/ApiDemos/src/com/example/android/apis/app/RedirectGetter.java b/samples/ApiDemos/src/com/example/android/apis/app/RedirectGetter.java index 982317c6e..c96e1bba9 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/RedirectGetter.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/RedirectGetter.java @@ -32,8 +32,11 @@ import android.widget.TextView; */ public class RedirectGetter extends Activity { + private String mTextPref; + private TextView mText; + @Override - protected void onCreate(Bundle savedInstanceState) + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -45,9 +48,12 @@ public class RedirectGetter extends Activity // The text being set. mText = (TextView)findViewById(R.id.text); + + // Display the stored values, or if not stored initialize with an empty String + loadPrefs(); } - private final boolean loadPrefs() + private final void loadPrefs() { // Retrieve the current redirect values. // NOTE: because this preference is shared between multiple @@ -58,10 +64,9 @@ public class RedirectGetter extends Activity mTextPref = preferences.getString("text", null); if (mTextPref != null) { mText.setText(mTextPref); - return true; + } else { + mText.setText(""); } - - return false; } private OnClickListener mApplyListener = new OnClickListener() @@ -79,8 +84,4 @@ public class RedirectGetter extends Activity finish(); } }; - - private String mTextPref; - TextView mText; } - diff --git a/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.java b/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.java index c0debbcaf..726d6d7af 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.java @@ -29,8 +29,6 @@ import android.os.Process; import android.os.RemoteCallbackList; import android.widget.Toast; -import java.util.HashMap; - // Need the following import to get access to the app resources, since this // class is in a sub-package. import com.example.android.apis.R; diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ServiceStartArguments.java b/samples/ApiDemos/src/com/example/android/apis/app/ServiceStartArguments.java index f4f9af1fb..be5487ec5 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/ServiceStartArguments.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/ServiceStartArguments.java @@ -49,7 +49,6 @@ import com.example.android.apis.R; */ public class ServiceStartArguments extends Service { private NotificationManager mNM; - private Intent mInvokeIntent; private volatile Looper mServiceLooper; private volatile ServiceHandler mServiceHandler; @@ -102,10 +101,6 @@ public class ServiceStartArguments extends Service { Toast.makeText(this, R.string.service_created, Toast.LENGTH_SHORT).show(); - - // This is who should be launched if the user selects our persistent - // notification. - mInvokeIntent = new Intent(this, ServiceStartArgumentsController.class); // Start up the thread running the service. Note that we create a // separate thread because the service normally runs in the process's diff --git a/samples/ApiDemos/src/com/example/android/apis/app/SetWallpaperActivity.java b/samples/ApiDemos/src/com/example/android/apis/app/SetWallpaperActivity.java index 8630b1c2c..f3d4ffb3a 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/SetWallpaperActivity.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/SetWallpaperActivity.java @@ -29,7 +29,6 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; -import android.view.WindowManager; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.ImageView; diff --git a/samples/ApiDemos/src/com/example/android/apis/app/WallpaperActivity.java b/samples/ApiDemos/src/com/example/android/apis/app/WallpaperActivity.java index 8d7f5a1b4..7b5eea264 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/WallpaperActivity.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/WallpaperActivity.java @@ -22,7 +22,6 @@ import com.example.android.apis.R; import android.app.Activity; import android.os.Bundle; -import android.view.WindowManager; /** *

Wallpaper Activity