From 62e3bb6f93e4b9a64435e9584dcd4b45a8ca2686 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Mon, 17 Jan 2011 17:05:05 -0800
Subject: [PATCH] Remove illegal @Override on interface method.

Samples should compile with 1.5

Change-Id: I029ae9ded4237fd9d4d2d1dbf2c7c537afbbf36b
---
 .../src/com/example/android/apis/app/ActionBarUsage.java  | 2 --
 .../android/apis/app/FragmentListCursorLoader.java        | 8 ++++----
 .../src/com/example/android/apis/app/LoaderThrottle.java  | 6 +++---
 .../com/example/android/apis/view/DragAndDropDemo.java    | 1 -
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ActionBarUsage.java b/samples/ApiDemos/src/com/example/android/apis/app/ActionBarUsage.java
index a61a5827f..1a6a6d156 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/ActionBarUsage.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/ActionBarUsage.java
@@ -80,14 +80,12 @@ public class ActionBarUsage extends Activity implements OnQueryChangeListener {
 
     // The following callbacks are called for the SearchView.OnQueryChangeListener
     // For more about using SearchView, see src/.../view/SearchView1.java and SearchView2.java
-    @Override
     public boolean onQueryTextChanged(String newText) {
         newText = newText.isEmpty() ? "" : "Query so far: " + newText;
         mSearchText.setText(newText);
         return true;
     }
 
-    @Override
     public boolean onSubmitQuery(String query) {
         Toast.makeText(this, "Searching for: " + query + "...", Toast.LENGTH_SHORT).show();
         return true;
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/FragmentListCursorLoader.java b/samples/ApiDemos/src/com/example/android/apis/app/FragmentListCursorLoader.java
index 6c3200e95..f6f227b3a 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/FragmentListCursorLoader.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/FragmentListCursorLoader.java
@@ -98,7 +98,7 @@ public class FragmentListCursorLoader extends Activity {
             item.setActionView(sv);
         }
 
-        @Override public boolean onQueryTextChanged(String newText) {
+        public boolean onQueryTextChanged(String newText) {
             // Called when the action bar search text has changed.  Update
             // the search filter, and restart the loader to do a new query
             // with this filter.
@@ -127,7 +127,7 @@ public class FragmentListCursorLoader extends Activity {
             Contacts.LOOKUP_KEY,
         };
 
-        @Override public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             // This is called when a new Loader needs to be created.  This
             // sample only has one Loader, so we don't care about the ID.
             // First, pick the base URI to use depending on whether we are
@@ -150,13 +150,13 @@ public class FragmentListCursorLoader extends Activity {
                     Contacts.DISPLAY_NAME + " COLLATE LOCALIZED ASC");
         }
 
-        @Override public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
             // Swap the new cursor in.  (The framework will take care of closing the
             // old cursor once we return.)
             mAdapter.swapCursor(data);
         }
 
-        @Override public void onLoaderReset(Loader<Cursor> loader) {
+        public void onLoaderReset(Loader<Cursor> loader) {
             // This is called when the last Cursor provided to onLoadFinished()
             // above is about to be closed.  We need to make sure we are no
             // longer using it.
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.java b/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.java
index 2139679f8..568bfa757 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.java
@@ -482,18 +482,18 @@ public class LoaderThrottle extends Activity {
             MainTable.COLUMN_NAME_DATA,
         };
 
-        @Override public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             CursorLoader cl = new CursorLoader(getActivity(), MainTable.CONTENT_URI,
                     PROJECTION, null, null, null);
             cl.setUpdateThrottle(2000); // update at most every 2 seconds.
             return cl;
         }
 
-        @Override public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
             mAdapter.swapCursor(data);
         }
 
-        @Override public void onLoaderReset(Loader<Cursor> loader) {
+        public void onLoaderReset(Loader<Cursor> loader) {
             mAdapter.swapCursor(null);
         }
     }
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java b/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java
index 1230933a4..e1f3b5619 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java
@@ -46,7 +46,6 @@ public class DragAndDropDemo extends Activity {
 
         mResultText = (TextView) findViewById(R.id.drag_result_text);
         mResultText.setOnDragListener(new View.OnDragListener() {
-            @Override
             public boolean onDrag(View v, DragEvent event) {
                 final int action = event.getAction();
                 switch (action) {