Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eabbd9f authored by Dianne Hackborn's avatar Dianne Hackborn Committed by The Android Open Source Project
Browse files

AI 145382: API review: change new media keycode names to avoid ambiguity. 

  Updates the key maps.  During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...!  So this is now changed to match.
  BUG=1779435

Automated import of CL 145382
parent d6fbffe6

api/3.xml

+707 −59
Original line number Diff line number Diff line
@@ -27950,6 +27950,17 @@ 
 visibility="public"

>

</field>

<field name="ACTION_INPUT_METHOD_CHANGED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.action.INPUT_METHOD_CHANGED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_INSERT"

 type="java.lang.String"

 transient="false"
@@ -36662,6 +36673,23 @@ 
<exception name="Resources.NotFoundException" type="android.content.res.Resources.NotFoundException">

</exception>

</method>

<method name="openRawResource"

 return="java.io.InputStream"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="id" type="int">

</parameter>

<parameter name="value" type="android.util.TypedValue">

</parameter>

<exception name="Resources.NotFoundException" type="android.content.res.Resources.NotFoundException">

</exception>

</method>

<method name="openRawResourceFd"

 return="android.content.res.AssetFileDescriptor"

 abstract="false"
@@ -60555,6 +60583,17 @@ 
 visibility="public"

>

</method>

<method name="isProximityCorrectionEnabled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isShifted"

 return="boolean"

 abstract="false"
@@ -60717,6 +60756,19 @@ 
<parameter name="previewEnabled" type="boolean">

</parameter>

</method>

<method name="setProximityCorrectionEnabled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="enabled" type="boolean">

</parameter>

</method>

<method name="setShifted"

 return="boolean"

 abstract="false"
@@ -67477,6 +67529,17 @@ 
<parameter name="context" type="android.content.Context">

</parameter>

</method>

<method name="inferStreamType"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isDefault"

 return="boolean"

 abstract="false"
@@ -78380,6 +78443,17 @@ 
 visibility="public"

>

</method>

<method name="getThread"

 return="java.lang.Thread"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="loop"

 return="void"

 abstract="false"
@@ -88523,6 +88597,17 @@ 
 visibility="public"

>

</field>

<field name="NUMBER_OF_SONGS_FOR_ARTIST"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;numsongs_by_artist&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</interface>

<class name="MediaStore.Audio.Albums"

 extends="java.lang.Object"
@@ -91205,6 +91290,17 @@ 
 visibility="public"

>

</field>

<field name="BACKGROUND_DATA"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;background_data&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="BLUETOOTH_ON"

 type="java.lang.String"

 transient="false"
@@ -91402,6 +91498,28 @@ 
 visibility="public"

>

</field>

<field name="WIFI_MAX_DHCP_RETRY_COUNT"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;wifi_max_dhcp_retry_count&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;wifi_mobile_data_transition_wakelock_timeout_ms&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON"

 type="java.lang.String"

 transient="false"
@@ -91567,6 +91685,17 @@ 
 visibility="public"

>

</field>

<field name="WIFI_WATCHDOG_WATCH_LIST"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;wifi_watchdog_watch_list&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Settings.SettingNotFoundException"

 extends="android.util.AndroidException"
@@ -92692,6 +92821,50 @@ 
 visibility="public"

>

</field>

<field name="WIFI_SLEEP_POLICY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;wifi_sleep_policy&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WIFI_SLEEP_POLICY_DEFAULT"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WIFI_SLEEP_POLICY_NEVER"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WIFI_STATIC_DNS1"

 type="java.lang.String"

 transient="false"
@@ -95055,6 +95228,17 @@ 
<parameter name="events" type="int">

</parameter>

</method>

<field name="ACTION_PHONE_STATE_CHANGED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.action.PHONE_STATE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CALL_STATE_IDLE"

 type="int"

 transient="false"
@@ -95176,6 +95360,58 @@ 
 visibility="public"

>

</field>

<field name="EXTRA_INCOMING_NUMBER"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;incoming_number&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_STATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;state&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_STATE_IDLE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_STATE_OFFHOOK"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_STATE_RINGING"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NETWORK_TYPE_EDGE"

 type="int"

 transient="false"
@@ -97996,6 +98232,89 @@ 
</exception>

</method>

</class>

<class name="ProviderTestCase2"

 extends="android.test.AndroidTestCase"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="ProviderTestCase2"

 type="android.test.ProviderTestCase2"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="providerClass" type="java.lang.Class&lt;T&gt;">

</parameter>

<parameter name="providerAuthority" type="java.lang.String">

</parameter>

</constructor>

<method name="getMockContentResolver"

 return="android.test.mock.MockContentResolver"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getMockContext"

 return="android.test.IsolatedContext"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getProvider"

 return="T"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="newResolverWithContentProviderFromSql"

 return="android.content.ContentResolver"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="targetContext" type="android.content.Context">

</parameter>

<parameter name="filenamePrefix" type="java.lang.String">

</parameter>

<parameter name="providerClass" type="java.lang.Class&lt;T&gt;">

</parameter>

<parameter name="authority" type="java.lang.String">

</parameter>

<parameter name="databaseName" type="java.lang.String">

</parameter>

<parameter name="databaseVersion" type="int">

</parameter>

<parameter name="sql" type="java.lang.String">

</parameter>

<exception name="IllegalAccessException" type="java.lang.IllegalAccessException">

</exception>

<exception name="InstantiationException" type="java.lang.InstantiationException">

</exception>

</method>

</class>

<class name="RenamingDelegatingContext"

 extends="android.content.ContextWrapper"

 abstract="false"
@@ -119790,17 +120109,6 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_FORWARD"

 type="int"

 transient="false"

 volatile="false"

 value="90"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_G"

 type="int"

 transient="false"
@@ -119922,198 +120230,220 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_MENU"

<field name="KEYCODE_MEDIA_FAST_FORWARD"

 type="int"

 transient="false"

 volatile="false"

 value="82"

 value="90"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MINUS"

<field name="KEYCODE_MEDIA_NEXT"

 type="int"

 transient="false"

 volatile="false"

 value="69"

 value="87"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MUTE"

<field name="KEYCODE_MEDIA_PLAY_PAUSE"

 type="int"

 transient="false"

 volatile="false"

 value="91"

 value="85"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_N"

<field name="KEYCODE_MEDIA_PREVIOUS"

 type="int"

 transient="false"

 volatile="false"

 value="42"

 value="88"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NEXTSONG"

<field name="KEYCODE_MEDIA_REWIND"

 type="int"

 transient="false"

 volatile="false"

 value="87"

 value="89"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NOTIFICATION"

<field name="KEYCODE_MEDIA_STOP"

 type="int"

 transient="false"

 volatile="false"

 value="83"

 value="86"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUM"

<field name="KEYCODE_MENU"

 type="int"

 transient="false"

 volatile="false"

 value="78"

 value="82"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_O"

<field name="KEYCODE_MINUS"

 type="int"

 transient="false"

 volatile="false"

 value="43"

 value="69"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_P"

<field name="KEYCODE_MUTE"

 type="int"

 transient="false"

 volatile="false"

 value="44"

 value="91"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PERIOD"

<field name="KEYCODE_N"

 type="int"

 transient="false"

 volatile="false"

 value="56"

 value="42"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PLAYPAUSE"

<field name="KEYCODE_NOTIFICATION"

 type="int"

 transient="false"

 volatile="false"

 value="85"

 value="83"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PLUS"

<field name="KEYCODE_NUM"

 type="int"

 transient="false"

 volatile="false"

 value="81"

 value="78"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_POUND"

<field name="KEYCODE_O"

 type="int"

 transient="false"

 volatile="false"

 value="18"

 value="43"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_POWER"

<field name="KEYCODE_P"

 type="int"

 transient="false"

 volatile="false"

 value="26"

 value="44"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PERIOD"

 type="int"

 transient="false"

 volatile="false"

 value="56"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PREVIOUSSONG"

<field name="KEYCODE_PLUS"

 type="int"

 transient="false"

 volatile="false"

 value="88"

 value="81"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_Q"

<field name="KEYCODE_POUND"

 type="int"

 transient="false"

 volatile="false"

 value="45"

 value="18"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_R"

<field name="KEYCODE_POWER"

 type="int"

 transient="false"

 volatile="false"

 value="46"

 value="26"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_REWIND"

<field name="KEYCODE_Q"

 type="int"

 transient="false"

 volatile="false"

 value="89"

 value="45"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_R"

 type="int"

 transient="false"

 volatile="false"

 value="46"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -120241,17 +120571,6 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_STOP"

 type="int"

 transient="false"

 volatile="false"

 value="86"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SYM"

 type="int"

 transient="false"
@@ -122772,7 +123091,7 @@ 
<method name="setOrientation"

 return="void"

 abstract="false"

 native="true"

 native="false"

 synchronized="false"

 static="true"

 final="false"
@@ -127779,6 +128098,17 @@ 
<parameter name="context" type="android.content.Context">

</parameter>

</method>

<method name="getDoubleTapTimeout"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getEdgeSlop"

 return="int"

 abstract="false"
@@ -127867,6 +128197,17 @@ 
 visibility="public"

>

</method>

<method name="getScaledDoubleTapSlop"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getScaledEdgeSlop"

 return="int"

 abstract="false"
@@ -128027,6 +128368,21 @@ 
 visibility="public"

>

</constructor>

<method name="dumpCapturedView"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

<parameter name="view" type="java.lang.Object">

</parameter>

</method>

<method name="startHierarchyTracing"

 return="void"

 abstract="false"
@@ -128134,6 +128490,17 @@ 
>

</field>

</class>

<class name="ViewDebug.CapturedViewProperty"

 extends="java.lang.Object"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="java.lang.annotation.Annotation">

</implements>

</class>

<class name="ViewDebug.ExportedProperty"

 extends="java.lang.Object"

 abstract="true"
@@ -130327,6 +130694,19 @@ 
<parameter name="listener" type="android.view.ViewTreeObserver.OnPreDrawListener">

</parameter>

</method>

<method name="addOnScrollChangedListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.view.ViewTreeObserver.OnScrollChangedListener">

</parameter>

</method>

<method name="addOnTouchModeChangeListener"

 return="void"

 abstract="false"
@@ -130412,6 +130792,19 @@ 
<parameter name="victim" type="android.view.ViewTreeObserver.OnPreDrawListener">

</parameter>

</method>

<method name="removeOnScrollChangedListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="victim" type="android.view.ViewTreeObserver.OnScrollChangedListener">

</parameter>

</method>

<method name="removeOnTouchModeChangeListener"

 return="void"

 abstract="false"
@@ -130487,6 +130880,25 @@ 
>

</method>

</interface>

<interface name="ViewTreeObserver.OnScrollChangedListener"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onScrollChanged"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</interface>

<interface name="ViewTreeObserver.OnTouchModeChangeListener"

 abstract="true"

 static="true"
@@ -140184,6 +140596,17 @@ 
 visibility="public"

>

</method>

<method name="getOriginalUrl"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getTitle"

 return="java.lang.String"

 abstract="false"
@@ -141761,6 +142184,17 @@ 
<parameter name="realm" type="java.lang.String">

</parameter>

</method>

<method name="getOriginalUrl"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getPluginList"

 return="android.webkit.PluginList"

 abstract="false"
@@ -142257,6 +142691,19 @@ 
<parameter name="setMap" type="boolean">

</parameter>

</method>

<method name="setNetworkAvailable"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="networkUp" type="boolean">

</parameter>

</method>

<method name="setPictureListener"

 return="void"

 abstract="false"
@@ -143070,6 +143517,17 @@ 
 visibility="public"

>

</method>

<method name="getTextFilter"

 return="java.lang.CharSequence"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getTranscriptMode"

 return="int"

 abstract="false"
@@ -144778,6 +145236,126 @@ 
</parameter>

</method>

</interface>

<class name="AlphabetIndexer"

 extends="android.database.DataSetObserver"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.widget.SectionIndexer">

</implements>

<constructor name="AlphabetIndexer"

 type="android.widget.AlphabetIndexer"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cursor" type="android.database.Cursor">

</parameter>

<parameter name="sortedColumnIndex" type="int">

</parameter>

<parameter name="alphabet" type="java.lang.CharSequence">

</parameter>

</constructor>

<method name="compare"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="word" type="java.lang.String">

</parameter>

<parameter name="letter" type="java.lang.String">

</parameter>

</method>

<method name="getPositionForSection"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="sectionIndex" type="int">

</parameter>

</method>

<method name="getSectionForPosition"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="position" type="int">

</parameter>

</method>

<method name="getSections"

 return="java.lang.Object[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="setCursor"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cursor" type="android.database.Cursor">

</parameter>

</method>

<field name="mAlphabet"

 type="java.lang.CharSequence"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</field>

<field name="mColumnIndex"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</field>

<field name="mDataCursor"

 type="android.database.Cursor"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</field>

</class>

<class name="AnalogClock"

 extends="android.view.View"

 abstract="false"
@@ -146652,6 +147230,17 @@ 
<parameter name="parent" type="android.view.ViewGroup">

</parameter>

</method>

<method name="onContentChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</method>

<method name="runQueryOnBackgroundThread"

 return="android.database.Cursor"

 abstract="false"
@@ -152025,6 +152614,27 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="x" type="int">

</parameter>

<parameter name="y" type="int">

</parameter>

<parameter name="width" type="int">

</parameter>

<parameter name="height" type="int">

</parameter>

<parameter name="force" type="boolean">

</parameter>

</method>

<method name="update"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="anchor" type="android.view.View">

</parameter>

<parameter name="width" type="int">
@@ -153753,6 +154363,22 @@ 
<parameter name="c" type="android.database.Cursor">

</parameter>

</constructor>

<constructor name="ResourceCursorAdapter"

 type="android.widget.ResourceCursorAdapter"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="layout" type="int">

</parameter>

<parameter name="c" type="android.database.Cursor">

</parameter>

<parameter name="autoRequery" type="boolean">

</parameter>

</constructor>

<method name="newView"

 return="android.view.View"

 abstract="false"
@@ -154270,6 +154896,28 @@ 
 visibility="public"

>

</method>

<method name="getStartX"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getStartY"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isFinished"

 return="boolean"

 abstract="false"

api/current.xml

+706 −58

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/KeyEvent.java

+20 −13
Original line number Diff line number Diff line
@@ -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,6 +126,14 @@ 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.
@@ -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:

core/java/android/widget/MediaController.java

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/widget/VideoView.java

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.