numBytes - size of audio data after this header, in bytes.
*
- * @hide pending API council approval
+ *
+ * Not yet ready to be supported, so
+ * @hide
*/
public class WaveHeader {
diff --git a/core/java/android/view/Gravity.java b/core/java/android/view/Gravity.java
index 36d8ce615daca..cf79638de184b 100644
--- a/core/java/android/view/Gravity.java
+++ b/core/java/android/view/Gravity.java
@@ -231,7 +231,7 @@ public class Gravity
}
/**
- * Apply addition gravity behavior based on the overall "display" that an
+ * Apply additional gravity behavior based on the overall "display" that an
* object exists in. This can be used after
* {@link #apply(int, int, int, Rect, int, int, Rect)} to place the object
* within a visible display. By default this moves or clips the object
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index 41779baedaf70..6349288b7e4be 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -111,14 +111,13 @@ public class KeyEvent implements Parcelable {
public static final int KEYCODE_MENU = 82;
public static final int KEYCODE_NOTIFICATION = 83;
public static final int KEYCODE_SEARCH = 84;
- public static final int KEYCODE_PLAYPAUSE = 85;
- public static final int KEYCODE_STOP = 86;
- public static final int KEYCODE_NEXTSONG = 87;
- public static final int KEYCODE_PREVIOUSSONG = 88;
- public static final int KEYCODE_REWIND = 89;
- public static final int KEYCODE_FORWARD = 90;
+ public static final int KEYCODE_MEDIA_PLAY_PAUSE= 85;
+ public static final int KEYCODE_MEDIA_STOP = 86;
+ public static final int KEYCODE_MEDIA_NEXT = 87;
+ public static final int KEYCODE_MEDIA_PREVIOUS = 88;
+ public static final int KEYCODE_MEDIA_REWIND = 89;
+ public static final int KEYCODE_MEDIA_FAST_FORWARD = 90;
public static final int KEYCODE_MUTE = 91;
- private static final int LAST_KEYCODE = KEYCODE_MUTE;
// NOTE: If you add a new keycode here you must also add it to:
// isSystem()
@@ -127,7 +126,15 @@ public class KeyEvent implements Parcelable {
// frameworks/base/core/res/res/values/attrs.xml
// commands/monkey/Monkey.java
// emulator?
+ //
+ // Also Android currently does not reserve code ranges for vendor-
+ // specific key codes. If you have new key codes to have, you
+ // MUST contribute a patch to the open source project to define
+ // those new codes. This is intended to maintain a consistent
+ // set of key code definitions across all Android devices.
+ private static final int LAST_KEYCODE = KEYCODE_MUTE;
+
/**
* @deprecated There are now more than MAX_KEYCODE keycodes.
* Use {@link #getMaxKeyCode()} instead.
@@ -582,12 +589,12 @@ public class KeyEvent implements Parcelable {
case KEYCODE_MUTE:
case KEYCODE_POWER:
case KEYCODE_HEADSETHOOK:
- case KEYCODE_PLAYPAUSE:
- case KEYCODE_STOP:
- case KEYCODE_NEXTSONG:
- case KEYCODE_PREVIOUSSONG:
- case KEYCODE_REWIND:
- case KEYCODE_FORWARD:
+ case KEYCODE_MEDIA_PLAY_PAUSE:
+ case KEYCODE_MEDIA_STOP:
+ case KEYCODE_MEDIA_NEXT:
+ case KEYCODE_MEDIA_PREVIOUS:
+ case KEYCODE_MEDIA_REWIND:
+ case KEYCODE_MEDIA_FAST_FORWARD:
case KEYCODE_CAMERA:
case KEYCODE_FOCUS:
case KEYCODE_SEARCH:
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b26be6600107a..ec1c7332a0d2a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7462,7 +7462,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback {
}
/**
- * Provide haptic feedback to the user for this view.
+ * BZZZTT!!1!
+ *
+ * Provide haptic feedback to the user for this view.
*
*
The framework will provide haptic feedback for some built in actions,
* such as long presses, but you may wish to provide feedback for your
@@ -7479,7 +7481,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback {
}
/**
- * Like {@link #performHapticFeedback(int)}, with additional options.
+ * BZZZTT!!1!
+ *
+ *
Like {@link #performHapticFeedback(int)}, with additional options.
*
* @param feedbackConstant One of the constants defined in
* {@link HapticFeedbackConstants}
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java
index d3f48c6a9a56e..8e1524bd839d8 100644
--- a/core/java/android/view/ViewConfiguration.java
+++ b/core/java/android/view/ViewConfiguration.java
@@ -267,7 +267,6 @@ public class ViewConfiguration {
* @return the duration in milliseconds between the first tap's up event and
* the second tap's down event for an interaction to be considered a
* double-tap.
- * @hide pending API council
*/
public static int getDoubleTapTimeout() {
return DOUBLE_TAP_TIMEOUT;
@@ -324,7 +323,6 @@ public class ViewConfiguration {
/**
* @return Distance between the first touch and second touch to still be
* considered a double tap
- * @hide pending API council
*/
public int getScaledDoubleTapSlop() {
return mDoubleTapSlop;
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index c1e9ed8efa0b2..367c9a22d953c 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -186,9 +186,7 @@ public class ViewDebug {
/**
* This annotation can be used to mark fields and methods to be dumped when
* the view is captured. Methods with this annotation must have no arguments
- * and must return .
- *
- * @hide pending API Council approval
+ * and must return a valid type of data.
*/
@Target({ ElementType.FIELD, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@@ -1345,13 +1343,11 @@ public class ViewDebug {
}
/**
- * dump view info for id based instrument test generation
+ * Dump view info for id based instrument test generation
* (and possibly further data analysis). The results are dumped
* to the log.
* @param tag for log
* @param view for dump
- *
- * @hide pending API Council approval
*/
public static void dumpCapturedView(String tag, Object view) {
Class klass = view.getClass();
diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java
index 4230afad7993c..26e5cbca7f0a7 100644
--- a/core/java/android/view/ViewTreeObserver.java
+++ b/core/java/android/view/ViewTreeObserver.java
@@ -102,8 +102,6 @@ public final class ViewTreeObserver {
/**
* Interface definition for a callback to be invoked when
* something in the view tree has been scrolled.
- *
- * @hide pending API council approval
*/
public interface OnScrollChangedListener {
/**
@@ -115,7 +113,9 @@ public final class ViewTreeObserver {
/**
* Parameters used with OnComputeInternalInsetsListener.
- * {@hide pending API Council approval}
+ *
+ * We are not yet ready to commit to this API and support it, so
+ * @hide
*/
public final static class InternalInsetsInfo {
/**
@@ -200,7 +200,9 @@ public final class ViewTreeObserver {
/**
* Interface definition for a callback to be invoked when layout has
* completed and the client can compute its interior insets.
- * {@hide pending API Council approval}
+ *
+ * We are not yet ready to commit to this API and support it, so
+ * @hide
*/
public interface OnComputeInternalInsetsListener {
/**
@@ -381,8 +383,6 @@ public final class ViewTreeObserver {
* @param listener The callback to add
*
* @throws IllegalStateException If {@link #isAlive()} returns false
- *
- * @hide pending API council approval
*/
public void addOnScrollChangedListener(OnScrollChangedListener listener) {
checkIsAlive();
@@ -402,8 +402,6 @@ public final class ViewTreeObserver {
* @throws IllegalStateException If {@link #isAlive()} returns false
*
* @see #addOnScrollChangedListener(OnScrollChangedListener)
- *
- * @hide pending API council approval
*/
public void removeOnScrollChangedListener(OnScrollChangedListener victim) {
checkIsAlive();
@@ -454,7 +452,9 @@ public final class ViewTreeObserver {
* @param listener The callback to add
*
* @throws IllegalStateException If {@link #isAlive()} returns false
- * {@hide pending API Council approval}
+ *
+ * We are not yet ready to commit to this API and support it, so
+ * @hide
*/
public void addOnComputeInternalInsetsListener(OnComputeInternalInsetsListener listener) {
checkIsAlive();
@@ -475,7 +475,9 @@ public final class ViewTreeObserver {
* @throws IllegalStateException If {@link #isAlive()} returns false
*
* @see #addOnComputeInternalInsetsListener(OnComputeInternalInsetsListener)
- * {@hide pending API Council approval}
+ *
+ * We are not yet ready to commit to this API and support it, so
+ * @hide
*/
public void removeOnComputeInternalInsetsListener(OnComputeInternalInsetsListener victim) {
checkIsAlive();
diff --git a/core/java/android/webkit/WebHistoryItem.java b/core/java/android/webkit/WebHistoryItem.java
index a408e0670d087..fd26b9840176c 100644
--- a/core/java/android/webkit/WebHistoryItem.java
+++ b/core/java/android/webkit/WebHistoryItem.java
@@ -101,8 +101,6 @@ public class WebHistoryItem implements Cloneable {
* url, the final url may be different as there might have been
* redirects while loading the site.
* @return The original url of this history item.
- *
- * @hide pending API Council approval
*/
public String getOriginalUrl() {
return mOriginalUrl;
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 1822ba4a97a63..a5846ed077787 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -909,8 +909,6 @@ public class WebView extends AbsoluteLayout
* the javascript property window.navigator.isOnline and
* generates the online/offline event as specified in HTML5, sec. 5.7.7
* @param networkUp boolean indicating if network is available
- *
- * @hide pending API Council approval
*/
public void setNetworkAvailable(boolean networkUp) {
mWebViewCore.sendMessage(EventHub.SET_NETWORK_STATE,
@@ -1776,8 +1774,6 @@ public class WebView extends AbsoluteLayout
* Also, there may have been redirects resulting in a different url to that
* originally requested.
* @return The url that was originally requested for the current page.
- *
- * @hide pending API Council approval
*/
public String getOriginalUrl() {
WebHistoryItem h = mCallbackProxy.getBackForwardList().getCurrentItem();
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 05636871064a2..772ad8971d204 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 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 bbabaaaf74ac6..4e466a09de7e4 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 da90a9f402944..baa6833fb1a8c 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 a2ec83fb49341..b162a0eba1f4a 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 f864690b60f82..2c9714e318ba3 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 a5dbd9883469c..c9c217a6f2dfd 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 febc95643a050..c9ace0a35fe17 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 4c5df2f4c8152..6d3a2d3602c08 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();
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 3a70d9acc1e7c..9f6ebeded2ae6 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -203,12 +203,14 @@
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index e27227a82bca5..f90929a67ffd9 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -850,12 +850,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h
index efa6d2bdd3c33..571e47b22d867 100644
--- a/include/ui/KeycodeLabels.h
+++ b/include/ui/KeycodeLabels.h
@@ -107,12 +107,12 @@ static const KeycodeLabel KEYCODES[] = {
{ "MENU", 82 },
{ "NOTIFICATION", 83 },
{ "SEARCH", 84 },
- { "PLAYPAUSE", 85 },
- { "STOP", 86 },
- { "NEXTSONG", 87 },
- { "PREVIOUSSONG", 88 },
- { "REWIND", 89 },
- { "FORWARD", 90 },
+ { "MEDIA_PLAY_PAUSE", 85 },
+ { "MEDIA_STOP", 86 },
+ { "MEDIA_NEXT", 87 },
+ { "MEDIA_PREVIOUS", 88 },
+ { "MEDIA_REWIND", 89 },
+ { "MEDIA_FAST_FORWARD", 90 },
{ "MUTE", 91 },
// NOTE: If you add a new keycode here you must also add it to:
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index 2f0007fadadc7..8f05cec8e5012 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -272,7 +272,6 @@ public class RingtoneManager {
* manager is returning.
*
* @return The stream type.
- * @hide Pending API Council approval
*/
public int inferStreamType() {
switch (mType) {
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 921ce77cf8871..559542a474c7c 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -104,8 +104,6 @@ public class TelephonyManager {
* @see #EXTRA_STATE
* @see #EXTRA_INCOMING_NUMBER
* @see #getCallState
- *
- * @hide pending API Council approval
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_PHONE_STATE_CHANGED =
@@ -122,32 +120,24 @@ public class TelephonyManager {
*
* Retrieve with
* {@link android.content.Intent#getStringExtra(String)}.
- *
- * @hide pending API Council approval
*/
public static final String EXTRA_STATE = Phone.STATE_KEY;
/**
* Value used with {@link #EXTRA_STATE} corresponding to
* {@link #CALL_STATE_IDLE}.
- *
- * @hide pending API Council approval
*/
public static final String EXTRA_STATE_IDLE = Phone.State.IDLE.toString();
/**
* Value used with {@link #EXTRA_STATE} corresponding to
* {@link #CALL_STATE_RINGING}.
- *
- * @hide pending API Council approval
*/
public static final String EXTRA_STATE_RINGING = Phone.State.RINGING.toString();
/**
* Value used with {@link #EXTRA_STATE} corresponding to
* {@link #CALL_STATE_OFFHOOK}.
- *
- * @hide pending API Council approval
*/
public static final String EXTRA_STATE_OFFHOOK = Phone.State.OFFHOOK.toString();
@@ -159,8 +149,6 @@ public class TelephonyManager {
*
* Retrieve with
* {@link android.content.Intent#getStringExtra(String)}.
- *
- * @hide pending API Council approval
*/
public static final String EXTRA_INCOMING_NUMBER = "incoming_number";
diff --git a/test-runner/android/test/ProviderTestCase2.java b/test-runner/android/test/ProviderTestCase2.java
index 714b77b56bb67..ac17ebf47923b 100644
--- a/test-runner/android/test/ProviderTestCase2.java
+++ b/test-runner/android/test/ProviderTestCase2.java
@@ -8,10 +8,15 @@ import android.test.mock.MockContentResolver;
import android.database.DatabaseUtils;
/**
- * If you would like to test a single content provider with an
- * {@link android.test.InstrumentationTestCase}, this provides some of the boiler plate in
- * {@link #setUp} and {@link #tearDown}.
- * @hide pending API council approval
+ * This TestCase class provides a framework for isolated testing of a single
+ * ContentProvider. It uses a {@link android.test.mock.MockContentResolver} to
+ * access the provider, restricts the provider to an isolated area of the
+ * filesystem (for safely creating & modifying databases & files), and injects
+ * {@link android.test.IsolatedContext} to isolate the ContentProvider from the
+ * rest of the running system.
+ *
+ *
This environment is created automatically by {@link #setUp} and {@link
+ * #tearDown}.
*/
public abstract class ProviderTestCase2 extends AndroidTestCase {
@@ -79,4 +84,4 @@ public abstract class ProviderTestCase2 extends Andro
return resolver;
}
-}
\ No newline at end of file
+}
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index d6277fae94df6..3bee3b6f90a28 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -265,7 +265,6 @@ public class WifiConfiguration implements Parcelable {
wepKeys[i] = null;
}
- /** {@hide pending API Council approval} */
public String toString() {
StringBuffer sbuf = new StringBuffer();
if (this.status == WifiConfiguration.Status.CURRENT) {