diff options
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 1 | ||||
| -rw-r--r-- | core/java/android/widget/AlphabetIndexer.java | 1 | ||||
| -rw-r--r-- | core/java/android/widget/CursorAdapter.java | 1 | ||||
| -rw-r--r-- | core/java/android/widget/MediaController.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/ResourceCursorAdapter.java | 1 | ||||
| -rw-r--r-- | core/java/android/widget/Scroller.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/VideoView.java | 4 |
8 files changed, 4 insertions, 12 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 0563687..772ad89 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -944,7 +944,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te /** * Returns the list's text filter, if available. * @return the list's text filter or null if filtering isn't enabled - * @hide pending API Council approval */ public CharSequence getTextFilter() { if (mTextFilterEnabled && mTextFilter != null) { diff --git a/core/java/android/widget/AlphabetIndexer.java b/core/java/android/widget/AlphabetIndexer.java index bbabaaa..4e466a0 100644 --- a/core/java/android/widget/AlphabetIndexer.java +++ b/core/java/android/widget/AlphabetIndexer.java @@ -30,7 +30,6 @@ import android.util.SparseIntArray; * Your adapter is responsible for updating the cursor by calling {@link #setCursor} if the * cursor changes. {@link #getPositionForSection} method does the binary search for the starting * index of a given section (alphabet). - * @hide pending API council approval */ public class AlphabetIndexer extends DataSetObserver implements SectionIndexer { diff --git a/core/java/android/widget/CursorAdapter.java b/core/java/android/widget/CursorAdapter.java index da90a9f..baa6833 100644 --- a/core/java/android/widget/CursorAdapter.java +++ b/core/java/android/widget/CursorAdapter.java @@ -354,7 +354,6 @@ public abstract class CursorAdapter extends BaseAdapter implements Filterable, * sub classes. * * @see ContentObserver#onChange(boolean) - * @hide pending API Council approval */ protected void onContentChanged() { if (mAutoRequery && mCursor != null && !mCursor.isClosed()) { diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java index a2ec83f..b162a0e 100644 --- a/core/java/android/widget/MediaController.java +++ b/core/java/android/widget/MediaController.java @@ -388,12 +388,12 @@ public class MediaController extends FrameLayout { int keyCode = event.getKeyCode(); if (event.getRepeatCount() == 0 && event.isDown() && ( keyCode == KeyEvent.KEYCODE_HEADSETHOOK || - keyCode == KeyEvent.KEYCODE_PLAYPAUSE || + keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE || keyCode == KeyEvent.KEYCODE_SPACE)) { doPauseResume(); show(sDefaultTimeout); return true; - } else if (keyCode == KeyEvent.KEYCODE_STOP) { + } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP) { if (mPlayer.isPlaying()) { mPlayer.pause(); updatePausePlay(); diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index f864690..2c9714e 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -1062,8 +1062,6 @@ public class PopupWindow { * @param height the new height, can be -1 to ignore * @param force reposition the window even if the specified position * already seems to correspond to the LayoutParams - * - * @hide pending API council approval */ public void update(int x, int y, int width, int height, boolean force) { if (width != -1) { diff --git a/core/java/android/widget/ResourceCursorAdapter.java b/core/java/android/widget/ResourceCursorAdapter.java index a5dbd98..c9c217a 100644 --- a/core/java/android/widget/ResourceCursorAdapter.java +++ b/core/java/android/widget/ResourceCursorAdapter.java @@ -61,7 +61,6 @@ public abstract class ResourceCursorAdapter extends CursorAdapter { * @param autoRequery If true the adapter will call requery() on the * cursor whenever it changes so the most recent * data is always displayed. - * @hide Pending API Council approval */ public ResourceCursorAdapter(Context context, int layout, Cursor c, boolean autoRequery) { super(context, c, autoRequery); diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java index febc956..c9ace0a 100644 --- a/core/java/android/widget/Scroller.java +++ b/core/java/android/widget/Scroller.java @@ -135,7 +135,6 @@ public class Scroller { * Returns the start X offset in the scroll. * * @return The start X offset as an absolute distance from the origin. - * @hide pending API council */ public final int getStartX() { return mStartX; @@ -145,7 +144,6 @@ public class Scroller { * Returns the start Y offset in the scroll. * * @return The start Y offset as an absolute distance from the origin. - * @hide pending API council */ public final int getStartY() { return mStartY; diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java index 4c5df2f..6d3a2d3 100644 --- a/core/java/android/widget/VideoView.java +++ b/core/java/android/widget/VideoView.java @@ -460,7 +460,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { mMediaPlayer != null && mMediaController != null) { if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK || - keyCode == KeyEvent.KEYCODE_PLAYPAUSE) { + keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) { if (mMediaPlayer.isPlaying()) { pause(); mMediaController.show(); @@ -469,7 +469,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { mMediaController.hide(); } return true; - } else if (keyCode == KeyEvent.KEYCODE_STOP + } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP && mMediaPlayer.isPlaying()) { pause(); mMediaController.show(); |