am 959f517c: Merge "Remove illegal @Override on interface method." into honeycomb

* commit '959f517c248d3c6726b4bd7126317332da7696a1':
  Remove illegal @Override on interface method.
This commit is contained in:
Xavier Ducrohet
2011-01-18 08:25:24 -08:00
committed by Android Git Automerger
4 changed files with 7 additions and 10 deletions

View File

@@ -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;

View File

@@ -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.

View File

@@ -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);
}
}

View File

@@ -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) {