diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-04-14 18:18:03 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-14 18:18:03 -0700 |
| commit | 5e8c31ac31107c0cbc4a103e4f62342b07b5876b (patch) | |
| tree | 7f030540c23ccbe90b9ba0df9990b00126104e3f | |
| parent | 37f8ca1e33a7e92f134344b26780e9a8e0329287 (diff) | |
| parent | 5671777ecb3f9047f5546336a724e5b97bc3dbe0 (diff) | |
| download | frameworks_base-5e8c31ac31107c0cbc4a103e4f62342b07b5876b.zip frameworks_base-5e8c31ac31107c0cbc4a103e4f62342b07b5876b.tar.gz frameworks_base-5e8c31ac31107c0cbc4a103e4f62342b07b5876b.tar.bz2 | |
Merge commit 'korg/cupcake'
129 files changed, 27067 insertions, 1765 deletions
@@ -144,6 +144,28 @@ visibility="public" > </field> +<field name="BIND_APPWIDGET" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.permission.BIND_APPWIDGET"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="BIND_INPUT_METHOD" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.permission.BIND_INPUT_METHOD"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="BLUETOOTH" type="java.lang.String" transient="false" @@ -584,6 +606,17 @@ visibility="public" > </field> +<field name="MOUNT_FORMAT_FILESYSTEMS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.permission.MOUNT_FORMAT_FILESYSTEMS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="MOUNT_UNMOUNT_FILESYSTEMS" type="java.lang.String" transient="false" @@ -1002,6 +1035,17 @@ visibility="public" > </field> +<field name="UPDATE_DEVICE_STATS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.permission.UPDATE_DEVICE_STATS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="VIBRATE" type="java.lang.String" transient="false" @@ -1079,6 +1123,17 @@ visibility="public" > </field> +<field name="WRITE_SECURE_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.permission.WRITE_SECURE_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="WRITE_SETTINGS" type="java.lang.String" transient="false" @@ -1549,6 +1604,17 @@ visibility="public" > </field> +<field name="allowSingleTap" + type="int" + transient="false" + volatile="false" + value="16843353" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="allowTaskReparenting" type="int" transient="false" @@ -1604,6 +1670,17 @@ visibility="public" > </field> +<field name="animateOnClick" + type="int" + transient="false" + volatile="false" + value="16843356" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="animation" type="int" transient="false" @@ -1710,7 +1787,7 @@ value="16843114" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -1736,6 +1813,17 @@ visibility="public" > </field> +<field name="backgroundDimEnabled" + type="int" + transient="false" + volatile="false" + value="16843295" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="baselineAlignBottom" type="int" transient="false" @@ -1824,6 +1912,17 @@ visibility="public" > </field> +<field name="bottomOffset" + type="int" + transient="false" + volatile="false" + value="16843351" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="bottomRightRadius" type="int" transient="false" @@ -1912,6 +2011,17 @@ visibility="public" > </field> +<field name="candidatesTextStyleSpans" + type="int" + transient="false" + volatile="false" + value="16843312" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="capitalize" type="int" transient="false" @@ -1919,7 +2029,7 @@ value="16843113" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -2176,6 +2286,17 @@ visibility="public" > </field> +<field name="codes" + type="int" + transient="false" + volatile="false" + value="16843330" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="collapseColumns" type="int" transient="false" @@ -2297,6 +2418,17 @@ visibility="public" > </field> +<field name="configure" + type="int" + transient="false" + volatile="false" + value="16843357" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="constantSize" type="int" transient="false" @@ -2308,6 +2440,17 @@ visibility="public" > </field> +<field name="content" + type="int" + transient="false" + volatile="false" + value="16843355" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="cropToPadding" type="int" transient="false" @@ -2682,6 +2825,17 @@ visibility="public" > </field> +<field name="dropDownAnchor" + type="int" + transient="false" + volatile="false" + value="16843363" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="dropDownHintAppearance" type="int" transient="false" @@ -2726,6 +2880,17 @@ visibility="public" > </field> +<field name="dropDownWidth" + type="int" + transient="false" + volatile="false" + value="16843362" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="duplicateParentState" type="int" transient="false" @@ -2777,6 +2942,17 @@ value="16843115" static="true" final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="editorExtras" + type="int" + transient="false" + volatile="false" + value="16843300" + static="true" + final="true" deprecated="not deprecated" visibility="public" > @@ -2810,7 +2986,7 @@ value="16842766" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -2990,6 +3166,17 @@ visibility="public" > </field> +<field name="fastScrollEnabled" + type="int" + transient="false" + volatile="false" + value="16843302" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="fillAfter" type="int" transient="false" @@ -3012,6 +3199,17 @@ visibility="public" > </field> +<field name="fillEnabled" + type="int" + transient="false" + volatile="false" + value="16843343" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="fillViewport" type="int" transient="false" @@ -3089,6 +3287,17 @@ visibility="public" > </field> +<field name="footerDividersEnabled" + type="int" + transient="false" + volatile="false" + value="16843311" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="foreground" type="int" transient="false" @@ -3331,6 +3540,17 @@ visibility="public" > </field> +<field name="handle" + type="int" + transient="false" + volatile="false" + value="16843354" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="handleProfiling" type="int" transient="false" @@ -3342,6 +3562,17 @@ visibility="public" > </field> +<field name="hapticFeedbackEnabled" + type="int" + transient="false" + volatile="false" + value="16843358" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="hasCode" type="int" transient="false" @@ -3364,6 +3595,17 @@ visibility="public" > </field> +<field name="headerDividersEnabled" + type="int" + transient="false" + volatile="false" + value="16843310" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="height" type="int" transient="false" @@ -3397,6 +3639,17 @@ visibility="public" > </field> +<field name="horizontalGap" + type="int" + transient="false" + volatile="false" + value="16843327" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="horizontalSpacing" type="int" transient="false" @@ -3430,6 +3683,17 @@ visibility="public" > </field> +<field name="iconPreview" + type="int" + transient="false" + volatile="false" + value="16843337" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="id" type="int" transient="false" @@ -3474,6 +3738,72 @@ visibility="public" > </field> +<field name="imeActionId" + type="int" + transient="false" + volatile="false" + value="16843366" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="imeActionLabel" + type="int" + transient="false" + volatile="false" + value="16843365" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="imeExtractEnterAnimation" + type="int" + transient="false" + volatile="false" + value="16843368" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="imeExtractExitAnimation" + type="int" + transient="false" + volatile="false" + value="16843369" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="imeFullscreenBackground" + type="int" + transient="false" + volatile="false" + value="16843308" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="imeOptions" + type="int" + transient="false" + volatile="false" + value="16843364" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="inAnimation" type="int" transient="false" @@ -3595,6 +3925,28 @@ visibility="public" > </field> +<field name="initialLayout" + type="int" + transient="false" + volatile="false" + value="16843345" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="innerRadius" + type="int" + transient="false" + volatile="false" + value="16843359" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="innerRadiusRatio" type="int" transient="false" @@ -3613,6 +3965,17 @@ value="16843112" static="true" final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="inputType" + type="int" + transient="false" + volatile="false" + value="16843296" + static="true" + final="true" deprecated="not deprecated" visibility="public" > @@ -3672,6 +4035,17 @@ visibility="public" > </field> +<field name="isDefault" + type="int" + transient="false" + volatile="false" + value="16843297" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="isIndicator" type="int" transient="false" @@ -3683,6 +4057,50 @@ visibility="public" > </field> +<field name="isModifier" + type="int" + transient="false" + volatile="false" + value="16843334" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="isRepeatable" + type="int" + transient="false" + volatile="false" + value="16843336" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="isScrollContainer" + type="int" + transient="false" + volatile="false" + value="16843342" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="isSticky" + type="int" + transient="false" + volatile="false" + value="16843335" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="itemBackground" type="int" transient="false" @@ -3738,6 +4156,149 @@ visibility="public" > </field> +<field name="keyBackground" + type="int" + transient="false" + volatile="false" + value="16843315" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyEdgeFlags" + type="int" + transient="false" + volatile="false" + value="16843333" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyHeight" + type="int" + transient="false" + volatile="false" + value="16843326" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyIcon" + type="int" + transient="false" + volatile="false" + value="16843340" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyLabel" + type="int" + transient="false" + volatile="false" + value="16843339" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyOutputText" + type="int" + transient="false" + volatile="false" + value="16843338" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyPreviewHeight" + type="int" + transient="false" + volatile="false" + value="16843321" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyPreviewLayout" + type="int" + transient="false" + volatile="false" + value="16843319" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyPreviewOffset" + type="int" + transient="false" + volatile="false" + value="16843320" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyTextColor" + type="int" + transient="false" + volatile="false" + value="16843318" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyTextSize" + type="int" + transient="false" + volatile="false" + value="16843316" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyWidth" + type="int" + transient="false" + volatile="false" + value="16843325" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyboardMode" + type="int" + transient="false" + volatile="false" + value="16843341" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="keycode" type="int" transient="false" @@ -3760,6 +4321,17 @@ visibility="public" > </field> +<field name="labelTextSize" + type="int" + transient="false" + volatile="false" + value="16843317" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="launchMode" type="int" transient="false" @@ -4618,6 +5190,17 @@ visibility="public" > </field> +<field name="noHistory" + type="int" + transient="false" + volatile="false" + value="16843309" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="numColumns" type="int" transient="false" @@ -4647,7 +5230,7 @@ value="16843109" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -4845,7 +5428,7 @@ value="16843100" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -4933,7 +5516,7 @@ value="16843111" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -4970,6 +5553,39 @@ visibility="public" > </field> +<field name="popupCharacters" + type="int" + transient="false" + volatile="false" + value="16843332" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="popupKeyboard" + type="int" + transient="false" + volatile="false" + value="16843331" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="popupLayout" + type="int" + transient="false" + volatile="false" + value="16843323" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="popupWindowStyle" type="int" transient="false" @@ -5069,6 +5685,17 @@ visibility="public" > </field> +<field name="privateImeOptions" + type="int" + transient="false" + volatile="false" + value="16843299" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="process" type="int" transient="false" @@ -5289,6 +5916,61 @@ visibility="public" > </field> +<field name="reqFiveWayNav" + type="int" + transient="false" + volatile="false" + value="16843314" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="reqHardKeyboard" + type="int" + transient="false" + volatile="false" + value="16843305" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="reqKeyboardType" + type="int" + transient="false" + volatile="false" + value="16843304" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="reqNavigation" + type="int" + transient="false" + volatile="false" + value="16843306" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="reqTouchScreen" + type="int" + transient="false" + volatile="false" + value="16843303" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="resource" type="int" transient="false" @@ -5344,6 +6026,17 @@ visibility="public" > </field> +<field name="rowEdgeFlags" + type="int" + transient="false" + volatile="false" + value="16843329" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="rowHeight" type="int" transient="false" @@ -5593,7 +6286,7 @@ value="16843269" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -5707,6 +6400,17 @@ visibility="public" > </field> +<field name="settingsActivity" + type="int" + transient="false" + volatile="false" + value="16843301" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="shadowColor" type="int" transient="false" @@ -5784,6 +6488,17 @@ visibility="public" > </field> +<field name="sharedUserLabel" + type="int" + transient="false" + volatile="false" + value="16843361" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="shouldDisableView" type="int" transient="false" @@ -5835,6 +6550,17 @@ value="16843101" static="true" final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="smoothScrollbar" + type="int" + transient="false" + volatile="false" + value="16843313" + static="true" + final="true" deprecated="not deprecated" visibility="public" > @@ -6081,6 +6807,17 @@ visibility="public" > </field> +<field name="state_long_pressable" + type="int" + transient="false" + volatile="false" + value="16843324" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="state_middle" type="int" transient="false" @@ -6796,6 +7533,17 @@ visibility="public" > </field> +<field name="thickness" + type="int" + transient="false" + volatile="false" + value="16843360" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="thicknessRatio" type="int" transient="false" @@ -6983,6 +7731,17 @@ visibility="public" > </field> +<field name="topOffset" + type="int" + transient="false" + volatile="false" + value="16843352" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="topRightRadius" type="int" transient="false" @@ -7038,6 +7797,17 @@ visibility="public" > </field> +<field name="updatePeriodMillis" + type="int" + transient="false" + volatile="false" + value="16843344" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="useLevel" type="int" transient="false" @@ -7093,6 +7863,17 @@ visibility="public" > </field> +<field name="verticalCorrection" + type="int" + transient="false" + volatile="false" + value="16843322" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="verticalDivider" type="int" transient="false" @@ -7104,6 +7885,17 @@ visibility="public" > </field> +<field name="verticalGap" + type="int" + transient="false" + volatile="false" + value="16843328" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="verticalSpacing" type="int" transient="false" @@ -7137,6 +7929,61 @@ visibility="public" > </field> +<field name="voiceLanguage" + type="int" + transient="false" + volatile="false" + value="16843349" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="voiceLanguageModel" + type="int" + transient="false" + volatile="false" + value="16843347" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="voiceMaxResults" + type="int" + transient="false" + volatile="false" + value="16843350" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="voicePromptText" + type="int" + transient="false" + volatile="false" + value="16843348" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="voiceSearchMode" + type="int" + transient="false" + volatile="false" + value="16843346" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="webViewStyle" type="int" transient="false" @@ -7214,6 +8061,17 @@ visibility="public" > </field> +<field name="windowDisablePreview" + type="int" + transient="false" + volatile="false" + value="16843298" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="windowEnterAnimation" type="int" transient="false" @@ -7291,6 +8149,17 @@ visibility="public" > </field> +<field name="windowNoDisplay" + type="int" + transient="false" + volatile="false" + value="16843294" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="windowNoTitle" type="int" transient="false" @@ -7313,6 +8182,17 @@ visibility="public" > </field> +<field name="windowSoftInputMode" + type="int" + transient="false" + volatile="false" + value="16843307" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="windowTitleBackgroundStyle" type="int" transient="false" @@ -7402,6 +8282,23 @@ > </field> </class> +<class name="R.bool" + extends="java.lang.Object" + abstract="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<constructor name="R.bool" + type="android.R.bool" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +</class> <class name="R.color" extends="java.lang.Object" abstract="false" @@ -7892,6 +8789,17 @@ visibility="public" > </field> +<field name="dark_header" + type="int" + transient="false" + volatile="false" + value="17301669" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="dialog_frame" type="int" transient="false" @@ -8013,6 +8921,17 @@ visibility="public" > </field> +<field name="ic_btn_speak_now" + type="int" + transient="false" + volatile="false" + value="17301668" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ic_delete" type="int" transient="false" @@ -9399,6 +10318,17 @@ visibility="public" > </field> +<field name="title_bar_tall" + type="int" + transient="false" + volatile="false" + value="17301670" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="toast_frame" type="int" transient="false" @@ -9438,6 +10368,17 @@ visibility="public" > </constructor> +<field name="addToDictionary" + type="int" + transient="false" + volatile="false" + value="16908330" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="background" type="int" transient="false" @@ -9482,6 +10423,17 @@ visibility="public" > </field> +<field name="candidatesArea" + type="int" + transient="false" + volatile="false" + value="16908317" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="checkbox" type="int" transient="false" @@ -9493,6 +10445,17 @@ visibility="public" > </field> +<field name="closeButton" + type="int" + transient="false" + volatile="false" + value="16908327" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="content" type="int" transient="false" @@ -9504,6 +10467,39 @@ visibility="public" > </field> +<field name="copy" + type="int" + transient="false" + volatile="false" + value="16908321" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="copyUrl" + type="int" + transient="false" + volatile="false" + value="16908323" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="cut" + type="int" + transient="false" + volatile="false" + value="16908320" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="edit" type="int" transient="false" @@ -9526,6 +10522,17 @@ visibility="public" > </field> +<field name="extractArea" + type="int" + transient="false" + volatile="false" + value="16908316" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="hint" type="int" transient="false" @@ -9581,6 +10588,39 @@ visibility="public" > </field> +<field name="inputArea" + type="int" + transient="false" + volatile="false" + value="16908318" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="inputExtractEditText" + type="int" + transient="false" + volatile="false" + value="16908325" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="keyboardView" + type="int" + transient="false" + volatile="false" + value="16908326" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="list" type="int" transient="false" @@ -9603,6 +10643,17 @@ visibility="public" > </field> +<field name="paste" + type="int" + transient="false" + volatile="false" + value="16908322" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="primary" type="int" transient="false" @@ -9636,6 +10687,17 @@ visibility="public" > </field> +<field name="selectAll" + type="int" + transient="false" + volatile="false" + value="16908319" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="selectedIcon" type="int" transient="false" @@ -9647,6 +10709,28 @@ visibility="public" > </field> +<field name="startSelectingText" + type="int" + transient="false" + volatile="false" + value="16908328" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="stopSelectingText" + type="int" + transient="false" + volatile="false" + value="16908329" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="summary" type="int" transient="false" @@ -9658,6 +10742,17 @@ visibility="public" > </field> +<field name="switchInputMethod" + type="int" + transient="false" + volatile="false" + value="16908324" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="tabcontent" type="int" transient="false" @@ -9747,6 +10842,56 @@ > </field> </class> +<class name="R.integer" + extends="java.lang.Object" + abstract="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<constructor name="R.integer" + type="android.R.integer" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<field name="config_longAnimTime" + type="int" + transient="false" + volatile="false" + value="17694722" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="config_mediumAnimTime" + type="int" + transient="false" + volatile="false" + value="17694721" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="config_shortAnimTime" + type="int" + transient="false" + volatile="false" + value="17694720" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="R.layout" extends="java.lang.Object" abstract="false" @@ -10045,6 +11190,17 @@ visibility="public" > </field> +<field name="VideoView_error_text_invalid_progressive_playback" + type="int" + transient="false" + volatile="false" + value="17039381" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="VideoView_error_text_unknown" type="int" transient="false" @@ -10133,6 +11289,17 @@ visibility="public" > </field> +<field name="dialog_alert_title" + type="int" + transient="false" + volatile="false" + value="17039380" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="emptyPhoneNumber" type="int" transient="false" @@ -10700,6 +11867,17 @@ visibility="public" > </field> +<field name="Theme_InputMethod" + type="int" + transient="false" + volatile="false" + value="16973908" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="Theme_Light" type="int" transient="false" @@ -10733,6 +11911,28 @@ visibility="public" > </field> +<field name="Theme_Light_Panel" + type="int" + transient="false" + volatile="false" + value="16973914" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="Theme_NoDisplay" + type="int" + transient="false" + volatile="false" + value="16973909" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="Theme_NoTitleBar" type="int" transient="false" @@ -10755,6 +11955,17 @@ visibility="public" > </field> +<field name="Theme_Panel" + type="int" + transient="false" + volatile="false" + value="16973913" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="Theme_Translucent" type="int" transient="false" @@ -10997,6 +12208,17 @@ visibility="public" > </field> +<field name="Widget_KeyboardView" + type="int" + transient="false" + volatile="false" + value="16973911" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="Widget_ListView" type="int" transient="false" @@ -11257,6 +12479,17 @@ <parameter name="params" type="android.view.ViewGroup.LayoutParams"> </parameter> </method> +<method name="closeContextMenu" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="closeOptionsMenu" return="void" abstract="false" @@ -11635,6 +12868,17 @@ visibility="public" > </method> +<method name="hasWindowFocus" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isChild" return="boolean" abstract="false" @@ -12277,6 +13521,28 @@ <parameter name="event" type="android.view.MotionEvent"> </parameter> </method> +<method name="onUserInteraction" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onUserLeaveHint" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> <method name="onWindowAttributesChanged" return="void" abstract="false" @@ -12664,6 +13930,19 @@ <parameter name="textColor" type="int"> </parameter> </method> +<method name="setVisible" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="visible" type="boolean"> +</parameter> +</method> <method name="setVolumeControlStream" return="void" abstract="false" @@ -12978,6 +14257,17 @@ deprecated="not deprecated" visibility="public" > +<method name="getDeviceConfigurationInfo" + return="android.content.pm.ConfigurationInfo" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getMemoryInfo" return="void" abstract="false" @@ -13019,6 +14309,17 @@ <exception name="SecurityException" type="java.lang.SecurityException"> </exception> </method> +<method name="getRunningAppProcesses" + return="java.util.List<android.app.ActivityManager.RunningAppProcessInfo>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getRunningServices" return="java.util.List<android.app.ActivityManager.RunningServiceInfo>" abstract="false" @@ -13049,6 +14350,19 @@ <exception name="SecurityException" type="java.lang.SecurityException"> </exception> </method> +<method name="restartPackage" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="packageName" type="java.lang.String"> +</parameter> +</method> <field name="RECENT_WITH_EXCLUDED" type="int" transient="false" @@ -13439,6 +14753,194 @@ > </field> </class> +<class name="ActivityManager.RunningAppProcessInfo" + extends="java.lang.Object" + abstract="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="ActivityManager.RunningAppProcessInfo" + type="android.app.ActivityManager.RunningAppProcessInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<constructor name="ActivityManager.RunningAppProcessInfo" + type="android.app.ActivityManager.RunningAppProcessInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pProcessName" type="java.lang.String"> +</parameter> +<parameter name="pPid" type="int"> +</parameter> +<parameter name="pArr" type="java.lang.String[]"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="readFromParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="source" type="android.os.Parcel"> +</parameter> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IMPORTANCE_BACKGROUND" + type="int" + transient="false" + volatile="false" + value="400" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IMPORTANCE_EMPTY" + type="int" + transient="false" + volatile="false" + value="500" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IMPORTANCE_FOREGROUND" + type="int" + transient="false" + volatile="false" + value="100" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IMPORTANCE_SERVICE" + type="int" + transient="false" + volatile="false" + value="300" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IMPORTANCE_VISIBLE" + type="int" + transient="false" + volatile="false" + value="200" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="importance" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="lru" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="pid" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="pkgList" + type="java.lang.String[]" + transient="false" + volatile="false" + value="null" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="processName" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="ActivityManager.RunningServiceInfo" extends="java.lang.Object" abstract="false" @@ -13783,6 +15285,25 @@ <parameter name="operation" type="android.app.PendingIntent"> </parameter> </method> +<method name="setInexactRepeating" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="type" type="int"> +</parameter> +<parameter name="triggerAtTime" type="long"> +</parameter> +<parameter name="interval" type="long"> +</parameter> +<parameter name="operation" type="android.app.PendingIntent"> +</parameter> +</method> <method name="setRepeating" return="void" abstract="false" @@ -13837,6 +15358,61 @@ visibility="public" > </field> +<field name="INTERVAL_DAY" + type="long" + transient="false" + volatile="false" + value="86400000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTERVAL_FIFTEEN_MINUTES" + type="long" + transient="false" + volatile="false" + value="900000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTERVAL_HALF_DAY" + type="long" + transient="false" + volatile="false" + value="43200000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTERVAL_HALF_HOUR" + type="long" + transient="false" + volatile="false" + value="1800000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTERVAL_HOUR" + type="long" + transient="false" + volatile="false" + value="3600000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="RTC" type="int" transient="false" @@ -13906,6 +15482,30 @@ <parameter name="cancelListener" type="android.content.DialogInterface.OnCancelListener"> </parameter> </constructor> +<method name="getButton" + return="android.widget.Button" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="whichButton" type="int"> +</parameter> +</method> +<method name="getListView" + return="android.widget.ListView" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="setButton" return="void" abstract="false" @@ -13916,6 +15516,8 @@ deprecated="not deprecated" visibility="public" > +<parameter name="whichButton" type="int"> +</parameter> <parameter name="text" type="java.lang.CharSequence"> </parameter> <parameter name="msg" type="android.os.Message"> @@ -13931,6 +15533,38 @@ deprecated="not deprecated" visibility="public" > +<parameter name="whichButton" type="int"> +</parameter> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="listener" type="android.content.DialogInterface.OnClickListener"> +</parameter> +</method> +<method name="setButton" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="msg" type="android.os.Message"> +</parameter> +</method> +<method name="setButton" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="deprecated" + visibility="public" +> <parameter name="text" type="java.lang.CharSequence"> </parameter> <parameter name="listener" type="android.content.DialogInterface.OnClickListener"> @@ -13943,7 +15577,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="text" type="java.lang.CharSequence"> @@ -13958,7 +15592,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="text" type="java.lang.CharSequence"> @@ -13973,7 +15607,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="text" type="java.lang.CharSequence"> @@ -13988,7 +15622,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="text" type="java.lang.CharSequence"> @@ -14074,6 +15708,27 @@ <parameter name="view" type="android.view.View"> </parameter> </method> +<method name="setView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="viewSpacingLeft" type="int"> +</parameter> +<parameter name="viewSpacingTop" type="int"> +</parameter> +<parameter name="viewSpacingRight" type="int"> +</parameter> +<parameter name="viewSpacingBottom" type="int"> +</parameter> +</method> </class> <class name="AlertDialog.Builder" extends="java.lang.Object" @@ -16083,6 +17738,19 @@ <parameter name="activity" type="android.app.Activity"> </parameter> </method> +<method name="callActivityOnUserLeaving" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="activity" type="android.app.Activity"> +</parameter> +</method> <method name="callApplicationOnCreate" return="void" abstract="false" @@ -16845,6 +18513,51 @@ > </method> </class> +<class name="IntentService" + extends="android.app.Service" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="IntentService" + type="android.app.IntentService" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="name" type="java.lang.String"> +</parameter> +</constructor> +<method name="onBind" + return="android.os.IBinder" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="intent" type="android.content.Intent"> +</parameter> +</method> +<method name="onHandleIntent" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="intent" type="android.content.Intent"> +</parameter> +</method> +</class> <class name="KeyguardManager" extends="java.lang.Object" abstract="false" @@ -16961,7 +18674,18 @@ </constructor> <method name="getTargetIntent" return="android.content.Intent" - abstract="true" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="intentForPosition" + return="android.content.Intent" + abstract="false" native="false" synchronized="false" static="false" @@ -16969,8 +18693,118 @@ deprecated="not deprecated" visibility="protected" > +<parameter name="position" type="int"> +</parameter> +</method> +<method name="makeListItems" + return="java.util.List<android.app.LauncherActivity.ListItem>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> </method> </class> +<class name="LauncherActivity.IconResizer" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="LauncherActivity.IconResizer" + type="android.app.LauncherActivity.IconResizer" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="createIconThumbnail" + return="android.graphics.drawable.Drawable" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="icon" type="android.graphics.drawable.Drawable"> +</parameter> +</method> +</class> +<class name="LauncherActivity.ListItem" + extends="java.lang.Object" + abstract="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="LauncherActivity.ListItem" + type="android.app.LauncherActivity.ListItem" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<field name="className" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="extras" + type="android.os.Bundle" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="icon" + type="android.graphics.drawable.Drawable" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="label" + type="java.lang.CharSequence" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="packageName" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="ListActivity" extends="android.app.Activity" abstract="false" @@ -17949,6 +19783,17 @@ visibility="public" > </field> +<field name="FLAG_UPDATE_CURRENT" + type="int" + transient="false" + volatile="false" + value="134217728" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="PendingIntent.CanceledException" extends="android.util.AndroidException" @@ -19029,6 +20874,751 @@ </method> </interface> </package> +<package name="android.appwidget" +> +<class name="AppWidgetHost" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AppWidgetHost" + type="android.appwidget.AppWidgetHost" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="hostId" type="int"> +</parameter> +</constructor> +<method name="allocateAppWidgetId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="createView" + return="android.appwidget.AppWidgetHostView" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> +</parameter> +</method> +<method name="deleteAllHosts" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="deleteAppWidgetId" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="appWidgetId" type="int"> +</parameter> +</method> +<method name="deleteHost" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onCreateView" + return="android.appwidget.AppWidgetHostView" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> +</parameter> +</method> +<method name="onProviderChanged" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> +</parameter> +</method> +<method name="startListening" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="stopListening" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> +<class name="AppWidgetHostView" + extends="android.widget.FrameLayout" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AppWidgetHostView" + type="android.appwidget.AppWidgetHostView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</constructor> +<constructor name="AppWidgetHostView" + type="android.appwidget.AppWidgetHostView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="animationIn" type="int"> +</parameter> +<parameter name="animationOut" type="int"> +</parameter> +</constructor> +<method name="getAppWidgetId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getAppWidgetInfo" + return="android.appwidget.AppWidgetProviderInfo" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDefaultView" + return="android.view.View" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="getErrorView" + return="android.view.View" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="prepareView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> +<method name="setAppWidget" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="info" type="android.appwidget.AppWidgetProviderInfo"> +</parameter> +</method> +<method name="updateAppWidget" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="remoteViews" type="android.widget.RemoteViews"> +</parameter> +</method> +</class> +<class name="AppWidgetManager" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="bindAppWidgetId" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="provider" type="android.content.ComponentName"> +</parameter> +</method> +<method name="getAppWidgetIds" + return="int[]" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="android.content.ComponentName"> +</parameter> +</method> +<method name="getAppWidgetInfo" + return="android.appwidget.AppWidgetProviderInfo" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="appWidgetId" type="int"> +</parameter> +</method> +<method name="getInstalledProviders" + return="java.util.List<android.appwidget.AppWidgetProviderInfo>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInstance" + return="android.appwidget.AppWidgetManager" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="updateAppWidget" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="appWidgetIds" type="int[]"> +</parameter> +<parameter name="views" type="android.widget.RemoteViews"> +</parameter> +</method> +<method name="updateAppWidget" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="views" type="android.widget.RemoteViews"> +</parameter> +</method> +<method name="updateAppWidget" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="android.content.ComponentName"> +</parameter> +<parameter name="views" type="android.widget.RemoteViews"> +</parameter> +</method> +<field name="ACTION_APPWIDGET_CONFIGURE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_CONFIGURE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_DELETED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_DELETED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_DISABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_DISABLED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_ENABLED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_PICK" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_PICK"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_UPDATE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_UPDATE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_APPWIDGET_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""appWidgetId"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_APPWIDGET_IDS" + type="java.lang.String" + transient="false" + volatile="false" + value=""appWidgetIds"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_CUSTOM_EXTRAS" + type="java.lang.String" + transient="false" + volatile="false" + value=""customExtras"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_CUSTOM_INFO" + type="java.lang.String" + transient="false" + volatile="false" + value=""customInfo"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INVALID_APPWIDGET_ID" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="META_DATA_APPWIDGET_PROVIDER" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.provider"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="AppWidgetProvider" + extends="android.content.BroadcastReceiver" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AppWidgetProvider" + type="android.appwidget.AppWidgetProvider" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="onDeleted" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="appWidgetIds" type="int[]"> +</parameter> +</method> +<method name="onDisabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="onEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="onReceive" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="intent" type="android.content.Intent"> +</parameter> +</method> +<method name="onUpdate" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="appWidgetManager" type="android.appwidget.AppWidgetManager"> +</parameter> +<parameter name="appWidgetIds" type="int[]"> +</parameter> +</method> +</class> +<class name="AppWidgetProviderInfo" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="AppWidgetProviderInfo" + type="android.appwidget.AppWidgetProviderInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<constructor name="AppWidgetProviderInfo" + type="android.appwidget.AppWidgetProviderInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="in" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="out" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="configure" + type="android.content.ComponentName" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="icon" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="initialLayout" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="label" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="minHeight" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="minWidth" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="provider" + type="android.content.ComponentName" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="updatePeriodMillis" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +</package> <package name="android.content" > <class name="ActivityNotFoundException" @@ -19497,6 +22087,21 @@ <parameter name="intent" type="android.content.Intent"> </parameter> </method> +<method name="peekService" + return="android.os.IBinder" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="myContext" type="android.content.Context"> +</parameter> +<parameter name="service" type="android.content.Intent"> +</parameter> +</method> <method name="setDebugUnregister" return="void" abstract="false" @@ -19984,6 +22589,23 @@ visibility="public" > </method> +<method name="openAssetFile" + return="android.content.res.AssetFileDescriptor" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uri" type="android.net.Uri"> +</parameter> +<parameter name="mode" type="java.lang.String"> +</parameter> +<exception name="FileNotFoundException" type="java.io.FileNotFoundException"> +</exception> +</method> <method name="openFile" return="android.os.ParcelFileDescriptor" abstract="false" @@ -20292,6 +22914,23 @@ <parameter name="syncToNetwork" type="boolean"> </parameter> </method> +<method name="openAssetFileDescriptor" + return="android.content.res.AssetFileDescriptor" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uri" type="android.net.Uri"> +</parameter> +<parameter name="mode" type="java.lang.String"> +</parameter> +<exception name="FileNotFoundException" type="java.io.FileNotFoundException"> +</exception> +</method> <method name="openFileDescriptor" return="android.os.ParcelFileDescriptor" abstract="false" @@ -20339,6 +22978,23 @@ <exception name="FileNotFoundException" type="java.io.FileNotFoundException"> </exception> </method> +<method name="openOutputStream" + return="java.io.OutputStream" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uri" type="android.net.Uri"> +</parameter> +<parameter name="mode" type="java.lang.String"> +</parameter> +<exception name="FileNotFoundException" type="java.io.FileNotFoundException"> +</exception> +</method> <method name="query" return="android.database.Cursor" abstract="false" @@ -22182,6 +24838,17 @@ visibility="public" > </field> +<field name="INPUT_METHOD_SERVICE" + type="java.lang.String" + transient="false" + volatile="false" + value=""input_method"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYGUARD_SERVICE" type="java.lang.String" transient="false" @@ -23367,7 +26034,7 @@ value="-1" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -23378,7 +26045,7 @@ value="-2" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -23389,6 +26056,39 @@ value="-3" static="true" final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="BUTTON_NEGATIVE" + type="int" + transient="false" + volatile="false" + value="-2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="BUTTON_NEUTRAL" + type="int" + transient="false" + volatile="false" + value="-3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="BUTTON_POSITIVE" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" deprecated="not deprecated" visibility="public" > @@ -24696,6 +27396,32 @@ <parameter name="name" type="java.lang.String"> </parameter> </method> +<method name="replaceExtras" + return="android.content.Intent" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.content.Intent"> +</parameter> +</method> +<method name="replaceExtras" + return="android.content.Intent" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="extras" type="android.os.Bundle"> +</parameter> +</method> <method name="resolveActivity" return="android.content.ComponentName" abstract="false" @@ -25224,6 +27950,17 @@ visibility="public" > </field> +<field name="ACTION_INPUT_METHOD_CHANGED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.INPUT_METHOD_CHANGED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_INSERT" type="java.lang.String" transient="false" @@ -25290,6 +28027,17 @@ visibility="public" > </field> +<field name="ACTION_MEDIA_CHECKING" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.MEDIA_CHECKING"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_MEDIA_EJECT" type="java.lang.String" transient="false" @@ -25312,6 +28060,17 @@ visibility="public" > </field> +<field name="ACTION_MEDIA_NOFS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.MEDIA_NOFS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_MEDIA_REMOVED" type="java.lang.String" transient="false" @@ -25422,6 +28181,17 @@ visibility="public" > </field> +<field name="ACTION_PACKAGE_DATA_CLEARED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.PACKAGE_DATA_CLEARED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_PACKAGE_INSTALL" type="java.lang.String" transient="false" @@ -25444,6 +28214,17 @@ visibility="public" > </field> +<field name="ACTION_PACKAGE_REPLACED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.PACKAGE_REPLACED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_PACKAGE_RESTARTED" type="java.lang.String" transient="false" @@ -25543,6 +28324,17 @@ visibility="public" > </field> +<field name="ACTION_SEARCH_LONG_PRESS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.SEARCH_LONG_PRESS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_SEND" type="java.lang.String" transient="false" @@ -25587,6 +28379,17 @@ visibility="public" > </field> +<field name="ACTION_SYSTEM_TUTORIAL" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.SYSTEM_TUTORIAL"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_TIMEZONE_CHANGED" type="java.lang.String" transient="false" @@ -25653,6 +28456,17 @@ visibility="public" > </field> +<field name="ACTION_USER_PRESENT" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.USER_PRESENT"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_VIEW" type="java.lang.String" transient="false" @@ -25774,6 +28588,17 @@ visibility="public" > </field> +<field name="CATEGORY_INFO" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.category.INFO"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="CATEGORY_LAUNCHER" type="java.lang.String" transient="false" @@ -25916,6 +28741,17 @@ visibility="public" > </field> +<field name="EXTRA_DATA_REMOVED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.DATA_REMOVED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="EXTRA_DONT_KILL_APP" type="java.lang.String" transient="false" @@ -25971,6 +28807,17 @@ visibility="public" > </field> +<field name="EXTRA_REPLACING" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.REPLACING"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="EXTRA_SHORTCUT_ICON" type="java.lang.String" transient="false" @@ -26147,6 +28994,17 @@ visibility="public" > </field> +<field name="FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" + type="int" + transient="false" + volatile="false" + value="524288" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS" type="int" transient="false" @@ -26213,6 +29071,17 @@ visibility="public" > </field> +<field name="FLAG_ACTIVITY_NO_USER_ACTION" + type="int" + transient="false" + volatile="false" + value="262144" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FLAG_ACTIVITY_PREVIOUS_IS_TOP" type="int" transient="false" @@ -26224,6 +29093,17 @@ visibility="public" > </field> +<field name="FLAG_ACTIVITY_REORDER_TO_FRONT" + type="int" + transient="false" + volatile="false" + value="131072" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FLAG_ACTIVITY_RESET_TASK_IF_NEEDED" type="int" transient="false" @@ -28140,6 +31020,17 @@ visibility="public" > </field> +<field name="FLAG_NO_HISTORY" + type="int" + transient="false" + volatile="false" + value="128" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FLAG_STATE_NOT_NEEDED" type="int" transient="false" @@ -28322,6 +31213,16 @@ visibility="public" > </field> +<field name="softInputMode" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="targetActivity" type="java.lang.String" transient="false" @@ -28773,6 +31674,133 @@ > </field> </class> +<class name="ConfigurationInfo" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="ConfigurationInfo" + type="android.content.pm.ConfigurationInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<constructor name="ConfigurationInfo" + type="android.content.pm.ConfigurationInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="orig" type="android.content.pm.ConfigurationInfo"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="parcelableFlags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INPUT_FEATURE_FIVE_WAY_NAV" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INPUT_FEATURE_HARD_KEYBOARD" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="reqInputFeatures" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="reqKeyboardType" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="reqNavigation" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="reqTouchScreen" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <interface name="IPackageInstallObserver" abstract="true" static="false" @@ -29049,6 +32077,17 @@ visibility="public" > </field> +<field name="configPreferences" + type="android.content.pm.ConfigurationInfo[]" + transient="false" + volatile="false" + value="null" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="gids" type="int[]" transient="false" @@ -29136,6 +32175,26 @@ visibility="public" > </field> +<field name="sharedUserId" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="sharedUserLabel" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="signatures" type="android.content.pm.Signature[]" transient="false" @@ -29706,6 +32765,21 @@ <exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException"> </exception> </method> +<method name="getLaunchIntentForPackage" + return="android.content.Intent" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="packageName" type="java.lang.String"> +</parameter> +<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException"> +</exception> +</method> <method name="getNameForUid" return="java.lang.String" abstract="true" @@ -29922,6 +32996,17 @@ <exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException"> </exception> </method> +<method name="getSystemSharedLibraryNames" + return="java.lang.String[]" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getText" return="java.lang.CharSequence" abstract="true" @@ -29986,6 +33071,17 @@ <parameter name="packageURI" type="android.net.Uri"> </parameter> </method> +<method name="isSafeMode" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="queryBroadcastReceivers" return="java.util.List<android.content.pm.ResolveInfo>" abstract="true" @@ -30270,6 +33366,17 @@ visibility="public" > </field> +<field name="GET_CONFIGURATIONS" + type="int" + transient="false" + volatile="false" + value="16384" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="GET_DISABLED_COMPONENTS" type="int" transient="false" @@ -30402,6 +33509,17 @@ visibility="public" > </field> +<field name="GET_UNINSTALLED_PACKAGES" + type="int" + transient="false" + volatile="false" + value="8192" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="GET_URI_PERMISSION_PATTERNS" type="int" transient="false" @@ -30424,6 +33542,17 @@ visibility="public" > </field> +<field name="INSTALL_FAILED_CONFLICTING_PROVIDER" + type="int" + transient="false" + volatile="false" + value="-13" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="INSTALL_FAILED_DEXOPT" type="int" transient="false" @@ -31743,6 +34872,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.os.Parcelable"> +</implements> <constructor name="AssetFileDescriptor" type="android.content.res.AssetFileDescriptor" static="false" @@ -31770,6 +34901,54 @@ <exception name="IOException" type="java.io.IOException"> </exception> </method> +<method name="createInputStream" + return="java.io.FileInputStream" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="IOException" type="java.io.IOException"> +</exception> +</method> +<method name="createOutputStream" + return="java.io.FileOutputStream" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="IOException" type="java.io.IOException"> +</exception> +</method> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDeclaredLength" + return="long" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getFileDescriptor" return="java.io.FileDescriptor" abstract="false" @@ -31814,6 +34993,84 @@ visibility="public" > </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="out" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="UNKNOWN_LENGTH" + type="long" + transient="false" + volatile="false" + value="-1L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="AssetFileDescriptor.AutoCloseInputStream" + extends="android.os.ParcelFileDescriptor.AutoCloseInputStream" + abstract="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AssetFileDescriptor.AutoCloseInputStream" + type="android.content.res.AssetFileDescriptor.AutoCloseInputStream" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fd" type="android.content.res.AssetFileDescriptor"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +</constructor> +</class> +<class name="AssetFileDescriptor.AutoCloseOutputStream" + extends="android.os.ParcelFileDescriptor.AutoCloseOutputStream" + abstract="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AssetFileDescriptor.AutoCloseOutputStream" + type="android.content.res.AssetFileDescriptor.AutoCloseOutputStream" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fd" type="android.content.res.AssetFileDescriptor"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +</constructor> </class> <class name="AssetManager" extends="java.lang.Object" @@ -32446,6 +35703,39 @@ visibility="public" > </field> +<field name="HARDKEYBOARDHIDDEN_NO" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HARDKEYBOARDHIDDEN_UNDEFINED" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HARDKEYBOARDHIDDEN_YES" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYBOARDHIDDEN_NO" type="int" transient="false" @@ -32676,6 +35966,16 @@ visibility="public" > </field> +<field name="hardKeyboardHidden" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="keyboard" type="int" transient="false" @@ -32827,6 +36127,21 @@ visibility="public" > </method> +<method name="getBoolean" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +<exception name="Resources.NotFoundException" type="android.content.res.Resources.NotFoundException"> +</exception> +</method> <method name="getColor" return="int" abstract="false" @@ -32939,6 +36254,23 @@ <exception name="Resources.NotFoundException" type="android.content.res.Resources.NotFoundException"> </exception> </method> +<method name="getFraction" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +<parameter name="base" type="int"> +</parameter> +<parameter name="pbase" type="int"> +</parameter> +</method> <method name="getIdentifier" return="int" abstract="false" @@ -33341,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" @@ -33356,6 +36705,44 @@ <exception name="Resources.NotFoundException" type="android.content.res.Resources.NotFoundException"> </exception> </method> +<method name="parseBundleExtra" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tagName" type="java.lang.String"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +<parameter name="outBundle" type="android.os.Bundle"> +</parameter> +<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException"> +</exception> +</method> +<method name="parseBundleExtras" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="parser" type="android.content.res.XmlResourceParser"> +</parameter> +<parameter name="outBundle" type="android.os.Bundle"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException"> +</exception> +</method> <method name="updateConfiguration" return="void" abstract="false" @@ -33731,6 +37118,21 @@ <parameter name="name" type="java.lang.String"> </parameter> </method> +<method name="getLayoutDimension" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +<parameter name="defValue" type="int"> +</parameter> +</method> <method name="getNonResourceString" return="java.lang.String" abstract="false" @@ -35004,7 +38406,7 @@ synchronized="false" static="false" final="false" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="columnName" type="java.lang.String"> @@ -36034,7 +39436,7 @@ synchronized="false" static="false" final="false" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="columnName" type="java.lang.String"> @@ -36532,7 +39934,7 @@ synchronized="false" static="true" final="false" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="sb" type="java.lang.StringBuilder"> @@ -38675,6 +42077,17 @@ synchronized="false" static="false" final="false" + deprecated="deprecated" + visibility="public" +> +</method> +<method name="yieldIfContendedSafely" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" deprecated="not deprecated" visibility="public" > @@ -39727,6 +43140,19 @@ <parameter name="isMutable" type="boolean"> </parameter> </method> +<method name="copyPixelsFromBuffer" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="java.nio.Buffer"> +</parameter> +</method> <method name="copyPixelsToBuffer" return="void" abstract="false" @@ -41040,6 +44466,35 @@ </parameter> <parameter name="stride" type="int"> </parameter> +<parameter name="x" type="float"> +</parameter> +<parameter name="y" type="float"> +</parameter> +<parameter name="width" type="int"> +</parameter> +<parameter name="height" type="int"> +</parameter> +<parameter name="hasAlpha" type="boolean"> +</parameter> +<parameter name="paint" type="android.graphics.Paint"> +</parameter> +</method> +<method name="drawBitmap" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="colors" type="int[]"> +</parameter> +<parameter name="offset" type="int"> +</parameter> +<parameter name="stride" type="int"> +</parameter> <parameter name="x" type="int"> </parameter> <parameter name="y" type="int"> @@ -47974,6 +51429,17 @@ visibility="public" > </method> +<method name="toShortString" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="union" return="void" abstract="false" @@ -48106,6 +51572,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.os.Parcelable"> +</implements> <constructor name="RectF" type="android.graphics.RectF" static="false" @@ -48219,6 +51687,17 @@ <parameter name="r" type="android.graphics.RectF"> </parameter> </method> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="height" return="float" abstract="false" @@ -48352,6 +51831,19 @@ <parameter name="newTop" type="float"> </parameter> </method> +<method name="readFromParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="in" type="android.os.Parcel"> +</parameter> +</method> <method name="round" return="void" abstract="false" @@ -48518,6 +52010,31 @@ visibility="public" > </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="out" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="bottom" type="float" transient="false" @@ -50371,6 +53888,17 @@ visibility="public" > </method> +<method name="mutate" + return="android.graphics.drawable.Drawable" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="onBoundsChange" return="void" abstract="false" @@ -51544,7 +55072,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="array" type="android.graphics.drawable.Drawable[]"> +<parameter name="layers" type="android.graphics.drawable.Drawable[]"> </parameter> </constructor> <method name="draw" @@ -52051,6 +55579,17 @@ <parameter name="canvas" type="android.graphics.Canvas"> </parameter> </method> +<method name="getDrawable" + return="android.graphics.drawable.Drawable" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getOpacity" return="int" abstract="false" @@ -52173,6 +55712,17 @@ <parameter name="canvas" type="android.graphics.Canvas"> </parameter> </method> +<method name="getDrawable" + return="android.graphics.drawable.Drawable" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getOpacity" return="int" abstract="false" @@ -52560,6 +56110,16 @@ > <implements name="android.graphics.drawable.Drawable.Callback"> </implements> +<constructor name="TransitionDrawable" + type="android.graphics.drawable.TransitionDrawable" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="layers" type="android.graphics.drawable.Drawable[]"> +</parameter> +</constructor> <method name="isCrossFadeEnabled" return="boolean" abstract="false" @@ -52775,6 +56335,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="java.lang.Cloneable"> +</implements> <constructor name="Shape" type="android.graphics.drawable.shapes.Shape" static="false" @@ -52783,6 +56345,19 @@ visibility="public" > </constructor> +<method name="clone" + return="android.graphics.drawable.shapes.Shape" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="CloneNotSupportedException" type="java.lang.CloneNotSupportedException"> +</exception> +</method> <method name="draw" return="void" abstract="true" @@ -52932,6 +56507,19 @@ <parameter name="cb" type="android.hardware.Camera.ErrorCallback"> </parameter> </method> +<method name="setOneShotPreviewCallback" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cb" type="android.hardware.Camera.PreviewCallback"> +</parameter> +</method> <method name="setParameters" return="void" abstract="false" @@ -52970,6 +56558,8 @@ > <parameter name="holder" type="android.view.SurfaceHolder"> </parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> <method name="startPreview" return="void" @@ -53411,13 +57001,386 @@ > </field> </class> -<interface name="SensorListener" +<class name="GeomagneticField" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="GeomagneticField" + type="android.hardware.GeomagneticField" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="gdLatitudeDeg" type="float"> +</parameter> +<parameter name="gdLongitudeDeg" type="float"> +</parameter> +<parameter name="altitudeMeters" type="float"> +</parameter> +<parameter name="timeMillis" type="long"> +</parameter> +</constructor> +<method name="getDeclination" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getFieldStrength" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getHorizontalStrength" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInclination" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getX" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getY" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getZ" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> +<class name="Sensor" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="getMaximumRange" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPower" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getResolution" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getVendor" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getVersion" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<field name="TYPE_ACCELEROMETER" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_ALL" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_GYROSCOPE" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_LIGHT" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_MAGNETIC_FIELD" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_ORIENTATION" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_PRESSURE" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_PROXIMITY" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEMPERATURE" + type="int" + transient="false" + volatile="false" + value="7" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="SensorEvent" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<field name="accuracy" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="sensor" + type="android.hardware.Sensor" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="timestamp" + type="long" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="values" + type="float[]" + transient="false" + volatile="false" + value="null" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<interface name="SensorEventListener" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onAccuracyChanged" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="sensor" type="android.hardware.Sensor"> +</parameter> +<parameter name="accuracy" type="int"> +</parameter> +</method> +<method name="onSensorChanged" + return="void" abstract="true" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > +<parameter name="event" type="android.hardware.SensorEvent"> +</parameter> +</method> +</interface> +<interface name="SensorListener" + abstract="true" + static="false" + final="false" + deprecated="deprecated" + visibility="public" +> <method name="onAccuracyChanged" return="void" abstract="true" @@ -53457,6 +57420,79 @@ deprecated="not deprecated" visibility="public" > +<method name="getDefaultSensor" + return="android.hardware.Sensor" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="type" type="int"> +</parameter> +</method> +<method name="getInclination" + return="float" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="I" type="float[]"> +</parameter> +</method> +<method name="getOrientation" + return="float[]" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="R" type="float[]"> +</parameter> +<parameter name="values" type="float[]"> +</parameter> +</method> +<method name="getRotationMatrix" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="R" type="float[]"> +</parameter> +<parameter name="I" type="float[]"> +</parameter> +<parameter name="gravity" type="float[]"> +</parameter> +<parameter name="geomagnetic" type="float[]"> +</parameter> +</method> +<method name="getSensorList" + return="java.util.List<android.hardware.Sensor>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="type" type="int"> +</parameter> +</method> <method name="getSensors" return="int" abstract="false" @@ -53464,7 +57500,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -53475,7 +57511,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="listener" type="android.hardware.SensorListener"> @@ -53490,7 +57526,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="listener" type="android.hardware.SensorListener"> @@ -53500,6 +57536,61 @@ <parameter name="rate" type="int"> </parameter> </method> +<method name="registerListener" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.hardware.SensorEventListener"> +</parameter> +<parameter name="sensor" type="android.hardware.Sensor"> +</parameter> +<parameter name="rate" type="int"> +</parameter> +</method> +<method name="registerListener" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.hardware.SensorEventListener"> +</parameter> +<parameter name="sensor" type="android.hardware.Sensor"> +</parameter> +<parameter name="rate" type="int"> +</parameter> +<parameter name="handler" type="android.os.Handler"> +</parameter> +</method> +<method name="remapCoordinateSystem" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="inR" type="float[]"> +</parameter> +<parameter name="X" type="int"> +</parameter> +<parameter name="Y" type="int"> +</parameter> +<parameter name="outR" type="float[]"> +</parameter> +</method> <method name="unregisterListener" return="void" abstract="false" @@ -53507,7 +57598,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="listener" type="android.hardware.SensorListener"> @@ -53522,12 +57613,106 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="listener" type="android.hardware.SensorListener"> </parameter> </method> +<method name="unregisterListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.hardware.SensorEventListener"> +</parameter> +<parameter name="sensor" type="android.hardware.Sensor"> +</parameter> +</method> +<method name="unregisterListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.hardware.SensorEventListener"> +</parameter> +</method> +<field name="AXIS_MINUS_X" + type="int" + transient="false" + volatile="false" + value="129" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="AXIS_MINUS_Y" + type="int" + transient="false" + volatile="false" + value="130" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="AXIS_MINUS_Z" + type="int" + transient="false" + volatile="false" + value="131" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="AXIS_X" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="AXIS_Y" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="AXIS_Z" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="DATA_X" type="int" transient="false" @@ -53535,7 +57720,7 @@ value="0" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53546,7 +57731,7 @@ value="1" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53557,7 +57742,7 @@ value="2" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53821,7 +58006,7 @@ value="3" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53832,7 +58017,7 @@ value="3" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53843,7 +58028,7 @@ value="4" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53854,7 +58039,7 @@ value="5" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53865,7 +58050,7 @@ value="2" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53876,7 +58061,7 @@ value="127" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53931,7 +58116,7 @@ value="16" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53942,7 +58127,7 @@ value="8" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53953,7 +58138,7 @@ value="64" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53964,7 +58149,7 @@ value="1" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53975,7 +58160,7 @@ value="1" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53986,7 +58171,7 @@ value="128" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -53997,7 +58182,7 @@ value="32" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -54052,7 +58237,7 @@ value="4" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -54063,7 +58248,7 @@ value="64" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -54080,6 +58265,2688 @@ </field> </class> </package> +<package name="android.inputmethodservice" +> +<class name="AbstractInputMethodService" + extends="android.app.Service" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.view.KeyEvent.Callback"> +</implements> +<constructor name="AbstractInputMethodService" + type="android.inputmethodservice.AbstractInputMethodService" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="onBind" + return="android.os.IBinder" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="intent" type="android.content.Intent"> +</parameter> +</method> +<method name="onCreateInputMethodInterface" + return="android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onCreateInputMethodSessionInterface" + return="android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onTrackballEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +</method> +</class> +<class name="AbstractInputMethodService.AbstractInputMethodImpl" + extends="java.lang.Object" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.view.inputmethod.InputMethod"> +</implements> +<constructor name="AbstractInputMethodService.AbstractInputMethodImpl" + type="android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="createSession" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="callback" type="android.view.inputmethod.InputMethod.SessionCallback"> +</parameter> +</method> +<method name="revokeSession" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="session" type="android.view.inputmethod.InputMethodSession"> +</parameter> +</method> +<method name="setSessionEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="session" type="android.view.inputmethod.InputMethodSession"> +</parameter> +<parameter name="enabled" type="boolean"> +</parameter> +</method> +</class> +<class name="AbstractInputMethodService.AbstractInputMethodSessionImpl" + extends="java.lang.Object" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.view.inputmethod.InputMethodSession"> +</implements> +<constructor name="AbstractInputMethodService.AbstractInputMethodSessionImpl" + type="android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="dispatchKeyEvent" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="seq" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +<parameter name="callback" type="android.view.inputmethod.InputMethodSession.EventCallback"> +</parameter> +</method> +<method name="dispatchTrackballEvent" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="seq" type="int"> +</parameter> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +<parameter name="callback" type="android.view.inputmethod.InputMethodSession.EventCallback"> +</parameter> +</method> +<method name="isEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isRevoked" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="revokeSelf" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="enabled" type="boolean"> +</parameter> +</method> +</class> +<class name="ExtractEditText" + extends="android.widget.EditText" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="ExtractEditText" + type="android.inputmethodservice.ExtractEditText" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</constructor> +<constructor name="ExtractEditText" + type="android.inputmethodservice.ExtractEditText" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +</constructor> +<constructor name="ExtractEditText" + type="android.inputmethodservice.ExtractEditText" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +<parameter name="defStyle" type="int"> +</parameter> +</constructor> +<method name="finishInternalChanges" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="hasVerticalScrollBar" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="startInternalChanges" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> +<class name="InputMethodService" + extends="android.inputmethodservice.AbstractInputMethodService" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="InputMethodService" + type="android.inputmethodservice.InputMethodService" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="getCandidatesHiddenVisibility" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getCurrentInputBinding" + return="android.view.inputmethod.InputBinding" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getCurrentInputConnection" + return="android.view.inputmethod.InputConnection" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getCurrentInputEditorInfo" + return="android.view.inputmethod.EditorInfo" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getCurrentInputStarted" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getLayoutInflater" + return="android.view.LayoutInflater" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getMaxWidth" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getTextForImeAction" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="imeOptions" type="int"> +</parameter> +</method> +<method name="getWindow" + return="android.app.Dialog" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="hideStatusIcon" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="hideWindow" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isExtractViewShown" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isFullscreenMode" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isInputViewShown" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isShowInputRequested" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onAppPrivateCommand" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="action" type="java.lang.String"> +</parameter> +<parameter name="data" type="android.os.Bundle"> +</parameter> +</method> +<method name="onBindInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onComputeInsets" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="outInsets" type="android.inputmethodservice.InputMethodService.Insets"> +</parameter> +</method> +<method name="onConfigureWindow" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="win" type="android.view.Window"> +</parameter> +<parameter name="isFullscreen" type="boolean"> +</parameter> +<parameter name="isCandidatesOnly" type="boolean"> +</parameter> +</method> +<method name="onCreateCandidatesView" + return="android.view.View" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onCreateExtractTextView" + return="android.view.View" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onCreateInputMethodInterface" + return="android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onCreateInputMethodSessionInterface" + return="android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onCreateInputView" + return="android.view.View" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onDisplayCompletions" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="completions" type="android.view.inputmethod.CompletionInfo[]"> +</parameter> +</method> +<method name="onEvaluateFullscreenMode" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onEvaluateInputViewShown" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onExtractTextContextMenuItem" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +</method> +<method name="onExtractedCursorMovement" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dx" type="int"> +</parameter> +<parameter name="dy" type="int"> +</parameter> +</method> +<method name="onExtractedSelectionChanged" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="start" type="int"> +</parameter> +<parameter name="end" type="int"> +</parameter> +</method> +<method name="onExtractedTextClicked" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onExtractingInputChanged" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ei" type="android.view.inputmethod.EditorInfo"> +</parameter> +</method> +<method name="onFinishCandidatesView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="finishingInput" type="boolean"> +</parameter> +</method> +<method name="onFinishInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onFinishInputView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="finishingInput" type="boolean"> +</parameter> +</method> +<method name="onInitializeInterface" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onKeyDown" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="keyCode" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +<method name="onKeyMultiple" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="keyCode" type="int"> +</parameter> +<parameter name="count" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +<method name="onKeyUp" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="keyCode" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +<method name="onShowInputRequested" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="flags" type="int"> +</parameter> +<parameter name="configChange" type="boolean"> +</parameter> +</method> +<method name="onStartCandidatesView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="info" type="android.view.inputmethod.EditorInfo"> +</parameter> +<parameter name="restarting" type="boolean"> +</parameter> +</method> +<method name="onStartInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="attribute" type="android.view.inputmethod.EditorInfo"> +</parameter> +<parameter name="restarting" type="boolean"> +</parameter> +</method> +<method name="onStartInputView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="info" type="android.view.inputmethod.EditorInfo"> +</parameter> +<parameter name="restarting" type="boolean"> +</parameter> +</method> +<method name="onUnbindInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onUpdateCursor" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="newCursor" type="android.graphics.Rect"> +</parameter> +</method> +<method name="onUpdateExtractedText" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="token" type="int"> +</parameter> +<parameter name="text" type="android.view.inputmethod.ExtractedText"> +</parameter> +</method> +<method name="onUpdateExtractingViews" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ei" type="android.view.inputmethod.EditorInfo"> +</parameter> +</method> +<method name="onUpdateExtractingVisibility" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ei" type="android.view.inputmethod.EditorInfo"> +</parameter> +</method> +<method name="onUpdateSelection" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="oldSelStart" type="int"> +</parameter> +<parameter name="oldSelEnd" type="int"> +</parameter> +<parameter name="newSelStart" type="int"> +</parameter> +<parameter name="newSelEnd" type="int"> +</parameter> +<parameter name="candidatesStart" type="int"> +</parameter> +<parameter name="candidatesEnd" type="int"> +</parameter> +</method> +<method name="onWindowHidden" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onWindowShown" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="requestHideSelf" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="sendDefaultEditorAction" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fromEnterKey" type="boolean"> +</parameter> +</method> +<method name="sendDownUpKeyEvents" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="keyEventCode" type="int"> +</parameter> +</method> +<method name="sendKeyChar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="charCode" type="char"> +</parameter> +</method> +<method name="setCandidatesView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> +<method name="setCandidatesViewShown" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="shown" type="boolean"> +</parameter> +</method> +<method name="setExtractView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> +<method name="setExtractViewShown" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="shown" type="boolean"> +</parameter> +</method> +<method name="setInputView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> +<method name="showStatusIcon" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="iconResId" type="int"> +</parameter> +</method> +<method name="showWindow" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="showInput" type="boolean"> +</parameter> +</method> +<method name="switchInputMethod" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="java.lang.String"> +</parameter> +</method> +<method name="updateFullscreenMode" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="updateInputViewShown" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> +<class name="InputMethodService.InputMethodImpl" + extends="android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="InputMethodService.InputMethodImpl" + type="android.inputmethodservice.InputMethodService.InputMethodImpl" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="attachToken" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="token" type="android.os.IBinder"> +</parameter> +</method> +<method name="bindInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="binding" type="android.view.inputmethod.InputBinding"> +</parameter> +</method> +<method name="hideSoftInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="flags" type="int"> +</parameter> +<parameter name="resultReceiver" type="android.os.ResultReceiver"> +</parameter> +</method> +<method name="restartInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ic" type="android.view.inputmethod.InputConnection"> +</parameter> +<parameter name="attribute" type="android.view.inputmethod.EditorInfo"> +</parameter> +</method> +<method name="showSoftInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="flags" type="int"> +</parameter> +<parameter name="resultReceiver" type="android.os.ResultReceiver"> +</parameter> +</method> +<method name="startInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ic" type="android.view.inputmethod.InputConnection"> +</parameter> +<parameter name="attribute" type="android.view.inputmethod.EditorInfo"> +</parameter> +</method> +<method name="unbindInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> +<class name="InputMethodService.InputMethodSessionImpl" + extends="android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="InputMethodService.InputMethodSessionImpl" + type="android.inputmethodservice.InputMethodService.InputMethodSessionImpl" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="appPrivateCommand" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="action" type="java.lang.String"> +</parameter> +<parameter name="data" type="android.os.Bundle"> +</parameter> +</method> +<method name="displayCompletions" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="completions" type="android.view.inputmethod.CompletionInfo[]"> +</parameter> +</method> +<method name="finishInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="toggleSoftInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="showFlags" type="int"> +</parameter> +<parameter name="hideFlags" type="int"> +</parameter> +</method> +<method name="updateCursor" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="newCursor" type="android.graphics.Rect"> +</parameter> +</method> +<method name="updateExtractedText" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="token" type="int"> +</parameter> +<parameter name="text" type="android.view.inputmethod.ExtractedText"> +</parameter> +</method> +<method name="updateSelection" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="oldSelStart" type="int"> +</parameter> +<parameter name="oldSelEnd" type="int"> +</parameter> +<parameter name="newSelStart" type="int"> +</parameter> +<parameter name="newSelEnd" type="int"> +</parameter> +<parameter name="candidatesStart" type="int"> +</parameter> +<parameter name="candidatesEnd" type="int"> +</parameter> +</method> +</class> +<class name="InputMethodService.Insets" + extends="java.lang.Object" + abstract="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<constructor name="InputMethodService.Insets" + type="android.inputmethodservice.InputMethodService.Insets" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<field name="TOUCHABLE_INSETS_CONTENT" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TOUCHABLE_INSETS_FRAME" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TOUCHABLE_INSETS_VISIBLE" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="contentTopInsets" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="touchableInsets" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="visibleTopInsets" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="Keyboard" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="Keyboard" + type="android.inputmethodservice.Keyboard" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="xmlLayoutResId" type="int"> +</parameter> +</constructor> +<constructor name="Keyboard" + type="android.inputmethodservice.Keyboard" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="xmlLayoutResId" type="int"> +</parameter> +<parameter name="modeId" type="int"> +</parameter> +</constructor> +<constructor name="Keyboard" + type="android.inputmethodservice.Keyboard" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="layoutTemplateResId" type="int"> +</parameter> +<parameter name="characters" type="java.lang.CharSequence"> +</parameter> +<parameter name="columns" type="int"> +</parameter> +<parameter name="horizontalPadding" type="int"> +</parameter> +</constructor> +<method name="createKeyFromXml" + return="android.inputmethodservice.Keyboard.Key" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="res" type="android.content.res.Resources"> +</parameter> +<parameter name="parent" type="android.inputmethodservice.Keyboard.Row"> +</parameter> +<parameter name="x" type="int"> +</parameter> +<parameter name="y" type="int"> +</parameter> +<parameter name="parser" type="android.content.res.XmlResourceParser"> +</parameter> +</method> +<method name="createRowFromXml" + return="android.inputmethodservice.Keyboard.Row" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="res" type="android.content.res.Resources"> +</parameter> +<parameter name="parser" type="android.content.res.XmlResourceParser"> +</parameter> +</method> +<method name="getHeight" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getHorizontalGap" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="getKeyHeight" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="getKeyWidth" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="getKeys" + return="java.util.List<android.inputmethodservice.Keyboard.Key>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getMinWidth" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getModifierKeys" + return="java.util.List<android.inputmethodservice.Keyboard.Key>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getNearestKeys" + return="int[]" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="x" type="int"> +</parameter> +<parameter name="y" type="int"> +</parameter> +</method> +<method name="getShiftKeyIndex" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getVerticalGap" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="isShifted" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setHorizontalGap" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="gap" type="int"> +</parameter> +</method> +<method name="setKeyHeight" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="height" type="int"> +</parameter> +</method> +<method name="setKeyWidth" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="width" type="int"> +</parameter> +</method> +<method name="setShifted" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="shiftState" type="boolean"> +</parameter> +</method> +<method name="setVerticalGap" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="gap" type="int"> +</parameter> +</method> +<field name="EDGE_BOTTOM" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EDGE_LEFT" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EDGE_RIGHT" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EDGE_TOP" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_ALT" + type="int" + transient="false" + volatile="false" + value="-6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_CANCEL" + type="int" + transient="false" + volatile="false" + value="-3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_DELETE" + type="int" + transient="false" + volatile="false" + value="-5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_DONE" + type="int" + transient="false" + volatile="false" + value="-4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_MODE_CHANGE" + type="int" + transient="false" + volatile="false" + value="-2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_SHIFT" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="Keyboard.Key" + extends="java.lang.Object" + abstract="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="Keyboard.Key" + type="android.inputmethodservice.Keyboard.Key" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="parent" type="android.inputmethodservice.Keyboard.Row"> +</parameter> +</constructor> +<constructor name="Keyboard.Key" + type="android.inputmethodservice.Keyboard.Key" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="res" type="android.content.res.Resources"> +</parameter> +<parameter name="parent" type="android.inputmethodservice.Keyboard.Row"> +</parameter> +<parameter name="x" type="int"> +</parameter> +<parameter name="y" type="int"> +</parameter> +<parameter name="parser" type="android.content.res.XmlResourceParser"> +</parameter> +</constructor> +<method name="getCurrentDrawableState" + return="int[]" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isInside" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="x" type="int"> +</parameter> +<parameter name="y" type="int"> +</parameter> +</method> +<method name="onPressed" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onReleased" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="inside" type="boolean"> +</parameter> +</method> +<method name="squaredDistanceFrom" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="x" type="int"> +</parameter> +<parameter name="y" type="int"> +</parameter> +</method> +<field name="codes" + type="int[]" + transient="false" + volatile="false" + value="null" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="edgeFlags" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="gap" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="height" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="icon" + type="android.graphics.drawable.Drawable" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="iconPreview" + type="android.graphics.drawable.Drawable" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="label" + type="java.lang.CharSequence" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="modifier" + type="boolean" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="on" + type="boolean" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="popupCharacters" + type="java.lang.CharSequence" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="popupResId" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="pressed" + type="boolean" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="repeatable" + type="boolean" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="sticky" + type="boolean" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="text" + type="java.lang.CharSequence" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="width" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="x" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="y" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="Keyboard.Row" + extends="java.lang.Object" + abstract="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="Keyboard.Row" + type="android.inputmethodservice.Keyboard.Row" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="parent" type="android.inputmethodservice.Keyboard"> +</parameter> +</constructor> +<constructor name="Keyboard.Row" + type="android.inputmethodservice.Keyboard.Row" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="res" type="android.content.res.Resources"> +</parameter> +<parameter name="parent" type="android.inputmethodservice.Keyboard"> +</parameter> +<parameter name="parser" type="android.content.res.XmlResourceParser"> +</parameter> +</constructor> +<field name="defaultHeight" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="defaultHorizontalGap" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="defaultWidth" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="mode" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="rowEdgeFlags" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="verticalGap" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="KeyboardView" + extends="android.view.View" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.view.View.OnClickListener"> +</implements> +<constructor name="KeyboardView" + type="android.inputmethodservice.KeyboardView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +</constructor> +<constructor name="KeyboardView" + type="android.inputmethodservice.KeyboardView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +<parameter name="defStyle" type="int"> +</parameter> +</constructor> +<method name="closing" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getKeyboard" + return="android.inputmethodservice.Keyboard" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getOnKeyboardActionListener" + return="android.inputmethodservice.KeyboardView.OnKeyboardActionListener" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="handleBack" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isPreviewEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + 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" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onClick" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="v" type="android.view.View"> +</parameter> +</method> +<method name="onDetachedFromWindow" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onDraw" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="canvas" type="android.graphics.Canvas"> +</parameter> +</method> +<method name="onLongPress" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="popupKey" type="android.inputmethodservice.Keyboard.Key"> +</parameter> +</method> +<method name="onMeasure" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="widthMeasureSpec" type="int"> +</parameter> +<parameter name="heightMeasureSpec" type="int"> +</parameter> +</method> +<method name="onSizeChanged" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="w" type="int"> +</parameter> +<parameter name="h" type="int"> +</parameter> +<parameter name="oldw" type="int"> +</parameter> +<parameter name="oldh" type="int"> +</parameter> +</method> +<method name="setKeyboard" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="keyboard" type="android.inputmethodservice.Keyboard"> +</parameter> +</method> +<method name="setOnKeyboardActionListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.inputmethodservice.KeyboardView.OnKeyboardActionListener"> +</parameter> +</method> +<method name="setPopupOffset" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="x" type="int"> +</parameter> +<parameter name="y" type="int"> +</parameter> +</method> +<method name="setPopupParent" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="v" type="android.view.View"> +</parameter> +</method> +<method name="setPreviewEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<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" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="shifted" type="boolean"> +</parameter> +</method> +<method name="setVerticalCorrection" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="verticalOffset" type="int"> +</parameter> +</method> +<method name="swipeDown" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="swipeLeft" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="swipeRight" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="swipeUp" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +</class> +<interface name="KeyboardView.OnKeyboardActionListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onKey" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="primaryCode" type="int"> +</parameter> +<parameter name="keyCodes" type="int[]"> +</parameter> +</method> +<method name="onPress" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="primaryCode" type="int"> +</parameter> +</method> +<method name="onRelease" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="primaryCode" type="int"> +</parameter> +</method> +<method name="onText" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +</method> +<method name="swipeDown" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="swipeLeft" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="swipeRight" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="swipeUp" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</interface> +</package> <package name="android.location" > <class name="Address" @@ -54912,6 +61779,199 @@ </exception> </method> </class> +<class name="GpsSatellite" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<method name="getAzimuth" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getElevation" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPrn" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSnr" + return="float" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="hasAlmanac" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="hasEphemeris" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="usedInFix" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> +<class name="GpsStatus" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<method name="getMaxSatellites" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSatellites" + return="java.lang.Iterable<android.location.GpsSatellite>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getTimeToFirstFix" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<field name="GPS_EVENT_FIRST_FIX" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="GPS_EVENT_SATELLITE_STATUS" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="GPS_EVENT_STARTED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="GPS_EVENT_STOPPED" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<interface name="GpsStatus.Listener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onGpsStatusChanged" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="int"> +</parameter> +</method> +</interface> <class name="Location" extends="java.lang.Object" abstract="false" @@ -55028,6 +62088,21 @@ <parameter name="dest" type="android.location.Location"> </parameter> </method> +<method name="dump" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pw" type="android.util.Printer"> +</parameter> +<parameter name="prefix" type="java.lang.String"> +</parameter> +</method> <method name="getAccuracy" return="float" abstract="false" @@ -55487,6 +62562,19 @@ deprecated="not deprecated" visibility="public" > +<method name="addGpsStatusListener" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.location.GpsStatus.Listener"> +</parameter> +</method> <method name="addProximityAlert" return="void" abstract="false" @@ -55508,6 +62596,76 @@ <parameter name="intent" type="android.app.PendingIntent"> </parameter> </method> +<method name="addTestProvider" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="requiresNetwork" type="boolean"> +</parameter> +<parameter name="requiresSatellite" type="boolean"> +</parameter> +<parameter name="requiresCell" type="boolean"> +</parameter> +<parameter name="hasMonetaryCost" type="boolean"> +</parameter> +<parameter name="supportsAltitude" type="boolean"> +</parameter> +<parameter name="supportsSpeed" type="boolean"> +</parameter> +<parameter name="supportsBearing" type="boolean"> +</parameter> +<parameter name="powerRequirement" type="int"> +</parameter> +<parameter name="accuracy" type="int"> +</parameter> +</method> +<method name="clearTestProviderEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +</method> +<method name="clearTestProviderLocation" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +</method> +<method name="clearTestProviderStatus" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +</method> <method name="getAllProviders" return="java.util.List<java.lang.String>" abstract="false" @@ -55534,6 +62692,19 @@ <parameter name="enabledOnly" type="boolean"> </parameter> </method> +<method name="getGpsStatus" + return="android.location.GpsStatus" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="status" type="android.location.GpsStatus"> +</parameter> +</method> <method name="getLastKnownLocation" return="android.location.Location" abstract="false" @@ -55601,6 +62772,19 @@ <parameter name="provider" type="java.lang.String"> </parameter> </method> +<method name="removeGpsStatusListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.location.GpsStatus.Listener"> +</parameter> +</method> <method name="removeProximityAlert" return="void" abstract="false" @@ -55614,6 +62798,19 @@ <parameter name="intent" type="android.app.PendingIntent"> </parameter> </method> +<method name="removeTestProvider" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +</method> <method name="removeUpdates" return="void" abstract="false" @@ -55627,6 +62824,19 @@ <parameter name="listener" type="android.location.LocationListener"> </parameter> </method> +<method name="removeUpdates" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="intent" type="android.app.PendingIntent"> +</parameter> +</method> <method name="requestLocationUpdates" return="void" abstract="false" @@ -55667,6 +62877,91 @@ <parameter name="looper" type="android.os.Looper"> </parameter> </method> +<method name="requestLocationUpdates" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +<parameter name="minTime" type="long"> +</parameter> +<parameter name="minDistance" type="float"> +</parameter> +<parameter name="intent" type="android.app.PendingIntent"> +</parameter> +</method> +<method name="sendExtraCommand" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +<parameter name="command" type="java.lang.String"> +</parameter> +<parameter name="extras" type="android.os.Bundle"> +</parameter> +</method> +<method name="setTestProviderEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +<parameter name="enabled" type="boolean"> +</parameter> +</method> +<method name="setTestProviderLocation" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +<parameter name="loc" type="android.location.Location"> +</parameter> +</method> +<method name="setTestProviderStatus" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="provider" type="java.lang.String"> +</parameter> +<parameter name="status" type="int"> +</parameter> +<parameter name="extras" type="android.os.Bundle"> +</parameter> +<parameter name="updateTime" type="long"> +</parameter> +</method> <field name="GPS_PROVIDER" type="java.lang.String" transient="false" @@ -55678,6 +62973,28 @@ visibility="public" > </field> +<field name="KEY_LOCATION_CHANGED" + type="java.lang.String" + transient="false" + volatile="false" + value=""location"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEY_PROVIDER_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""providerEnabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEY_PROXIMITY_ENTERING" type="java.lang.String" transient="false" @@ -55689,6 +63006,17 @@ visibility="public" > </field> +<field name="KEY_STATUS_CHANGED" + type="java.lang.String" + transient="false" + volatile="false" + value=""status"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="NETWORK_PROVIDER" type="java.lang.String" transient="false" @@ -55918,6 +63246,111 @@ > </method> </class> +<class name="AudioFormat" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AudioFormat" + type="android.media.AudioFormat" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<field name="CHANNEL_CONFIGURATION_DEFAULT" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CHANNEL_CONFIGURATION_INVALID" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CHANNEL_CONFIGURATION_MONO" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CHANNEL_CONFIGURATION_STEREO" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ENCODING_DEFAULT" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ENCODING_INVALID" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ENCODING_PCM_16BIT" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ENCODING_PCM_8BIT" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="AudioManager" extends="java.lang.Object" abstract="false" @@ -56049,6 +63482,17 @@ <parameter name="vibrateType" type="int"> </parameter> </method> +<method name="isBluetoothA2dpOn" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isBluetoothScoOn" return="boolean" abstract="false" @@ -56117,6 +63561,34 @@ <parameter name="effectType" type="int"> </parameter> </method> +<method name="playSoundEffect" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="effectType" type="int"> +</parameter> +<parameter name="volume" type="float"> +</parameter> +</method> +<method name="setBluetoothA2dpOn" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="on" type="boolean"> +</parameter> +</method> <method name="setBluetoothScoOn" return="void" abstract="false" @@ -56285,6 +63757,17 @@ visibility="public" > </method> +<field name="ACTION_AUDIO_BECOMING_NOISY" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.media.AUDIO_BECOMING_NOISY"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ADJUST_LOWER" type="int" transient="false" @@ -56450,6 +63933,50 @@ visibility="public" > </field> +<field name="FX_KEYPRESS_DELETE" + type="int" + transient="false" + volatile="false" + value="7" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FX_KEYPRESS_RETURN" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FX_KEYPRESS_SPACEBAR" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FX_KEYPRESS_STANDARD" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FX_KEY_CLICK" type="int" transient="false" @@ -56523,7 +64050,7 @@ value="5" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -56589,6 +64116,28 @@ value="4" static="true" final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="ROUTE_BLUETOOTH_A2DP" + type="int" + transient="false" + volatile="false" + value="16" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ROUTE_BLUETOOTH_SCO" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" deprecated="not deprecated" visibility="public" > @@ -56648,6 +64197,17 @@ visibility="public" > </field> +<field name="STREAM_NOTIFICATION" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="STREAM_RING" type="int" transient="false" @@ -56759,6 +64319,1025 @@ > </field> </class> +<class name="AudioRecord" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AudioRecord" + type="android.media.AudioRecord" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="audioSource" type="int"> +</parameter> +<parameter name="sampleRateInHz" type="int"> +</parameter> +<parameter name="channelConfig" type="int"> +</parameter> +<parameter name="audioFormat" type="int"> +</parameter> +<parameter name="bufferSizeInBytes" type="int"> +</parameter> +<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException"> +</exception> +</constructor> +<method name="getAudioFormat" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getAudioSource" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getChannelConfiguration" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getChannelCount" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getMinBufferSize" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="sampleRateInHz" type="int"> +</parameter> +<parameter name="channelConfig" type="int"> +</parameter> +<parameter name="audioFormat" type="int"> +</parameter> +</method> +<method name="getNotificationMarkerPosition" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPositionNotificationPeriod" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getRecordingState" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSampleRate" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getState" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="read" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="audioData" type="byte[]"> +</parameter> +<parameter name="offsetInBytes" type="int"> +</parameter> +<parameter name="sizeInBytes" type="int"> +</parameter> +</method> +<method name="read" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="audioData" type="short[]"> +</parameter> +<parameter name="offsetInShorts" type="int"> +</parameter> +<parameter name="sizeInShorts" type="int"> +</parameter> +</method> +<method name="read" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="audioBuffer" type="java.nio.ByteBuffer"> +</parameter> +<parameter name="sizeInBytes" type="int"> +</parameter> +</method> +<method name="release" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setNotificationMarkerPosition" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="markerInFrames" type="int"> +</parameter> +</method> +<method name="setPositionNotificationPeriod" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="periodInFrames" type="int"> +</parameter> +</method> +<method name="setRecordPositionUpdateListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.AudioRecord.OnRecordPositionUpdateListener"> +</parameter> +</method> +<method name="setRecordPositionUpdateListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.AudioRecord.OnRecordPositionUpdateListener"> +</parameter> +<parameter name="handler" type="android.os.Handler"> +</parameter> +</method> +<method name="startRecording" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<method name="stop" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<field name="ERROR" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_BAD_VALUE" + type="int" + transient="false" + volatile="false" + value="-2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_INVALID_OPERATION" + type="int" + transient="false" + volatile="false" + value="-3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RECORDSTATE_RECORDING" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RECORDSTATE_STOPPED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="STATE_INITIALIZED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="STATE_UNINITIALIZED" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SUCCESS" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<interface name="AudioRecord.OnRecordPositionUpdateListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onMarkerReached" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="recorder" type="android.media.AudioRecord"> +</parameter> +</method> +<method name="onPeriodicNotification" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="recorder" type="android.media.AudioRecord"> +</parameter> +</method> +</interface> +<class name="AudioTrack" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AudioTrack" + type="android.media.AudioTrack" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="streamType" type="int"> +</parameter> +<parameter name="sampleRateInHz" type="int"> +</parameter> +<parameter name="channelConfig" type="int"> +</parameter> +<parameter name="audioFormat" type="int"> +</parameter> +<parameter name="bufferSizeInBytes" type="int"> +</parameter> +<parameter name="mode" type="int"> +</parameter> +<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException"> +</exception> +</constructor> +<method name="flush" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getAudioFormat" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getChannelConfiguration" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getChannelCount" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getMaxVolume" + return="float" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getMinBufferSize" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="sampleRateInHz" type="int"> +</parameter> +<parameter name="channelConfig" type="int"> +</parameter> +<parameter name="audioFormat" type="int"> +</parameter> +</method> +<method name="getMinVolume" + return="float" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getNativeFrameCount" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="getNativeOutputSampleRate" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="streamType" type="int"> +</parameter> +</method> +<method name="getNotificationMarkerPosition" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPlayState" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPlaybackHeadPosition" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPlaybackRate" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPositionNotificationPeriod" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSampleRate" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getState" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getStreamType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="pause" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<method name="play" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<method name="release" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="reloadStaticData" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setLoopPoints" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="startInFrames" type="int"> +</parameter> +<parameter name="endInFrames" type="int"> +</parameter> +<parameter name="loopCount" type="int"> +</parameter> +</method> +<method name="setNotificationMarkerPosition" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="markerInFrames" type="int"> +</parameter> +</method> +<method name="setPlaybackHeadPosition" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="positionInFrames" type="int"> +</parameter> +</method> +<method name="setPlaybackPositionUpdateListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.AudioTrack.OnPlaybackPositionUpdateListener"> +</parameter> +</method> +<method name="setPlaybackPositionUpdateListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.AudioTrack.OnPlaybackPositionUpdateListener"> +</parameter> +<parameter name="handler" type="android.os.Handler"> +</parameter> +</method> +<method name="setPlaybackRate" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="sampleRateInHz" type="int"> +</parameter> +</method> +<method name="setPositionNotificationPeriod" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="periodInFrames" type="int"> +</parameter> +</method> +<method name="setState" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="state" type="int"> +</parameter> +</method> +<method name="setStereoVolume" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="leftVolume" type="float"> +</parameter> +<parameter name="rightVolume" type="float"> +</parameter> +</method> +<method name="stop" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<method name="write" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="audioData" type="byte[]"> +</parameter> +<parameter name="offsetInBytes" type="int"> +</parameter> +<parameter name="sizeInBytes" type="int"> +</parameter> +</method> +<method name="write" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="audioData" type="short[]"> +</parameter> +<parameter name="offsetInShorts" type="int"> +</parameter> +<parameter name="sizeInShorts" type="int"> +</parameter> +</method> +<field name="ERROR" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_BAD_VALUE" + type="int" + transient="false" + volatile="false" + value="-2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ERROR_INVALID_OPERATION" + type="int" + transient="false" + volatile="false" + value="-3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MODE_STATIC" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MODE_STREAM" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="PLAYSTATE_PAUSED" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="PLAYSTATE_PLAYING" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="PLAYSTATE_STOPPED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="STATE_INITIALIZED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="STATE_NO_STATIC_DATA" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="STATE_UNINITIALIZED" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SUCCESS" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<interface name="AudioTrack.OnPlaybackPositionUpdateListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onMarkerReached" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="track" type="android.media.AudioTrack"> +</parameter> +</method> +<method name="onPeriodicNotification" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="track" type="android.media.AudioTrack"> +</parameter> +</method> +</interface> <class name="FaceDetector" extends="java.lang.Object" abstract="false" @@ -56898,6 +65477,343 @@ > </field> </class> +<class name="JetPlayer" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="clearQueue" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="clone" + return="java.lang.Object" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<exception name="CloneNotSupportedException" type="java.lang.CloneNotSupportedException"> +</exception> +</method> +<method name="closeJetFile" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getJetPlayer" + return="android.media.JetPlayer" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getMaxTracks" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="loadJetFile" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="path" type="java.lang.String"> +</parameter> +</method> +<method name="loadJetFile" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="afd" type="android.content.res.AssetFileDescriptor"> +</parameter> +</method> +<method name="pause" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="play" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="queueJetSegment" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="segmentNum" type="int"> +</parameter> +<parameter name="libNum" type="int"> +</parameter> +<parameter name="repeatCount" type="int"> +</parameter> +<parameter name="transpose" type="int"> +</parameter> +<parameter name="muteFlags" type="int"> +</parameter> +<parameter name="userID" type="byte"> +</parameter> +</method> +<method name="queueJetSegmentMuteArray" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="segmentNum" type="int"> +</parameter> +<parameter name="libNum" type="int"> +</parameter> +<parameter name="repeatCount" type="int"> +</parameter> +<parameter name="transpose" type="int"> +</parameter> +<parameter name="muteArray" type="boolean[]"> +</parameter> +<parameter name="userID" type="byte"> +</parameter> +</method> +<method name="release" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setEventListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.JetPlayer.OnJetEventListener"> +</parameter> +</method> +<method name="setEventListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.JetPlayer.OnJetEventListener"> +</parameter> +<parameter name="handler" type="android.os.Handler"> +</parameter> +</method> +<method name="setMuteArray" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="muteArray" type="boolean[]"> +</parameter> +<parameter name="sync" type="boolean"> +</parameter> +</method> +<method name="setMuteFlag" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="trackId" type="int"> +</parameter> +<parameter name="muteFlag" type="boolean"> +</parameter> +<parameter name="sync" type="boolean"> +</parameter> +</method> +<method name="setMuteFlags" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="muteFlags" type="int"> +</parameter> +<parameter name="sync" type="boolean"> +</parameter> +</method> +<method name="triggerClip" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="clipId" type="int"> +</parameter> +</method> +</class> +<interface name="JetPlayer.OnJetEventListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onJetEvent" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="player" type="android.media.JetPlayer"> +</parameter> +<parameter name="segment" type="short"> +</parameter> +<parameter name="track" type="byte"> +</parameter> +<parameter name="channel" type="byte"> +</parameter> +<parameter name="controller" type="byte"> +</parameter> +<parameter name="value" type="byte"> +</parameter> +</method> +<method name="onJetNumQueuedSegmentUpdate" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="player" type="android.media.JetPlayer"> +</parameter> +<parameter name="nbSegments" type="int"> +</parameter> +</method> +<method name="onJetPauseUpdate" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="player" type="android.media.JetPlayer"> +</parameter> +<parameter name="paused" type="int"> +</parameter> +</method> +<method name="onJetUserIdUpdate" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="player" type="android.media.JetPlayer"> +</parameter> +<parameter name="userId" type="int"> +</parameter> +<parameter name="repeatCount" type="int"> +</parameter> +</method> +</interface> <class name="MediaPlayer" extends="java.lang.Object" abstract="false" @@ -57005,6 +65921,17 @@ visibility="public" > </method> +<method name="isLooping" + return="boolean" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isPlaying" return="boolean" abstract="false" @@ -57227,7 +66154,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="l" type="android.media.MediaPlayer.OnBufferingUpdateListener"> +<parameter name="listener" type="android.media.MediaPlayer.OnBufferingUpdateListener"> </parameter> </method> <method name="setOnCompletionListener" @@ -57240,7 +66167,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="l" type="android.media.MediaPlayer.OnCompletionListener"> +<parameter name="listener" type="android.media.MediaPlayer.OnCompletionListener"> </parameter> </method> <method name="setOnErrorListener" @@ -57253,7 +66180,20 @@ deprecated="not deprecated" visibility="public" > -<parameter name="l" type="android.media.MediaPlayer.OnErrorListener"> +<parameter name="listener" type="android.media.MediaPlayer.OnErrorListener"> +</parameter> +</method> +<method name="setOnInfoListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.MediaPlayer.OnInfoListener"> </parameter> </method> <method name="setOnPreparedListener" @@ -57266,7 +66206,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="l" type="android.media.MediaPlayer.OnPreparedListener"> +<parameter name="listener" type="android.media.MediaPlayer.OnPreparedListener"> </parameter> </method> <method name="setOnSeekCompleteListener" @@ -57279,7 +66219,20 @@ deprecated="not deprecated" visibility="public" > -<parameter name="l" type="android.media.MediaPlayer.OnSeekCompleteListener"> +<parameter name="listener" type="android.media.MediaPlayer.OnSeekCompleteListener"> +</parameter> +</method> +<method name="setOnVideoSizeChangedListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.MediaPlayer.OnVideoSizeChangedListener"> </parameter> </method> <method name="setScreenOnWhilePlaying" @@ -57351,6 +66304,17 @@ <exception name="IllegalStateException" type="java.lang.IllegalStateException"> </exception> </method> +<field name="MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK" + type="int" + transient="false" + volatile="false" + value="200" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="MEDIA_ERROR_SERVER_DIED" type="int" transient="false" @@ -57373,6 +66337,50 @@ visibility="public" > </field> +<field name="MEDIA_INFO_BAD_INTERLEAVING" + type="int" + transient="false" + volatile="false" + value="800" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MEDIA_INFO_NOT_SEEKABLE" + type="int" + transient="false" + volatile="false" + value="801" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MEDIA_INFO_UNKNOWN" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MEDIA_INFO_VIDEO_TRACK_LAGGING" + type="int" + transient="false" + volatile="false" + value="700" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <interface name="MediaPlayer.OnBufferingUpdateListener" abstract="true" @@ -57443,6 +66451,31 @@ </parameter> </method> </interface> +<interface name="MediaPlayer.OnInfoListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onInfo" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mp" type="android.media.MediaPlayer"> +</parameter> +<parameter name="what" type="int"> +</parameter> +<parameter name="extra" type="int"> +</parameter> +</method> +</interface> <interface name="MediaPlayer.OnPreparedListener" abstract="true" static="true" @@ -57485,6 +66518,31 @@ </parameter> </method> </interface> +<interface name="MediaPlayer.OnVideoSizeChangedListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onVideoSizeChanged" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mp" type="android.media.MediaPlayer"> +</parameter> +<parameter name="width" type="int"> +</parameter> +<parameter name="height" type="int"> +</parameter> +</method> +</interface> <class name="MediaRecorder" extends="java.lang.Object" abstract="false" @@ -57517,13 +66575,15 @@ <method name="prepare" return="void" abstract="false" - native="true" + native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > +<exception name="IOException" type="java.io.IOException"> +</exception> <exception name="IllegalStateException" type="java.lang.IllegalStateException"> </exception> </method> @@ -57541,7 +66601,7 @@ <method name="reset" return="void" abstract="false" - native="true" + native="false" synchronized="false" static="false" final="false" @@ -57579,7 +66639,35 @@ <exception name="IllegalStateException" type="java.lang.IllegalStateException"> </exception> </method> -<method name="setOutputFile" +<method name="setCamera" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="c" type="android.hardware.Camera"> +</parameter> +</method> +<method name="setMaxDuration" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="max_duration_ms" type="int"> +</parameter> +<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException"> +</exception> +</method> +<method name="setMaxFileSize" return="void" abstract="false" native="true" @@ -57589,6 +66677,62 @@ deprecated="not deprecated" visibility="public" > +<parameter name="max_filesize_bytes" type="long"> +</parameter> +<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException"> +</exception> +</method> +<method name="setOnErrorListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="l" type="android.media.MediaRecorder.OnErrorListener"> +</parameter> +</method> +<method name="setOnInfoListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.media.MediaRecorder.OnInfoListener"> +</parameter> +</method> +<method name="setOutputFile" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fd" type="java.io.FileDescriptor"> +</parameter> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<method name="setOutputFile" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="path" type="java.lang.String"> </parameter> <exception name="IllegalStateException" type="java.lang.IllegalStateException"> @@ -57622,6 +66766,68 @@ <parameter name="sv" type="android.view.Surface"> </parameter> </method> +<method name="setVideoEncoder" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="video_encoder" type="int"> +</parameter> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<method name="setVideoFrameRate" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="rate" type="int"> +</parameter> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<method name="setVideoSize" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="width" type="int"> +</parameter> +<parameter name="height" type="int"> +</parameter> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> +<method name="setVideoSource" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="video_source" type="int"> +</parameter> +<exception name="IllegalStateException" type="java.lang.IllegalStateException"> +</exception> +</method> <method name="start" return="void" abstract="false" @@ -57648,6 +66854,50 @@ <exception name="IllegalStateException" type="java.lang.IllegalStateException"> </exception> </method> +<field name="MEDIA_RECORDER_ERROR_UNKNOWN" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MEDIA_RECORDER_INFO_MAX_DURATION_REACHED" + type="int" + transient="false" + volatile="false" + value="800" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED" + type="int" + transient="false" + volatile="false" + value="801" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MEDIA_RECORDER_INFO_UNKNOWN" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="MediaRecorder.AudioEncoder" extends="java.lang.Object" @@ -57711,6 +66961,56 @@ > </field> </class> +<interface name="MediaRecorder.OnErrorListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onError" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mr" type="android.media.MediaRecorder"> +</parameter> +<parameter name="what" type="int"> +</parameter> +<parameter name="extra" type="int"> +</parameter> +</method> +</interface> +<interface name="MediaRecorder.OnInfoListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onInfo" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mr" type="android.media.MediaRecorder"> +</parameter> +<parameter name="what" type="int"> +</parameter> +<parameter name="extra" type="int"> +</parameter> +</method> +</interface> <class name="MediaRecorder.OutputFormat" extends="java.lang.Object" abstract="false" @@ -57741,6 +67041,17 @@ visibility="public" > </field> +<field name="RAW_AMR" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="THREE_GPP" type="int" transient="false" @@ -57753,6 +67064,90 @@ > </field> </class> +<class name="MediaRecorder.VideoEncoder" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<field name="DEFAULT" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="H263" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="H264" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MPEG_4_SP" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="MediaRecorder.VideoSource" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<field name="CAMERA" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DEFAULT" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="MediaScannerConnection" extends="java.lang.Object" abstract="false" @@ -58134,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" @@ -58445,6 +67851,40 @@ <parameter name="priority" type="int"> </parameter> </method> +<method name="load" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="afd" type="android.content.res.AssetFileDescriptor"> +</parameter> +<parameter name="priority" type="int"> +</parameter> +</method> +<method name="load" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fd" type="java.io.FileDescriptor"> +</parameter> +<parameter name="offset" type="long"> +</parameter> +<parameter name="length" type="long"> +</parameter> +<parameter name="priority" type="int"> +</parameter> +</method> <method name="pause" return="void" abstract="false" @@ -59024,6 +68464,17 @@ visibility="public" > </method> +<method name="getBackgroundDataSetting" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getNetworkInfo" return="android.net.NetworkInfo" abstract="false" @@ -59119,6 +68570,17 @@ <parameter name="feature" type="java.lang.String"> </parameter> </method> +<field name="ACTION_BACKGROUND_DATA_SETTING_CHANGED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.net.conn.BACKGROUND_DATA_SETTING_CHANGED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="CONNECTIVITY_ACTION" type="java.lang.String" transient="false" @@ -63636,6 +73098,394 @@ </parameter> </constructor> </class> +<class name="GLSurfaceView" + extends="android.view.SurfaceView" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.view.SurfaceHolder.Callback"> +</implements> +<constructor name="GLSurfaceView" + type="android.opengl.GLSurfaceView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</constructor> +<constructor name="GLSurfaceView" + type="android.opengl.GLSurfaceView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +</constructor> +<method name="getDebugFlags" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getRenderMode" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onPause" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onResume" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="queueEvent" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="r" type="java.lang.Runnable"> +</parameter> +</method> +<method name="requestRender" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setDebugFlags" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="debugFlags" type="int"> +</parameter> +</method> +<method name="setEGLConfigChooser" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="configChooser" type="android.opengl.GLSurfaceView.EGLConfigChooser"> +</parameter> +</method> +<method name="setEGLConfigChooser" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="needDepth" type="boolean"> +</parameter> +</method> +<method name="setEGLConfigChooser" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="redSize" type="int"> +</parameter> +<parameter name="greenSize" type="int"> +</parameter> +<parameter name="blueSize" type="int"> +</parameter> +<parameter name="alphaSize" type="int"> +</parameter> +<parameter name="depthSize" type="int"> +</parameter> +<parameter name="stencilSize" type="int"> +</parameter> +</method> +<method name="setGLWrapper" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="glWrapper" type="android.opengl.GLSurfaceView.GLWrapper"> +</parameter> +</method> +<method name="setRenderMode" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="renderMode" type="int"> +</parameter> +</method> +<method name="setRenderer" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="renderer" type="android.opengl.GLSurfaceView.Renderer"> +</parameter> +</method> +<method name="surfaceChanged" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="holder" type="android.view.SurfaceHolder"> +</parameter> +<parameter name="format" type="int"> +</parameter> +<parameter name="w" type="int"> +</parameter> +<parameter name="h" type="int"> +</parameter> +</method> +<method name="surfaceCreated" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="holder" type="android.view.SurfaceHolder"> +</parameter> +</method> +<method name="surfaceDestroyed" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="holder" type="android.view.SurfaceHolder"> +</parameter> +</method> +<field name="DEBUG_CHECK_GL_ERROR" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DEBUG_LOG_GL_CALLS" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RENDERMODE_CONTINUOUSLY" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RENDERMODE_WHEN_DIRTY" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<interface name="GLSurfaceView.EGLConfigChooser" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="chooseConfig" + return="javax.microedition.khronos.egl.EGLConfig" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="egl" type="javax.microedition.khronos.egl.EGL10"> +</parameter> +<parameter name="display" type="javax.microedition.khronos.egl.EGLDisplay"> +</parameter> +</method> +</interface> +<interface name="GLSurfaceView.GLWrapper" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="wrap" + return="javax.microedition.khronos.opengles.GL" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="gl" type="javax.microedition.khronos.opengles.GL"> +</parameter> +</method> +</interface> +<interface name="GLSurfaceView.Renderer" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onDrawFrame" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="gl" type="javax.microedition.khronos.opengles.GL10"> +</parameter> +</method> +<method name="onSurfaceChanged" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="gl" type="javax.microedition.khronos.opengles.GL10"> +</parameter> +<parameter name="width" type="int"> +</parameter> +<parameter name="height" type="int"> +</parameter> +</method> +<method name="onSurfaceCreated" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="gl" type="javax.microedition.khronos.opengles.GL10"> +</parameter> +<parameter name="config" type="javax.microedition.khronos.egl.EGLConfig"> +</parameter> +</method> +</interface> <class name="GLU" extends="java.lang.Object" abstract="false" @@ -64322,9 +74172,307 @@ </parameter> </method> </class> +<class name="Visibility" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="Visibility" + type="android.opengl.Visibility" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="computeBoundingSphere" + return="void" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="positions" type="float[]"> +</parameter> +<parameter name="positionsOffset" type="int"> +</parameter> +<parameter name="positionsCount" type="int"> +</parameter> +<parameter name="sphere" type="float[]"> +</parameter> +<parameter name="sphereOffset" type="int"> +</parameter> +</method> +<method name="frustumCullSpheres" + return="int" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mvp" type="float[]"> +</parameter> +<parameter name="mvpOffset" type="int"> +</parameter> +<parameter name="spheres" type="float[]"> +</parameter> +<parameter name="spheresOffset" type="int"> +</parameter> +<parameter name="spheresCount" type="int"> +</parameter> +<parameter name="results" type="int[]"> +</parameter> +<parameter name="resultsOffset" type="int"> +</parameter> +<parameter name="resultsCapacity" type="int"> +</parameter> +</method> +<method name="visibilityTest" + return="int" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ws" type="float[]"> +</parameter> +<parameter name="wsOffset" type="int"> +</parameter> +<parameter name="positions" type="float[]"> +</parameter> +<parameter name="positionsOffset" type="int"> +</parameter> +<parameter name="indices" type="char[]"> +</parameter> +<parameter name="indicesOffset" type="int"> +</parameter> +<parameter name="indexCount" type="int"> +</parameter> +</method> +</class> </package> <package name="android.os" > +<class name="AsyncTask" + extends="java.lang.Object" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="AsyncTask" + type="android.os.AsyncTask" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="cancel" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mayInterruptIfRunning" type="boolean"> +</parameter> +</method> +<method name="doInBackground" + return="Result" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="params" type="Params..."> +</parameter> +</method> +<method name="execute" + return="android.os.AsyncTask<Params, Progress, Result>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="params" type="Params..."> +</parameter> +</method> +<method name="get" + return="Result" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<exception name="ExecutionException" type="java.util.concurrent.ExecutionException"> +</exception> +<exception name="InterruptedException" type="java.lang.InterruptedException"> +</exception> +</method> +<method name="get" + return="Result" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="timeout" type="long"> +</parameter> +<parameter name="unit" type="java.util.concurrent.TimeUnit"> +</parameter> +<exception name="ExecutionException" type="java.util.concurrent.ExecutionException"> +</exception> +<exception name="InterruptedException" type="java.lang.InterruptedException"> +</exception> +<exception name="TimeoutException" type="java.util.concurrent.TimeoutException"> +</exception> +</method> +<method name="getStatus" + return="android.os.AsyncTask.Status" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isCancelled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onCancelled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="onPostExecute" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="result" type="Result"> +</parameter> +</method> +<method name="onPreExecute" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +</method> +<method name="onProgressUpdate" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="values" type="Progress..."> +</parameter> +</method> +<method name="publishProgress" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="values" type="Progress..."> +</parameter> +</method> +</class> +<class name="AsyncTask.Status" + extends="java.lang.Enum" + abstract="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<method name="valueOf" + return="android.os.AsyncTask.Status" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="name" type="java.lang.String"> +</parameter> +</method> +<method name="values" + return="android.os.AsyncTask.Status[]" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> <class name="BadParcelableException" extends="android.util.AndroidRuntimeException" abstract="false" @@ -64566,6 +74714,21 @@ static="false" final="false" deprecated="not deprecated" + visibility="public" +> +<parameter name="fd" type="java.io.FileDescriptor"> +</parameter> +<parameter name="args" type="java.lang.String[]"> +</parameter> +</method> +<method name="dump" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" visibility="protected" > <parameter name="fd" type="java.io.FileDescriptor"> @@ -64797,6 +74960,16 @@ visibility="public" > </field> +<field name="DISPLAY" + type="java.lang.String" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FINGERPRINT" type="java.lang.String" transient="false" @@ -66224,12 +76397,27 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="port" type="int"> </parameter> </method> +<method name="dumpHprofData" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fileName" type="java.lang.String"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +</method> <method name="enableEmulatorTraceOutput" return="void" abstract="false" @@ -67161,6 +77349,17 @@ visibility="public" > </field> +<field name="MEDIA_CHECKING" + type="java.lang.String" + transient="false" + volatile="false" + value=""checking"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="MEDIA_MOUNTED" type="java.lang.String" transient="false" @@ -67183,6 +77382,17 @@ visibility="public" > </field> +<field name="MEDIA_NOFS" + type="java.lang.String" + transient="false" + volatile="false" + value=""nofs"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="MEDIA_REMOVED" type="java.lang.String" transient="false" @@ -67462,8 +77672,30 @@ deprecated="not deprecated" visibility="public" > +<parameter name="callback" type="android.os.Handler.Callback"> +</parameter> +</constructor> +<constructor name="Handler" + type="android.os.Handler" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="looper" type="android.os.Looper"> +</parameter> +</constructor> +<constructor name="Handler" + type="android.os.Handler" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="looper" type="android.os.Looper"> </parameter> +<parameter name="callback" type="android.os.Handler.Callback"> +</parameter> </constructor> <method name="dispatchMessage" return="void" @@ -67862,6 +78094,27 @@ </parameter> </method> </class> +<interface name="Handler.Callback" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="handleMessage" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="msg" type="android.os.Message"> +</parameter> +</method> +</interface> <class name="HandlerThread" extends="java.lang.Thread" abstract="false" @@ -67933,6 +78186,23 @@ deprecated="not deprecated" visibility="public" > +<method name="dump" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fd" type="java.io.FileDescriptor"> +</parameter> +<parameter name="args" type="java.lang.String[]"> +</parameter> +<exception name="RemoteException" type="android.os.RemoteException"> +</exception> +</method> <method name="getInterfaceDescriptor" return="java.lang.String" abstract="true" @@ -68173,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" @@ -69399,7 +79680,7 @@ synchronized="false" static="false" final="true" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="loader" type="java.lang.ClassLoader"> @@ -69475,7 +79756,7 @@ synchronized="false" static="false" final="true" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="outVal" type="java.util.Map"> @@ -69986,7 +80267,7 @@ synchronized="false" static="false" final="true" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="val" type="java.util.Map"> @@ -70257,6 +80538,17 @@ visibility="public" > </method> +<method name="getStatSize" + return="long" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="open" return="android.os.ParcelFileDescriptor" abstract="false" @@ -70299,6 +80591,17 @@ visibility="public" > </field> +<field name="MODE_APPEND" + type="int" + transient="false" + volatile="false" + value="33554432" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="MODE_CREATE" type="int" transient="false" @@ -71349,6 +81652,93 @@ > </constructor> </class> +<class name="ResultReceiver" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="ResultReceiver" + type="android.os.ResultReceiver" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="handler" type="android.os.Handler"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onReceiveResult" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="resultCode" type="int"> +</parameter> +<parameter name="resultData" type="android.os.Bundle"> +</parameter> +</method> +<method name="send" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="resultCode" type="int"> +</parameter> +<parameter name="resultData" type="android.os.Bundle"> +</parameter> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="out" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="StatFs" extends="java.lang.Object" abstract="false" @@ -71859,6 +82249,17 @@ <parameter name="attrs" type="android.util.AttributeSet"> </parameter> </constructor> +<method name="getDialog" + return="android.app.Dialog" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getDialogIcon" return="android.graphics.drawable.Drawable" abstract="false" @@ -74517,6 +84918,17 @@ visibility="public" > </field> +<field name="EXTRA_APPLICATION_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""com.android.browser.application_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="HISTORY_PROJECTION" type="java.lang.String[]" transient="false" @@ -75970,6 +86382,28 @@ visibility="public" > </field> +<field name="EXTRA_CREATE_DESCRIPTION" + type="java.lang.String" + transient="false" + volatile="false" + value=""com.android.contacts.action.CREATE_DESCRIPTION"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_FORCE_CREATE" + type="java.lang.String" + transient="false" + volatile="false" + value=""com.android.contacts.action.FORCE_CREATE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SEARCH_SUGGESTION_CLICKED" type="java.lang.String" transient="false" @@ -76003,6 +86437,17 @@ visibility="public" > </field> +<field name="SHOW_OR_CREATE_CONTACT" + type="java.lang.String" + transient="false" + volatile="false" + value=""com.android.contacts.action.SHOW_OR_CREATE_CONTACT"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="Contacts.Intents.Insert" extends="java.lang.Object" @@ -76163,6 +86608,17 @@ visibility="public" > </field> +<field name="PHONETIC_NAME" + type="java.lang.String" + transient="false" + volatile="false" + value=""phonetic_name"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="PHONE_ISPRIMARY" type="java.lang.String" transient="false" @@ -76218,6 +86674,94 @@ visibility="public" > </field> +<field name="SECONDARY_EMAIL" + type="java.lang.String" + transient="false" + volatile="false" + value=""secondary_email"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SECONDARY_EMAIL_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""secondary_email_type"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SECONDARY_PHONE" + type="java.lang.String" + transient="false" + volatile="false" + value=""secondary_phone"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SECONDARY_PHONE_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""secondary_phone_type"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TERTIARY_EMAIL" + type="java.lang.String" + transient="false" + volatile="false" + value=""tertiary_email"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TERTIARY_EMAIL_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""tertiary_email_type"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TERTIARY_PHONE" + type="java.lang.String" + transient="false" + volatile="false" + value=""tertiary_phone"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TERTIARY_PHONE_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""tertiary_phone_type"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="Contacts.Intents.UI" extends="java.lang.Object" @@ -76966,6 +87510,17 @@ visibility="public" > </field> +<field name="PHONETIC_NAME" + type="java.lang.String" + transient="false" + volatile="false" + value=""phonetic_name"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="PHOTO_VERSION" type="java.lang.String" transient="false" @@ -77570,6 +88125,160 @@ > </field> </interface> +<class name="LiveFolders" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.provider.BaseColumns"> +</implements> +<field name="ACTION_CREATE_LIVE_FOLDER" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.CREATE_LIVE_FOLDER"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DESCRIPTION" + type="java.lang.String" + transient="false" + volatile="false" + value=""description"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DISPLAY_MODE_GRID" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DISPLAY_MODE_LIST" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_LIVE_FOLDER_BASE_INTENT" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.livefolder.BASE_INTENT"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_LIVE_FOLDER_DISPLAY_MODE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.livefolder.DISPLAY_MODE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_LIVE_FOLDER_ICON" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.livefolder.ICON"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_LIVE_FOLDER_NAME" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.livefolder.NAME"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ICON_BITMAP" + type="java.lang.String" + transient="false" + volatile="false" + value=""icon_bitmap"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ICON_PACKAGE" + type="java.lang.String" + transient="false" + volatile="false" + value=""icon_package"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ICON_RESOURCE" + type="java.lang.String" + transient="false" + volatile="false" + value=""icon_resource"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTENT" + type="java.lang.String" + transient="false" + volatile="false" + value=""intent"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="NAME" + type="java.lang.String" + transient="false" + volatile="false" + value=""name"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="MediaStore" extends="java.lang.Object" abstract="false" @@ -77597,6 +88306,28 @@ visibility="public" > </method> +<field name="ACTION_IMAGE_CAPTURE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.media.action.IMAGE_CAPTURE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_VIDEO_CAPTURE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.media.action.VIDEO_CAPTURE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="AUTHORITY" type="java.lang.String" transient="false" @@ -77608,6 +88339,127 @@ visibility="public" > </field> +<field name="EXTRA_FINISH_ON_COMPLETION" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.finishOnCompletion"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_MEDIA_ALBUM" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.album"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_MEDIA_ARTIST" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.artist"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_MEDIA_FOCUS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.focus"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_MEDIA_TITLE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.title"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_OUTPUT" + type="java.lang.String" + transient="false" + volatile="false" + value=""output"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_SCREEN_ORIENTATION" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.screenOrientation"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_VIDEO_QUALITY" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.extra.videoQuality"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTENT_ACTION_MEDIA_SEARCH" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.MEDIA_SEARCH"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTENT_ACTION_STILL_IMAGE_CAMERA" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.media.action.STILL_IMAGE_CAMERA"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTENT_ACTION_VIDEO_CAMERA" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.media.action.VIDEO_CAMERA"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="MEDIA_SCANNER_VOLUME" type="java.lang.String" transient="false" @@ -77745,6 +88597,17 @@ visibility="public" > </field> +<field name="NUMBER_OF_SONGS_FOR_ARTIST" + type="java.lang.String" + transient="false" + volatile="false" + value=""numsongs_by_artist"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </interface> <class name="MediaStore.Audio.Albums" extends="java.lang.Object" @@ -78452,6 +89315,17 @@ visibility="public" > </field> +<field name="EXTRA_MAX_BYTES" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.provider.MediaStore.extra.MAX_BYTES"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="INTERNAL_CONTENT_URI" type="android.net.Uri" transient="false" @@ -79487,6 +90361,39 @@ visibility="public" > </field> +<field name="BOOKMARK" + type="java.lang.String" + transient="false" + volatile="false" + value=""bookmark"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="BUCKET_DISPLAY_NAME" + type="java.lang.String" + transient="false" + volatile="false" + value=""bucket_display_name"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="BUCKET_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""bucket_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="CATEGORY" type="java.lang.String" transient="false" @@ -79785,6 +90692,17 @@ visibility="public" > </constructor> +<field name="ACTION_AIRPLANE_MODE_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.AIRPLANE_MODE_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_APN_SETTINGS" type="java.lang.String" transient="false" @@ -79796,6 +90714,17 @@ visibility="public" > </field> +<field name="ACTION_APPLICATION_DEVELOPMENT_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.APPLICATION_DEVELOPMENT_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_APPLICATION_SETTINGS" type="java.lang.String" transient="false" @@ -79818,6 +90747,17 @@ visibility="public" > </field> +<field name="ACTION_DATA_ROAMING_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.DATA_ROAMING_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_DATE_SETTINGS" type="java.lang.String" transient="false" @@ -79840,6 +90780,28 @@ visibility="public" > </field> +<field name="ACTION_INPUT_METHOD_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.INPUT_METHOD_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_INTERNAL_STORAGE_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.INTERNAL_STORAGE_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_LOCALE_SETTINGS" type="java.lang.String" transient="false" @@ -79862,6 +90824,50 @@ visibility="public" > </field> +<field name="ACTION_MANAGE_APPLICATIONS_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.MANAGE_APPLICATIONS_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_MEMORY_CARD_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.MEMORY_CARD_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_NETWORK_OPERATOR_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.NETWORK_OPERATOR_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_QUICK_LAUNCH_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.QUICK_LAUNCH_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_SECURITY_SETTINGS" type="java.lang.String" transient="false" @@ -79895,6 +90901,39 @@ visibility="public" > </field> +<field name="ACTION_SYNC_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.SYNC_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_USER_DICTIONARY_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.USER_DICTIONARY_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_WIFI_IP_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.settings.WIFI_IP_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_WIFI_SETTINGS" type="java.lang.String" transient="false" @@ -80004,6 +91043,660 @@ > </field> </class> +<class name="Settings.Secure" + extends="android.provider.Settings.NameValueTable" + abstract="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<constructor name="Settings.Secure" + type="android.provider.Settings.Secure" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="getFloat" + return="float" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="def" type="float"> +</parameter> +</method> +<method name="getFloat" + return="float" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<exception name="Settings.SettingNotFoundException" type="android.provider.Settings.SettingNotFoundException"> +</exception> +</method> +<method name="getInt" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="def" type="int"> +</parameter> +</method> +<method name="getInt" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<exception name="Settings.SettingNotFoundException" type="android.provider.Settings.SettingNotFoundException"> +</exception> +</method> +<method name="getLong" + return="long" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="def" type="long"> +</parameter> +</method> +<method name="getLong" + return="long" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<exception name="Settings.SettingNotFoundException" type="android.provider.Settings.SettingNotFoundException"> +</exception> +</method> +<method name="getString" + return="java.lang.String" + abstract="false" + native="false" + synchronized="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="resolver" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +</method> +<method name="getUriFor" + return="android.net.Uri" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="name" type="java.lang.String"> +</parameter> +</method> +<method name="putFloat" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="value" type="float"> +</parameter> +</method> +<method name="putInt" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="value" type="int"> +</parameter> +</method> +<method name="putLong" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="value" type="long"> +</parameter> +</method> +<method name="putString" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="resolver" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="value" type="java.lang.String"> +</parameter> +</method> +<field name="ADB_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""adb_enabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ALLOW_MOCK_LOCATION" + type="java.lang.String" + transient="false" + volatile="false" + value=""mock_location"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ANDROID_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""android_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="BACKGROUND_DATA" + type="java.lang.String" + transient="false" + volatile="false" + value=""background_data"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="BLUETOOTH_ON" + type="java.lang.String" + transient="false" + volatile="false" + value=""bluetooth_on"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CONTENT_URI" + type="android.net.Uri" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DATA_ROAMING" + type="java.lang.String" + transient="false" + volatile="false" + value=""data_roaming"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DEFAULT_INPUT_METHOD" + type="java.lang.String" + transient="false" + volatile="false" + value=""default_input_method"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DEVICE_PROVISIONED" + type="java.lang.String" + transient="false" + volatile="false" + value=""device_provisioned"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ENABLED_INPUT_METHODS" + type="java.lang.String" + transient="false" + volatile="false" + value=""enabled_input_methods"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HTTP_PROXY" + type="java.lang.String" + transient="false" + volatile="false" + value=""http_proxy"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INSTALL_NON_MARKET_APPS" + type="java.lang.String" + transient="false" + volatile="false" + value=""install_non_market_apps"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LOCATION_PROVIDERS_ALLOWED" + type="java.lang.String" + transient="false" + volatile="false" + value=""location_providers_allowed"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LOGGING_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""logging_id"" + static="true" + final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="NETWORK_PREFERENCE" + type="java.lang.String" + transient="false" + volatile="false" + value=""network_preference"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="PARENTAL_CONTROL_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""parental_control_enabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="PARENTAL_CONTROL_LAST_UPDATE" + type="java.lang.String" + transient="false" + volatile="false" + value=""parental_control_last_update"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="PARENTAL_CONTROL_REDIRECT_URL" + type="java.lang.String" + transient="false" + volatile="false" + value=""parental_control_redirect_url"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SETTINGS_CLASSNAME" + type="java.lang.String" + transient="false" + volatile="false" + value=""settings_classname"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SYS_PROP_SETTING_VERSION" + type="java.lang.String" + transient="false" + volatile="false" + value=""sys.settings_secure_version"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_MASS_STORAGE_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""usb_mass_storage_enabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USE_GOOGLE_MAIL" + type="java.lang.String" + transient="false" + volatile="false" + value=""use_google_mail"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_MAX_DHCP_RETRY_COUNT" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_max_dhcp_retry_count"" + 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=""wifi_mobile_data_transition_wakelock_timeout_ms"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_networks_available_notification_on"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_networks_available_repeat_delay"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_NUM_OPEN_NETWORKS_KEPT" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_num_open_networks_kept"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_ON" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_on"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_acceptable_packet_loss_percentage"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_AP_COUNT" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_ap_count"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_background_check_delay_ms"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_background_check_enabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_background_check_timeout_ms"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_initial_ignored_ping_count"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_MAX_AP_CHECKS" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_max_ap_checks"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_ON" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_on"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_PING_COUNT" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_ping_count"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_PING_DELAY_MS" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_ping_delay_ms"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_PING_TIMEOUT_MS" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_ping_timeout_ms"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_WATCHDOG_WATCH_LIST" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_watch_list"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="Settings.SettingNotFoundException" extends="android.util.AndroidException" abstract="false" @@ -80122,6 +91815,40 @@ <exception name="Settings.SettingNotFoundException" type="android.provider.Settings.SettingNotFoundException"> </exception> </method> +<method name="getLong" + return="long" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="def" type="long"> +</parameter> +</method> +<method name="getLong" + return="long" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<exception name="Settings.SettingNotFoundException" type="android.provider.Settings.SettingNotFoundException"> +</exception> +</method> <method name="getShowGTalkServiceStatus" return="boolean" abstract="false" @@ -80212,6 +91939,23 @@ <parameter name="value" type="int"> </parameter> </method> +<method name="putLong" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cr" type="android.content.ContentResolver"> +</parameter> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="value" type="long"> +</parameter> +</method> <method name="putString" return="boolean" abstract="false" @@ -80244,6 +91988,17 @@ <parameter name="flag" type="boolean"> </parameter> </method> +<field name="ACCELEROMETER_ROTATION" + type="java.lang.String" + transient="false" + volatile="false" + value=""accelerometer_rotation"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ADB_ENABLED" type="java.lang.String" transient="false" @@ -80251,7 +92006,7 @@ value=""adb_enabled"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80295,7 +92050,7 @@ value=""android_id"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80350,7 +92105,7 @@ value=""bluetooth_on"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80371,7 +92126,7 @@ value=""data_roaming"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80424,7 +92179,7 @@ value=""device_provisioned"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80472,6 +92227,17 @@ visibility="public" > </field> +<field name="HAPTIC_FEEDBACK_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""haptic_feedback_enabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="HTTP_PROXY" type="java.lang.String" transient="false" @@ -80479,7 +92245,7 @@ value=""http_proxy"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80490,7 +92256,7 @@ value=""install_non_market_apps"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80501,7 +92267,7 @@ value=""location_providers_allowed"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80516,6 +92282,17 @@ visibility="public" > </field> +<field name="LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""lock_pattern_tactile_feedback_enabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="LOCK_PATTERN_VISIBLE" type="java.lang.String" transient="false" @@ -80534,7 +92311,7 @@ value=""logging_id"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80578,7 +92355,7 @@ value=""network_preference"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80611,7 +92388,7 @@ value=""parental_control_enabled"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80622,7 +92399,7 @@ value=""parental_control_last_update"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80633,7 +92410,7 @@ value=""parental_control_redirect_url"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80710,7 +92487,7 @@ value=""settings_classname"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80853,7 +92630,7 @@ value=""usb_mass_storage_enabled"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80864,7 +92641,7 @@ value=""use_google_mail"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80901,6 +92678,17 @@ visibility="public" > </field> +<field name="VOLUME_NOTIFICATION" + type="java.lang.String" + transient="false" + volatile="false" + value=""volume_notification"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="VOLUME_RING" type="java.lang.String" transient="false" @@ -80967,6 +92755,28 @@ visibility="public" > </field> +<field name="WIFI_MAX_DHCP_RETRY_COUNT" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_max_dhcp_retry_count"" + static="true" + final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_mobile_data_transition_wakelock_timeout_ms"" + static="true" + final="true" + deprecated="deprecated" + visibility="public" +> +</field> <field name="WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON" type="java.lang.String" transient="false" @@ -80974,7 +92784,7 @@ value=""wifi_networks_available_notification_on"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80985,7 +92795,7 @@ value=""wifi_networks_available_repeat_delay"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -80996,7 +92806,7 @@ value=""wifi_num_open_networks_kept"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81007,6 +92817,50 @@ value=""wifi_on"" static="true" final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="WIFI_SLEEP_POLICY" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_sleep_policy"" + 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" > @@ -81084,7 +92938,7 @@ value=""wifi_watchdog_acceptable_packet_loss_percentage"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81095,7 +92949,7 @@ value=""wifi_watchdog_ap_count"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81106,7 +92960,7 @@ value=""wifi_watchdog_background_check_delay_ms"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81117,7 +92971,7 @@ value=""wifi_watchdog_background_check_enabled"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81128,7 +92982,7 @@ value=""wifi_watchdog_background_check_timeout_ms"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81139,7 +92993,7 @@ value=""wifi_watchdog_initial_ignored_ping_count"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81150,7 +93004,7 @@ value=""wifi_watchdog_max_ap_checks"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81161,7 +93015,7 @@ value=""wifi_watchdog_on"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81172,7 +93026,7 @@ value=""wifi_watchdog_ping_count"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81183,7 +93037,7 @@ value=""wifi_watchdog_ping_delay_ms"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81194,7 +93048,7 @@ value=""wifi_watchdog_ping_timeout_ms"" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -81210,6 +93064,202 @@ > </field> </class> +<class name="UserDictionary" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="UserDictionary" + type="android.provider.UserDictionary" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<field name="AUTHORITY" + type="java.lang.String" + transient="false" + volatile="false" + value=""user_dictionary"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CONTENT_URI" + type="android.net.Uri" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="UserDictionary.Words" + extends="java.lang.Object" + abstract="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.provider.BaseColumns"> +</implements> +<constructor name="UserDictionary.Words" + type="android.provider.UserDictionary.Words" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="addWord" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="word" type="java.lang.String"> +</parameter> +<parameter name="frequency" type="int"> +</parameter> +<parameter name="localeType" type="int"> +</parameter> +</method> +<field name="APP_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""appid"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CONTENT_ITEM_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""vnd.android.cursor.item/vnd.google.userword"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CONTENT_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""vnd.android.cursor.dir/vnd.google.userword"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CONTENT_URI" + type="android.net.Uri" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DEFAULT_SORT_ORDER" + type="java.lang.String" + transient="false" + volatile="false" + value=""frequency DESC"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FREQUENCY" + type="java.lang.String" + transient="false" + volatile="false" + value=""frequency"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LOCALE" + type="java.lang.String" + transient="false" + volatile="false" + value=""locale"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LOCALE_TYPE_ALL" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LOCALE_TYPE_CURRENT" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WORD" + type="java.lang.String" + transient="false" + volatile="false" + value=""word"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> </package> <package name="android.sax" > @@ -81471,6 +93521,194 @@ </implements> </interface> </package> +<package name="android.speech" +> +<class name="RecognizerIntent" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<field name="ACTION_RECOGNIZE_SPEECH" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.action.RECOGNIZE_SPEECH"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_WEB_SEARCH" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.action.WEB_SEARCH"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_LANGUAGE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.extra.LANGUAGE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_LANGUAGE_MODEL" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.extra.LANGUAGE_MODEL"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_MAX_RESULTS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.extra.MAX_RESULTS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_PROMPT" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.extra.PROMPT"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_RESULTS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.extra.RESULTS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_RESULTS_PENDINGINTENT" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.extra.RESULTS_PENDINGINTENT"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_RESULTS_PENDINGINTENT_BUNDLE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.speech.extra.RESULTS_PENDINGINTENT_BUNDLE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LANGUAGE_MODEL_FREE_FORM" + type="java.lang.String" + transient="false" + volatile="false" + value=""free_form"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LANGUAGE_MODEL_WEB_SEARCH" + type="java.lang.String" + transient="false" + volatile="false" + value=""web_search"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_AUDIO_ERROR" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_CLIENT_ERROR" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_NETWORK_ERROR" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_NO_MATCH" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_SERVER_ERROR" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +</package> <package name="android.telephony" > <class name="CellLocation" @@ -81512,6 +93750,153 @@ > </method> </class> +<class name="NeighboringCellInfo" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="NeighboringCellInfo" + type="android.telephony.NeighboringCellInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<constructor name="NeighboringCellInfo" + type="android.telephony.NeighboringCellInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="rssi" type="int"> +</parameter> +<parameter name="cid" type="int"> +</parameter> +</constructor> +<constructor name="NeighboringCellInfo" + type="android.telephony.NeighboringCellInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="in" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getCid" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getRssi" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setCid" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cid" type="int"> +</parameter> +</method> +<method name="setRssi" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="rssi" type="int"> +</parameter> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="UNKNOWN_CID" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="UNKNOWN_RSSI" + type="int" + transient="false" + volatile="false" + value="99" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="PhoneNumberFormattingTextWatcher" extends="java.lang.Object" abstract="false" @@ -81686,6 +94071,19 @@ <parameter name="phoneNumber" type="java.lang.String"> </parameter> </method> +<method name="formatJapaneseNumber" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.text.Editable"> +</parameter> +</method> <method name="formatNanpNumber" return="void" abstract="false" @@ -81978,6 +94376,17 @@ <parameter name="s" type="java.lang.String"> </parameter> </method> +<field name="FORMAT_JAPAN" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FORMAT_NANP" type="int" transient="false" @@ -82639,6 +95048,17 @@ visibility="public" > </method> +<method name="getNeighboringCellInfo" + return="java.util.List<android.telephony.NeighboringCellInfo>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getNetworkCountryIso" return="java.lang.String" abstract="false" @@ -82808,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=""android.intent.action.PHONE_STATE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="CALL_STATE_IDLE" type="int" transient="false" @@ -82929,6 +95360,58 @@ visibility="public" > </field> +<field name="EXTRA_INCOMING_NUMBER" + type="java.lang.String" + transient="false" + volatile="false" + value=""incoming_number"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_STATE" + type="java.lang.String" + transient="false" + volatile="false" + value=""state"" + 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" @@ -83376,6 +95859,21 @@ deprecated="not deprecated" visibility="public" > +<parameter name="messageBody" type="java.lang.CharSequence"> +</parameter> +<parameter name="use7bitOnly" type="boolean"> +</parameter> +</method> +<method name="calculateLength" + return="int[]" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="messageBody" type="java.lang.String"> </parameter> <parameter name="use7bitOnly" type="boolean"> @@ -83869,7 +96367,7 @@ abstract="true" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <constructor name="ActivityInstrumentationTestCase" @@ -83923,6 +96421,64 @@ </exception> </method> </class> +<class name="ActivityInstrumentationTestCase2" + extends="android.test.ActivityTestCase" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="ActivityInstrumentationTestCase2" + type="android.test.ActivityInstrumentationTestCase2" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pkg" type="java.lang.String"> +</parameter> +<parameter name="activityClass" type="java.lang.Class<T>"> +</parameter> +</constructor> +<method name="getActivity" + return="T" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setActivityInitialTouchMode" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="initialTouchMode" type="boolean"> +</parameter> +</method> +<method name="setActivityIntent" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="i" type="android.content.Intent"> +</parameter> +</method> +</class> <class name="ActivityTestCase" extends="android.test.InstrumentationTestCase" abstract="true" @@ -84502,7 +97058,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.String"> +<parameter name="errorMessage" type="java.lang.String"> </parameter> </constructor> </class> @@ -84597,6 +97153,38 @@ <parameter name="extras" type="android.os.Bundle"> </parameter> </method> +<method name="launchActivityWithIntent" + return="T" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pkg" type="java.lang.String"> +</parameter> +<parameter name="activityCls" type="java.lang.Class<T>"> +</parameter> +<parameter name="intent" type="android.content.Intent"> +</parameter> +</method> +<method name="runTestOnUiThread" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="r" type="java.lang.Runnable"> +</parameter> +<exception name="Throwable" type="java.lang.Throwable"> +</exception> +</method> <method name="sendKeys" return="void" abstract="false" @@ -85568,7 +98156,7 @@ abstract="true" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <constructor name="ProviderTestCase" @@ -85644,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<T>"> +</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<T>"> +</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" @@ -86020,7 +98691,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> @@ -86036,6 +98707,42 @@ <parameter name="stepCount" type="int"> </parameter> </method> +<method name="drag" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="fromX" type="float"> +</parameter> +<parameter name="toX" type="float"> +</parameter> +<parameter name="fromY" type="float"> +</parameter> +<parameter name="toY" type="float"> +</parameter> +<parameter name="stepCount" type="int"> +</parameter> +</method> +<method name="dragQuarterScreenDown" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="test" type="android.test.ActivityInstrumentationTestCase"> +</parameter> +</method> <method name="dragQuarterScreenDown" return="void" abstract="false" @@ -86046,6 +98753,21 @@ deprecated="not deprecated" visibility="public" > +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="activity" type="android.app.Activity"> +</parameter> +</method> +<method name="dragQuarterScreenUp" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> </parameter> </method> @@ -86059,7 +98781,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="test" type="android.test.ActivityInstrumentationTestCase"> +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="activity" type="android.app.Activity"> </parameter> </method> <method name="dragViewBy" @@ -86069,7 +98793,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> @@ -86083,6 +98807,27 @@ <parameter name="deltaY" type="int"> </parameter> </method> +<method name="dragViewBy" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +<parameter name="gravity" type="int"> +</parameter> +<parameter name="deltaX" type="int"> +</parameter> +<parameter name="deltaY" type="int"> +</parameter> +</method> <method name="dragViewTo" return="int" abstract="false" @@ -86090,7 +98835,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> @@ -86104,6 +98849,42 @@ <parameter name="toY" type="int"> </parameter> </method> +<method name="dragViewTo" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +<parameter name="gravity" type="int"> +</parameter> +<parameter name="toX" type="int"> +</parameter> +<parameter name="toY" type="int"> +</parameter> +</method> +<method name="dragViewToBottom" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="test" type="android.test.ActivityInstrumentationTestCase"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +</method> <method name="dragViewToBottom" return="void" abstract="false" @@ -86114,10 +98895,29 @@ deprecated="not deprecated" visibility="public" > +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="activity" type="android.app.Activity"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +</method> +<method name="dragViewToBottom" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> </parameter> <parameter name="v" type="android.view.View"> </parameter> +<parameter name="stepCount" type="int"> +</parameter> </method> <method name="dragViewToBottom" return="void" @@ -86129,6 +98929,40 @@ deprecated="not deprecated" visibility="public" > +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="activity" type="android.app.Activity"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +<parameter name="stepCount" type="int"> +</parameter> +</method> +<method name="dragViewToTop" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="test" type="android.test.ActivityInstrumentationTestCase"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +</method> +<method name="dragViewToTop" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> </parameter> <parameter name="v" type="android.view.View"> @@ -86146,7 +98980,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="test" type="android.test.ActivityInstrumentationTestCase"> +<parameter name="test" type="android.test.InstrumentationTestCase"> </parameter> <parameter name="v" type="android.view.View"> </parameter> @@ -86161,7 +98995,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="test" type="android.test.ActivityInstrumentationTestCase"> +<parameter name="test" type="android.test.InstrumentationTestCase"> </parameter> <parameter name="v" type="android.view.View"> </parameter> @@ -86175,7 +99009,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> @@ -86187,7 +99021,7 @@ <parameter name="toX" type="int"> </parameter> </method> -<method name="dragViewToY" +<method name="dragViewToX" return="int" abstract="false" native="false" @@ -86197,6 +99031,25 @@ deprecated="not deprecated" visibility="public" > +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +<parameter name="gravity" type="int"> +</parameter> +<parameter name="toX" type="int"> +</parameter> +</method> +<method name="dragViewToY" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> </parameter> <parameter name="v" type="android.view.View"> @@ -86206,6 +99059,25 @@ <parameter name="toY" type="int"> </parameter> </method> +<method name="dragViewToY" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +<parameter name="gravity" type="int"> +</parameter> +<parameter name="toY" type="int"> +</parameter> +</method> <method name="longClickView" return="void" abstract="false" @@ -86213,7 +99085,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> @@ -86221,6 +99093,36 @@ <parameter name="v" type="android.view.View"> </parameter> </method> +<method name="longClickView" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="v" type="android.view.View"> +</parameter> +</method> +<method name="scrollToBottom" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="test" type="android.test.ActivityInstrumentationTestCase"> +</parameter> +<parameter name="v" type="android.view.ViewGroup"> +</parameter> +</method> <method name="scrollToBottom" return="void" abstract="false" @@ -86231,6 +99133,23 @@ deprecated="not deprecated" visibility="public" > +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="activity" type="android.app.Activity"> +</parameter> +<parameter name="v" type="android.view.ViewGroup"> +</parameter> +</method> +<method name="scrollToTop" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> <parameter name="test" type="android.test.ActivityInstrumentationTestCase"> </parameter> <parameter name="v" type="android.view.ViewGroup"> @@ -86246,7 +99165,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="test" type="android.test.ActivityInstrumentationTestCase"> +<parameter name="test" type="android.test.InstrumentationTestCase"> +</parameter> +<parameter name="activity" type="android.app.Activity"> </parameter> <parameter name="v" type="android.view.ViewGroup"> </parameter> @@ -87938,6 +100859,21 @@ <exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException"> </exception> </method> +<method name="getLaunchIntentForPackage" + return="android.content.Intent" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="packageName" type="java.lang.String"> +</parameter> +<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException"> +</exception> +</method> <method name="getNameForUid" return="java.lang.String" abstract="false" @@ -88137,6 +101073,17 @@ <exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException"> </exception> </method> +<method name="getSystemSharedLibraryNames" + return="java.lang.String[]" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getText" return="java.lang.CharSequence" abstract="false" @@ -88188,6 +101135,17 @@ <parameter name="flags" type="int"> </parameter> </method> +<method name="isSafeMode" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="queryBroadcastReceivers" return="java.util.List<android.content.pm.ResolveInfo>" abstract="false" @@ -88447,6 +101405,28 @@ <parameter name="enclosingClass" type="java.lang.Class<? extends junit.framework.TestCase>"> </parameter> </constructor> +<constructor name="TestMethod" + type="android.test.suitebuilder.TestMethod" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="enclosingClass" type="java.lang.Class<? extends junit.framework.TestCase>"> +</parameter> +</constructor> +<constructor name="TestMethod" + type="android.test.suitebuilder.TestMethod" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="testCase" type="junit.framework.TestCase"> +</parameter> +</constructor> <method name="createTest" return="junit.framework.TestCase" abstract="false" @@ -88893,6 +101873,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="Annotation" type="android.text.Annotation" static="false" @@ -88905,6 +101887,27 @@ <parameter name="value" type="java.lang.String"> </parameter> </constructor> +<constructor name="Annotation" + type="android.text.Annotation" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getKey" return="java.lang.String" abstract="false" @@ -88916,6 +101919,17 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getValue" return="java.lang.String" abstract="false" @@ -88927,6 +101941,21 @@ visibility="public" > </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="AutoText" extends="java.lang.Object" @@ -88955,6 +101984,19 @@ <parameter name="view" type="android.view.View"> </parameter> </method> +<method name="getSize" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> </class> <class name="BoringLayout" extends="android.text.Layout" @@ -90089,6 +103131,377 @@ </parameter> </method> </class> +<interface name="InputType" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<field name="TYPE_CLASS_DATETIME" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_CLASS_NUMBER" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_CLASS_PHONE" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_CLASS_TEXT" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_DATETIME_VARIATION_DATE" + type="int" + transient="false" + volatile="false" + value="16" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_DATETIME_VARIATION_NORMAL" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_DATETIME_VARIATION_TIME" + type="int" + transient="false" + volatile="false" + value="32" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_MASK_CLASS" + type="int" + transient="false" + volatile="false" + value="15" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_MASK_FLAGS" + type="int" + transient="false" + volatile="false" + value="16773120" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_MASK_VARIATION" + type="int" + transient="false" + volatile="false" + value="4080" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_NULL" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_NUMBER_FLAG_DECIMAL" + type="int" + transient="false" + volatile="false" + value="8192" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_NUMBER_FLAG_SIGNED" + type="int" + transient="false" + volatile="false" + value="4096" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_FLAG_AUTO_COMPLETE" + type="int" + transient="false" + volatile="false" + value="65536" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_FLAG_AUTO_CORRECT" + type="int" + transient="false" + volatile="false" + value="32768" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_FLAG_CAP_CHARACTERS" + type="int" + transient="false" + volatile="false" + value="4096" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_FLAG_CAP_SENTENCES" + type="int" + transient="false" + volatile="false" + value="16384" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_FLAG_CAP_WORDS" + type="int" + transient="false" + volatile="false" + value="8192" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_FLAG_IME_MULTI_LINE" + type="int" + transient="false" + volatile="false" + value="262144" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_FLAG_MULTI_LINE" + type="int" + transient="false" + volatile="false" + value="131072" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_EMAIL_ADDRESS" + type="int" + transient="false" + volatile="false" + value="32" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_EMAIL_SUBJECT" + type="int" + transient="false" + volatile="false" + value="48" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_FILTER" + type="int" + transient="false" + volatile="false" + value="176" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_LONG_MESSAGE" + type="int" + transient="false" + volatile="false" + value="80" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_NORMAL" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_PASSWORD" + type="int" + transient="false" + volatile="false" + value="128" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_PERSON_NAME" + type="int" + transient="false" + volatile="false" + value="96" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_PHONETIC" + type="int" + transient="false" + volatile="false" + value="192" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_POSTAL_ADDRESS" + type="int" + transient="false" + volatile="false" + value="112" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_SHORT_MESSAGE" + type="int" + transient="false" + volatile="false" + value="64" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_URI" + type="int" + transient="false" + volatile="false" + value="16" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_VISIBLE_PASSWORD" + type="int" + transient="false" + volatile="false" + value="144" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_TEXT_VARIATION_WEB_EDIT_TEXT" + type="int" + transient="false" + volatile="false" + value="160" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</interface> <class name="Layout" extends="java.lang.Object" abstract="true" @@ -90997,6 +104410,54 @@ </parameter> </method> </class> +<interface name="NoCopySpan" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</interface> +<class name="NoCopySpan.Concrete" + extends="java.lang.Object" + abstract="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.text.NoCopySpan"> +</implements> +<constructor name="NoCopySpan.Concrete" + type="android.text.NoCopySpan.Concrete" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +</class> +<interface name="ParcelableSpan" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<method name="getSpanTypeId" + return="int" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</interface> <class name="Selection" extends="java.lang.Object" abstract="false" @@ -91312,6 +104773,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.NoCopySpan"> +</implements> <method name="onSpanAdded" return="void" abstract="true" @@ -92163,6 +105626,17 @@ <parameter name="type" type="java.lang.Class"> </parameter> </method> +<field name="SPAN_COMPOSING" + type="int" + transient="false" + volatile="false" + value="256" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SPAN_EXCLUSIVE_EXCLUSIVE" type="int" transient="false" @@ -92207,6 +105681,17 @@ visibility="public" > </field> +<field name="SPAN_INTERMEDIATE" + type="int" + transient="false" + volatile="false" + value="512" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SPAN_MARK_MARK" type="int" transient="false" @@ -92251,6 +105736,17 @@ visibility="public" > </field> +<field name="SPAN_POINT_MARK_MASK" + type="int" + transient="false" + volatile="false" + value="51" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SPAN_POINT_POINT" type="int" transient="false" @@ -92740,6 +106236,23 @@ <parameter name="destoff" type="int"> </parameter> </method> +<method name="dumpSpans" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cs" type="java.lang.CharSequence"> +</parameter> +<parameter name="printer" type="android.util.Printer"> +</parameter> +<parameter name="prefix" type="java.lang.String"> +</parameter> +</method> <method name="ellipsize" return="java.lang.CharSequence" abstract="false" @@ -92812,6 +106325,23 @@ <parameter name="values" type="java.lang.CharSequence..."> </parameter> </method> +<method name="getCapsMode" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="cs" type="java.lang.CharSequence"> +</parameter> +<parameter name="off" type="int"> +</parameter> +<parameter name="reqModes" type="int"> +</parameter> +</method> <method name="getChars" return="void" abstract="false" @@ -93256,6 +106786,39 @@ <parameter name="parcelableFlags" type="int"> </parameter> </method> +<field name="CAP_MODE_CHARACTERS" + type="int" + transient="false" + volatile="false" + value="4096" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CAP_MODE_SENTENCES" + type="int" + transient="false" + volatile="false" + value="16384" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CAP_MODE_WORDS" + type="int" + transient="false" + volatile="false" + value="8192" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="CHAR_SEQUENCE_CREATOR" type="android.os.Parcelable.Creator" transient="false" @@ -93433,6 +106996,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.NoCopySpan"> +</implements> <method name="afterTextChanged" return="void" abstract="true" @@ -93486,6 +107051,1732 @@ </method> </interface> </package> +<package name="android.text.format" +> +<class name="DateFormat" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="DateFormat" + type="android.text.format.DateFormat" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="format" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="inFormat" type="java.lang.CharSequence"> +</parameter> +<parameter name="inTimeInMillis" type="long"> +</parameter> +</method> +<method name="format" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="inFormat" type="java.lang.CharSequence"> +</parameter> +<parameter name="inDate" type="java.util.Date"> +</parameter> +</method> +<method name="format" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="inFormat" type="java.lang.CharSequence"> +</parameter> +<parameter name="inDate" type="java.util.Calendar"> +</parameter> +</method> +<method name="getDateFormat" + return="java.text.DateFormat" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="getDateFormatOrder" + return="char[]" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="getLongDateFormat" + return="java.text.DateFormat" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="getMediumDateFormat" + return="java.text.DateFormat" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="getTimeFormat" + return="java.text.DateFormat" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="is24HourFormat" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<field name="AM_PM" + type="char" + transient="false" + volatile="false" + value="97" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CAPITAL_AM_PM" + type="char" + transient="false" + volatile="false" + value="65" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DATE" + type="char" + transient="false" + volatile="false" + value="100" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DAY" + type="char" + transient="false" + volatile="false" + value="69" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HOUR" + type="char" + transient="false" + volatile="false" + value="104" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HOUR_OF_DAY" + type="char" + transient="false" + volatile="false" + value="107" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MINUTE" + type="char" + transient="false" + volatile="false" + value="109" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MONTH" + type="char" + transient="false" + volatile="false" + value="77" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="QUOTE" + type="char" + transient="false" + volatile="false" + value="39" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SECONDS" + type="char" + transient="false" + volatile="false" + value="115" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TIME_ZONE" + type="char" + transient="false" + volatile="false" + value="122" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="YEAR" + type="char" + transient="false" + volatile="false" + value="121" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="DateUtils" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="DateUtils" + type="android.text.format.DateUtils" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="formatDateRange" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="startMillis" type="long"> +</parameter> +<parameter name="endMillis" type="long"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="formatDateTime" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="millis" type="long"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="formatElapsedTime" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="elapsedSeconds" type="long"> +</parameter> +</method> +<method name="formatElapsedTime" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="recycle" type="java.lang.StringBuilder"> +</parameter> +<parameter name="elapsedSeconds" type="long"> +</parameter> +</method> +<method name="formatSameDayTime" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="then" type="long"> +</parameter> +<parameter name="now" type="long"> +</parameter> +<parameter name="dateStyle" type="int"> +</parameter> +<parameter name="timeStyle" type="int"> +</parameter> +</method> +<method name="getAMPMString" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ampm" type="int"> +</parameter> +</method> +<method name="getDayOfWeekString" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dayOfWeek" type="int"> +</parameter> +<parameter name="abbrev" type="int"> +</parameter> +</method> +<method name="getMonthString" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="month" type="int"> +</parameter> +<parameter name="abbrev" type="int"> +</parameter> +</method> +<method name="getRelativeDateTimeString" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="c" type="android.content.Context"> +</parameter> +<parameter name="time" type="long"> +</parameter> +<parameter name="minResolution" type="long"> +</parameter> +<parameter name="transitionResolution" type="long"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="getRelativeTimeSpanString" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="startTime" type="long"> +</parameter> +</method> +<method name="getRelativeTimeSpanString" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="time" type="long"> +</parameter> +<parameter name="now" type="long"> +</parameter> +<parameter name="minResolution" type="long"> +</parameter> +</method> +<method name="getRelativeTimeSpanString" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="time" type="long"> +</parameter> +<parameter name="now" type="long"> +</parameter> +<parameter name="minResolution" type="long"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="getRelativeTimeSpanString" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="c" type="android.content.Context"> +</parameter> +<parameter name="millis" type="long"> +</parameter> +<parameter name="withPreposition" type="boolean"> +</parameter> +</method> +<method name="getRelativeTimeSpanString" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="c" type="android.content.Context"> +</parameter> +<parameter name="millis" type="long"> +</parameter> +</method> +<method name="isToday" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="when" type="long"> +</parameter> +</method> +<field name="ABBREV_MONTH_FORMAT" + type="java.lang.String" + transient="false" + volatile="false" + value=""%b"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ABBREV_WEEKDAY_FORMAT" + type="java.lang.String" + transient="false" + volatile="false" + value=""%a"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DAY_IN_MILLIS" + type="long" + transient="false" + volatile="false" + value="86400000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_12HOUR" + type="int" + transient="false" + volatile="false" + value="64" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_24HOUR" + type="int" + transient="false" + volatile="false" + value="128" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_ABBREV_ALL" + type="int" + transient="false" + volatile="false" + value="524288" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_ABBREV_MONTH" + type="int" + transient="false" + volatile="false" + value="65536" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_ABBREV_RELATIVE" + type="int" + transient="false" + volatile="false" + value="262144" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_ABBREV_TIME" + type="int" + transient="false" + volatile="false" + value="16384" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_ABBREV_WEEKDAY" + type="int" + transient="false" + volatile="false" + value="32768" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_CAP_AMPM" + type="int" + transient="false" + volatile="false" + value="256" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_CAP_MIDNIGHT" + type="int" + transient="false" + volatile="false" + value="4096" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_CAP_NOON" + type="int" + transient="false" + volatile="false" + value="1024" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_CAP_NOON_MIDNIGHT" + type="int" + transient="false" + volatile="false" + value="5120" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_NO_MIDNIGHT" + type="int" + transient="false" + volatile="false" + value="2048" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_NO_MONTH_DAY" + type="int" + transient="false" + volatile="false" + value="32" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_NO_NOON" + type="int" + transient="false" + volatile="false" + value="512" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_NO_NOON_MIDNIGHT" + type="int" + transient="false" + volatile="false" + value="2560" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_NO_YEAR" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_NUMERIC_DATE" + type="int" + transient="false" + volatile="false" + value="131072" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_SHOW_DATE" + type="int" + transient="false" + volatile="false" + value="16" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_SHOW_TIME" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_SHOW_WEEKDAY" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_SHOW_YEAR" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FORMAT_UTC" + type="int" + transient="false" + volatile="false" + value="8192" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HOUR_IN_MILLIS" + type="long" + transient="false" + volatile="false" + value="3600000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HOUR_MINUTE_24" + type="java.lang.String" + transient="false" + volatile="false" + value=""%H:%M"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LENGTH_LONG" + type="int" + transient="false" + volatile="false" + value="10" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LENGTH_MEDIUM" + type="int" + transient="false" + volatile="false" + value="20" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LENGTH_SHORT" + type="int" + transient="false" + volatile="false" + value="30" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LENGTH_SHORTER" + type="int" + transient="false" + volatile="false" + value="40" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LENGTH_SHORTEST" + type="int" + transient="false" + volatile="false" + value="50" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MINUTE_IN_MILLIS" + type="long" + transient="false" + volatile="false" + value="60000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MONTH_DAY_FORMAT" + type="java.lang.String" + transient="false" + volatile="false" + value=""%-d"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MONTH_FORMAT" + type="java.lang.String" + transient="false" + volatile="false" + value=""%B"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="NUMERIC_MONTH_FORMAT" + type="java.lang.String" + transient="false" + volatile="false" + value=""%m"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SECOND_IN_MILLIS" + type="long" + transient="false" + volatile="false" + value="1000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WEEKDAY_FORMAT" + type="java.lang.String" + transient="false" + volatile="false" + value=""%A"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WEEK_IN_MILLIS" + type="long" + transient="false" + volatile="false" + value="604800000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="YEAR_FORMAT" + type="java.lang.String" + transient="false" + volatile="false" + value=""%Y"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="YEAR_FORMAT_TWO_DIGITS" + type="java.lang.String" + transient="false" + volatile="false" + value=""%g"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="YEAR_IN_MILLIS" + type="long" + transient="false" + volatile="false" + value="31449600000L" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="sameMonthTable" + type="int[]" + transient="false" + volatile="false" + value="null" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="sameYearTable" + type="int[]" + transient="false" + volatile="false" + value="null" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="Formatter" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<constructor name="Formatter" + type="android.text.format.Formatter" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="formatFileSize" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="number" type="long"> +</parameter> +</method> +<method name="formatIpAddress" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="addr" type="int"> +</parameter> +</method> +</class> +<class name="Time" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="Time" + type="android.text.format.Time" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="timezone" type="java.lang.String"> +</parameter> +</constructor> +<constructor name="Time" + type="android.text.format.Time" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<constructor name="Time" + type="android.text.format.Time" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="other" type="android.text.format.Time"> +</parameter> +</constructor> +<method name="after" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="that" type="android.text.format.Time"> +</parameter> +</method> +<method name="before" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="that" type="android.text.format.Time"> +</parameter> +</method> +<method name="clear" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="timezone" type="java.lang.String"> +</parameter> +</method> +<method name="compare" + return="int" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="a" type="android.text.format.Time"> +</parameter> +<parameter name="b" type="android.text.format.Time"> +</parameter> +</method> +<method name="format" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="format" type="java.lang.String"> +</parameter> +</method> +<method name="format2445" + return="java.lang.String" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="format3339" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="allDay" type="boolean"> +</parameter> +</method> +<method name="getActualMaximum" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="field" type="int"> +</parameter> +</method> +<method name="getCurrentTimezone" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getJulianDay" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="millis" type="long"> +</parameter> +<parameter name="gmtoff" type="long"> +</parameter> +</method> +<method name="getWeekNumber" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isEpoch" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="time" type="android.text.format.Time"> +</parameter> +</method> +<method name="normalize" + return="long" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ignoreDst" type="boolean"> +</parameter> +</method> +<method name="parse" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="s" type="java.lang.String"> +</parameter> +</method> +<method name="parse3339" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="s" type="java.lang.String"> +</parameter> +</method> +<method name="set" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="millis" type="long"> +</parameter> +</method> +<method name="set" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="that" type="android.text.format.Time"> +</parameter> +</method> +<method name="set" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="second" type="int"> +</parameter> +<parameter name="minute" type="int"> +</parameter> +<parameter name="hour" type="int"> +</parameter> +<parameter name="monthDay" type="int"> +</parameter> +<parameter name="month" type="int"> +</parameter> +<parameter name="year" type="int"> +</parameter> +</method> +<method name="set" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="monthDay" type="int"> +</parameter> +<parameter name="month" type="int"> +</parameter> +<parameter name="year" type="int"> +</parameter> +</method> +<method name="setJulianDay" + return="long" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="julianDay" type="int"> +</parameter> +</method> +<method name="setToNow" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="switchTimezone" + return="void" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="timezone" type="java.lang.String"> +</parameter> +</method> +<method name="toMillis" + return="long" + abstract="false" + native="true" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ignoreDst" type="boolean"> +</parameter> +</method> +<field name="EPOCH_JULIAN_DAY" + type="int" + transient="false" + volatile="false" + value="2440588" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FRIDAY" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HOUR" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MINUTE" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MONDAY" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MONTH" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="MONTH_DAY" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SATURDAY" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SECOND" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SUNDAY" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="THURSDAY" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TIMEZONE_UTC" + type="java.lang.String" + transient="false" + volatile="false" + value=""UTC"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TUESDAY" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WEDNESDAY" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WEEK_DAY" + type="int" + transient="false" + volatile="false" + value="7" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WEEK_NUM" + type="int" + transient="false" + volatile="false" + value="9" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="YEAR" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="YEAR_DAY" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="allDay" + type="boolean" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="gmtoff" + type="long" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="hour" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="isDst" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="minute" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="month" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="monthDay" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="second" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="timezone" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="weekDay" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="year" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="yearDay" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +</package> <package name="android.text.method" > <class name="ArrowKeyMovementMethod" @@ -93562,6 +108853,23 @@ <parameter name="event" type="android.view.KeyEvent"> </parameter> </method> +<method name="onKeyOther" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.widget.TextView"> +</parameter> +<parameter name="text" type="android.text.Spannable"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> <method name="onKeyUp" return="boolean" abstract="false" @@ -93627,7 +108935,7 @@ > <parameter name="widget" type="android.widget.TextView"> </parameter> -<parameter name="buffer" type="android.text.Spannable"> +<parameter name="text" type="android.text.Spannable"> </parameter> <parameter name="event" type="android.view.MotionEvent"> </parameter> @@ -93670,6 +108978,23 @@ <parameter name="event" type="android.view.KeyEvent"> </parameter> </method> +<method name="onKeyOther" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="content" type="android.text.Editable"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> </class> <class name="CharacterPickerDialog" extends="android.app.Dialog" @@ -93761,6 +109086,17 @@ visibility="protected" > </method> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getInstance" return="android.text.method.DateKeyListener" abstract="false" @@ -93811,6 +109147,17 @@ visibility="protected" > </method> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getInstance" return="android.text.method.DateTimeKeyListener" abstract="false" @@ -93861,6 +109208,17 @@ visibility="protected" > </method> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getInstance" return="android.text.method.DialerKeyListener" abstract="false" @@ -93923,6 +109281,17 @@ visibility="protected" > </method> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getInstance" return="android.text.method.DigitsKeyListener" abstract="false" @@ -94020,6 +109389,34 @@ deprecated="not deprecated" visibility="public" > +<method name="clearMetaKeyState" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="content" type="android.text.Editable"> +</parameter> +<parameter name="states" type="int"> +</parameter> +</method> +<method name="getInputType" + return="int" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="onKeyDown" return="boolean" abstract="true" @@ -94039,6 +109436,23 @@ <parameter name="event" type="android.view.KeyEvent"> </parameter> </method> +<method name="onKeyOther" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="text" type="android.text.Editable"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> <method name="onKeyUp" return="boolean" abstract="true" @@ -94116,6 +109530,66 @@ <parameter name="content" type="android.text.Spannable"> </parameter> </method> +<method name="adjustMetaAfterKeypress" + return="long" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="state" type="long"> +</parameter> +</method> +<method name="clearMetaKeyState" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="content" type="android.text.Editable"> +</parameter> +<parameter name="states" type="int"> +</parameter> +</method> +<method name="clearMetaKeyState" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="content" type="android.text.Editable"> +</parameter> +<parameter name="states" type="int"> +</parameter> +</method> +<method name="clearMetaKeyState" + return="long" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="state" type="long"> +</parameter> +<parameter name="which" type="int"> +</parameter> +</method> <method name="getMetaState" return="int" abstract="false" @@ -94144,6 +109618,68 @@ <parameter name="meta" type="int"> </parameter> </method> +<method name="getMetaState" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="state" type="long"> +</parameter> +</method> +<method name="getMetaState" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="state" type="long"> +</parameter> +<parameter name="meta" type="int"> +</parameter> +</method> +<method name="handleKeyDown" + return="long" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="state" type="long"> +</parameter> +<parameter name="keyCode" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +<method name="handleKeyUp" + return="long" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="state" type="long"> +</parameter> +<parameter name="keyCode" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> <method name="isMetaTracker" return="boolean" abstract="false" @@ -94159,6 +109695,21 @@ <parameter name="what" type="java.lang.Object"> </parameter> </method> +<method name="isSelectingMetaTracker" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="what" type="java.lang.Object"> +</parameter> +</method> <method name="onKeyDown" return="boolean" abstract="false" @@ -94210,6 +109761,19 @@ <parameter name="content" type="android.text.Spannable"> </parameter> </method> +<method name="resetLockedMeta" + return="long" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="state" type="long"> +</parameter> +</method> <method name="resetMetaState" return="void" abstract="false" @@ -94342,6 +109906,23 @@ <parameter name="event" type="android.view.KeyEvent"> </parameter> </method> +<method name="onKeyOther" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.widget.TextView"> +</parameter> +<parameter name="text" type="android.text.Spannable"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> <method name="onKeyUp" return="boolean" abstract="true" @@ -94435,6 +110016,17 @@ <parameter name="autotext" type="boolean"> </parameter> </constructor> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getInstance" return="android.text.method.MultiTapKeyListener" abstract="false" @@ -94734,6 +110326,17 @@ <parameter name="autotext" type="boolean"> </parameter> </constructor> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getInstance" return="android.text.method.QwertyKeyListener" abstract="false" @@ -94950,6 +110553,23 @@ <parameter name="event" type="android.view.KeyEvent"> </parameter> </method> +<method name="onKeyOther" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.widget.TextView"> +</parameter> +<parameter name="text" type="android.text.Spannable"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> <method name="onKeyUp" return="boolean" abstract="false" @@ -95015,7 +110635,7 @@ > <parameter name="widget" type="android.widget.TextView"> </parameter> -<parameter name="buffer" type="android.text.Spannable"> +<parameter name="text" type="android.text.Spannable"> </parameter> <parameter name="event" type="android.view.MotionEvent"> </parameter> @@ -95136,6 +110756,17 @@ <parameter name="e" type="android.text.Editable"> </parameter> </method> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getInstance" return="android.text.method.TextKeyListener" abstract="false" @@ -95312,6 +110943,17 @@ visibility="protected" > </method> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getInstance" return="android.text.method.TimeKeyListener" abstract="false" @@ -95343,6 +110985,36 @@ deprecated="not deprecated" visibility="public" > +<method name="getInitialScrollX" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="widget" type="android.widget.TextView"> +</parameter> +<parameter name="buffer" type="android.text.Spannable"> +</parameter> +</method> +<method name="getInitialScrollY" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="widget" type="android.widget.TextView"> +</parameter> +<parameter name="buffer" type="android.text.Spannable"> +</parameter> +</method> <method name="onTouchEvent" return="boolean" abstract="false" @@ -95435,6 +111107,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="AbsoluteSizeSpan" type="android.text.style.AbsoluteSizeSpan" static="false" @@ -95445,6 +111119,27 @@ <parameter name="size" type="int"> </parameter> </constructor> +<constructor name="AbsoluteSizeSpan" + type="android.text.style.AbsoluteSizeSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getSize" return="int" abstract="false" @@ -95456,6 +111151,17 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -95482,6 +111188,21 @@ <parameter name="ds" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <interface name="AlignmentSpan" abstract="true" @@ -95514,6 +111235,8 @@ > <implements name="android.text.style.AlignmentSpan"> </implements> +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="AlignmentSpan.Standard" type="android.text.style.AlignmentSpan.Standard" static="false" @@ -95524,6 +111247,27 @@ <parameter name="align" type="android.text.Layout.Alignment"> </parameter> </constructor> +<constructor name="AlignmentSpan.Standard" + type="android.text.style.AlignmentSpan.Standard" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getAlignment" return="android.text.Layout.Alignment" abstract="false" @@ -95535,6 +111279,32 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="BackgroundColorSpan" extends="android.text.style.CharacterStyle" @@ -95544,6 +111314,10 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> +<implements name="android.text.style.UpdateAppearance"> +</implements> <constructor name="BackgroundColorSpan" type="android.text.style.BackgroundColorSpan" static="false" @@ -95554,6 +111328,27 @@ <parameter name="color" type="int"> </parameter> </constructor> +<constructor name="BackgroundColorSpan" + type="android.text.style.BackgroundColorSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getBackgroundColor" return="int" abstract="false" @@ -95565,6 +111360,17 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -95578,6 +111384,21 @@ <parameter name="ds" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="BulletSpan" extends="java.lang.Object" @@ -95589,6 +111410,8 @@ > <implements name="android.text.style.LeadingMarginSpan"> </implements> +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="BulletSpan" type="android.text.style.BulletSpan" static="false" @@ -95619,6 +111442,27 @@ <parameter name="color" type="int"> </parameter> </constructor> +<constructor name="BulletSpan" + type="android.text.style.BulletSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="drawLeadingMargin" return="void" abstract="false" @@ -95667,6 +111511,32 @@ <parameter name="first" type="boolean"> </parameter> </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> <field name="STANDARD_GAP_WIDTH" type="int" transient="false" @@ -95741,6 +111611,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.style.UpdateAppearance"> +</implements> <constructor name="ClickableSpan" type="android.text.style.ClickableSpan" static="false" @@ -95898,6 +111770,16 @@ visibility="public" > </constructor> +<constructor name="DynamicDrawableSpan" + type="android.text.style.DynamicDrawableSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="verticalAlignment" type="int"> +</parameter> +</constructor> <method name="draw" return="void" abstract="false" @@ -95959,6 +111841,49 @@ <parameter name="fm" type="android.graphics.Paint.FontMetricsInt"> </parameter> </method> +<method name="getVerticalAlignment" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<field name="ALIGN_BASELINE" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ALIGN_BOTTOM" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="mVerticalAlignment" + type="int" + transient="false" + volatile="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="protected" +> +</field> </class> <class name="ForegroundColorSpan" extends="android.text.style.CharacterStyle" @@ -95968,6 +111893,10 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> +<implements name="android.text.style.UpdateAppearance"> +</implements> <constructor name="ForegroundColorSpan" type="android.text.style.ForegroundColorSpan" static="false" @@ -95978,6 +111907,27 @@ <parameter name="color" type="int"> </parameter> </constructor> +<constructor name="ForegroundColorSpan" + type="android.text.style.ForegroundColorSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getForegroundColor" return="int" abstract="false" @@ -95989,6 +111939,17 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -96002,6 +111963,21 @@ <parameter name="ds" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="IconMarginSpan" extends="java.lang.Object" @@ -96134,8 +112110,44 @@ deprecated="not deprecated" visibility="public" > +<parameter name="b" type="android.graphics.Bitmap"> +</parameter> +<parameter name="verticalAlignment" type="int"> +</parameter> +</constructor> +<constructor name="ImageSpan" + type="android.text.style.ImageSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="d" type="android.graphics.drawable.Drawable"> +</parameter> +</constructor> +<constructor name="ImageSpan" + type="android.text.style.ImageSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="d" type="android.graphics.drawable.Drawable"> +</parameter> +<parameter name="verticalAlignment" type="int"> +</parameter> +</constructor> +<constructor name="ImageSpan" + type="android.text.style.ImageSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="d" type="android.graphics.drawable.Drawable"> </parameter> +<parameter name="source" type="java.lang.String"> +</parameter> </constructor> <constructor name="ImageSpan" type="android.text.style.ImageSpan" @@ -96148,6 +112160,8 @@ </parameter> <parameter name="source" type="java.lang.String"> </parameter> +<parameter name="verticalAlignment" type="int"> +</parameter> </constructor> <constructor name="ImageSpan" type="android.text.style.ImageSpan" @@ -96170,9 +112184,37 @@ > <parameter name="context" type="android.content.Context"> </parameter> +<parameter name="uri" type="android.net.Uri"> +</parameter> +<parameter name="verticalAlignment" type="int"> +</parameter> +</constructor> +<constructor name="ImageSpan" + type="android.text.style.ImageSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> <parameter name="resourceId" type="int"> </parameter> </constructor> +<constructor name="ImageSpan" + type="android.text.style.ImageSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="resourceId" type="int"> +</parameter> +<parameter name="verticalAlignment" type="int"> +</parameter> +</constructor> <method name="getDrawable" return="android.graphics.drawable.Drawable" abstract="false" @@ -96264,6 +112306,8 @@ > <implements name="android.text.style.LeadingMarginSpan"> </implements> +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="LeadingMarginSpan.Standard" type="android.text.style.LeadingMarginSpan.Standard" static="false" @@ -96286,6 +112330,27 @@ <parameter name="every" type="int"> </parameter> </constructor> +<constructor name="LeadingMarginSpan.Standard" + type="android.text.style.LeadingMarginSpan.Standard" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="drawLeadingMargin" return="void" abstract="false" @@ -96334,6 +112399,32 @@ <parameter name="first" type="boolean"> </parameter> </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <interface name="LineBackgroundSpan" abstract="true" @@ -96421,6 +112512,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.style.UpdateAppearance"> +</implements> <constructor name="MaskFilterSpan" type="android.text.style.MaskFilterSpan" static="false" @@ -96506,6 +112599,8 @@ > <implements name="android.text.style.LeadingMarginSpan"> </implements> +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="QuoteSpan" type="android.text.style.QuoteSpan" static="false" @@ -96524,6 +112619,27 @@ <parameter name="color" type="int"> </parameter> </constructor> +<constructor name="QuoteSpan" + type="android.text.style.QuoteSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="drawLeadingMargin" return="void" abstract="false" @@ -96583,6 +112699,32 @@ <parameter name="first" type="boolean"> </parameter> </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="RasterizerSpan" extends="android.text.style.CharacterStyle" @@ -96592,6 +112734,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.style.UpdateAppearance"> +</implements> <constructor name="RasterizerSpan" type="android.text.style.RasterizerSpan" static="false" @@ -96635,6 +112779,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="RelativeSizeSpan" type="android.text.style.RelativeSizeSpan" static="false" @@ -96645,6 +112791,27 @@ <parameter name="proportion" type="float"> </parameter> </constructor> +<constructor name="RelativeSizeSpan" + type="android.text.style.RelativeSizeSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getSizeChange" return="float" abstract="false" @@ -96656,6 +112823,17 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -96682,6 +112860,21 @@ <parameter name="ds" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="ReplacementSpan" extends="android.text.style.MetricAffectingSpan" @@ -96784,6 +112977,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="ScaleXSpan" type="android.text.style.ScaleXSpan" static="false" @@ -96794,6 +112989,27 @@ <parameter name="proportion" type="float"> </parameter> </constructor> +<constructor name="ScaleXSpan" + type="android.text.style.ScaleXSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getScaleX" return="float" abstract="false" @@ -96805,6 +113021,17 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -96831,6 +113058,21 @@ <parameter name="ds" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="StrikethroughSpan" extends="android.text.style.CharacterStyle" @@ -96840,6 +113082,18 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> +<implements name="android.text.style.UpdateAppearance"> +</implements> +<constructor name="StrikethroughSpan" + type="android.text.style.StrikethroughSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> <constructor name="StrikethroughSpan" type="android.text.style.StrikethroughSpan" static="false" @@ -96847,7 +113101,31 @@ deprecated="not deprecated" visibility="public" > +<parameter name="src" type="android.os.Parcel"> +</parameter> </constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -96861,6 +113139,21 @@ <parameter name="ds" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="StyleSpan" extends="android.text.style.MetricAffectingSpan" @@ -96870,6 +113163,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="StyleSpan" type="android.text.style.StyleSpan" static="false" @@ -96880,6 +113175,38 @@ <parameter name="style" type="int"> </parameter> </constructor> +<constructor name="StyleSpan" + type="android.text.style.StyleSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getStyle" return="int" abstract="false" @@ -96917,6 +113244,21 @@ <parameter name="paint" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="SubscriptSpan" extends="android.text.style.MetricAffectingSpan" @@ -96926,6 +113268,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="SubscriptSpan" type="android.text.style.SubscriptSpan" static="false" @@ -96934,6 +113278,38 @@ visibility="public" > </constructor> +<constructor name="SubscriptSpan" + type="android.text.style.SubscriptSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -96960,6 +113336,21 @@ <parameter name="tp" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="SuperscriptSpan" extends="android.text.style.MetricAffectingSpan" @@ -96969,6 +113360,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="SuperscriptSpan" type="android.text.style.SuperscriptSpan" static="false" @@ -96977,6 +113370,38 @@ visibility="public" > </constructor> +<constructor name="SuperscriptSpan" + type="android.text.style.SuperscriptSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -97003,6 +113428,21 @@ <parameter name="tp" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <interface name="TabStopSpan" abstract="true" @@ -97065,6 +113505,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="TextAppearanceSpan" type="android.text.style.TextAppearanceSpan" static="false" @@ -97109,6 +113551,27 @@ <parameter name="linkColor" type="android.content.res.ColorStateList"> </parameter> </constructor> +<constructor name="TextAppearanceSpan" + type="android.text.style.TextAppearanceSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getFamily" return="java.lang.String" abstract="false" @@ -97131,6 +113594,17 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getTextColor" return="android.content.res.ColorStateList" abstract="false" @@ -97190,6 +113664,21 @@ <parameter name="ds" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="TypefaceSpan" extends="android.text.style.MetricAffectingSpan" @@ -97199,6 +113688,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="TypefaceSpan" type="android.text.style.TypefaceSpan" static="false" @@ -97209,6 +113700,27 @@ <parameter name="family" type="java.lang.String"> </parameter> </constructor> +<constructor name="TypefaceSpan" + type="android.text.style.TypefaceSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getFamily" return="java.lang.String" abstract="false" @@ -97220,6 +113732,17 @@ visibility="public" > </method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -97246,6 +113769,21 @@ <parameter name="paint" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="URLSpan" extends="android.text.style.ClickableSpan" @@ -97255,6 +113793,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> <constructor name="URLSpan" type="android.text.style.URLSpan" static="false" @@ -97265,6 +113805,38 @@ <parameter name="url" type="java.lang.String"> </parameter> </constructor> +<constructor name="URLSpan" + type="android.text.style.URLSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getURL" return="java.lang.String" abstract="false" @@ -97289,6 +113861,21 @@ <parameter name="widget" type="android.view.View"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> <class name="UnderlineSpan" extends="android.text.style.CharacterStyle" @@ -97298,6 +113885,10 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.ParcelableSpan"> +</implements> +<implements name="android.text.style.UpdateAppearance"> +</implements> <constructor name="UnderlineSpan" type="android.text.style.UnderlineSpan" static="false" @@ -97306,6 +113897,38 @@ visibility="public" > </constructor> +<constructor name="UnderlineSpan" + type="android.text.style.UnderlineSpan" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="src" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSpanTypeId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="updateDrawState" return="void" abstract="false" @@ -97319,7 +113942,30 @@ <parameter name="ds" type="android.text.TextPaint"> </parameter> </method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> </class> +<interface name="UpdateAppearance" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</interface> <interface name="UpdateLayout" abstract="true" static="false" @@ -97327,6 +113973,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.text.style.UpdateAppearance"> +</implements> </interface> <interface name="WrapTogetherSpan" abstract="true" @@ -99095,6 +115743,40 @@ > </method> </class> +<class name="PrintStreamPrinter" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.util.Printer"> +</implements> +<constructor name="PrintStreamPrinter" + type="android.util.PrintStreamPrinter" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pw" type="java.io.PrintStream"> +</parameter> +</constructor> +<method name="println" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="x" type="java.lang.String"> +</parameter> +</method> +</class> <class name="PrintWriterPrinter" extends="java.lang.Object" abstract="false" @@ -99669,6 +116351,19 @@ <parameter name="value" type="int"> </parameter> </method> +<method name="removeAt" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +</method> <method name="size" return="int" abstract="false" @@ -99871,6 +116566,17 @@ <parameter name="country" type="java.lang.String"> </parameter> </method> +<method name="getTimeZoneDatabaseVersion" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> </class> <class name="TimingLogger" extends="java.lang.Object" @@ -101185,7 +117891,7 @@ type="android.view.GestureDetector" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="listener" type="android.view.GestureDetector.OnGestureListener"> @@ -101197,12 +117903,38 @@ type="android.view.GestureDetector" static="false" final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="listener" type="android.view.GestureDetector.OnGestureListener"> +</parameter> +</constructor> +<constructor name="GestureDetector" + type="android.view.GestureDetector" + static="false" + final="false" deprecated="not deprecated" visibility="public" > +<parameter name="context" type="android.content.Context"> +</parameter> <parameter name="listener" type="android.view.GestureDetector.OnGestureListener"> </parameter> </constructor> +<constructor name="GestureDetector" + type="android.view.GestureDetector" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="listener" type="android.view.GestureDetector.OnGestureListener"> +</parameter> +<parameter name="handler" type="android.os.Handler"> +</parameter> +</constructor> <method name="isLongpressEnabled" return="boolean" abstract="false" @@ -101240,7 +117972,67 @@ <parameter name="isLongpressEnabled" type="boolean"> </parameter> </method> +<method name="setOnDoubleTapListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="onDoubleTapListener" type="android.view.GestureDetector.OnDoubleTapListener"> +</parameter> +</method> </class> +<interface name="GestureDetector.OnDoubleTapListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onDoubleTap" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="e" type="android.view.MotionEvent"> +</parameter> +</method> +<method name="onDoubleTapEvent" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="e" type="android.view.MotionEvent"> +</parameter> +</method> +<method name="onSingleTapConfirmed" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="e" type="android.view.MotionEvent"> +</parameter> +</method> +</interface> <interface name="GestureDetector.OnGestureListener" abstract="true" static="true" @@ -101347,6 +118139,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.view.GestureDetector.OnDoubleTapListener"> +</implements> <implements name="android.view.GestureDetector.OnGestureListener"> </implements> <constructor name="GestureDetector.SimpleOnGestureListener" @@ -101357,6 +118151,32 @@ visibility="public" > </constructor> +<method name="onDoubleTap" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="e" type="android.view.MotionEvent"> +</parameter> +</method> +<method name="onDoubleTapEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="e" type="android.view.MotionEvent"> +</parameter> +</method> <method name="onDown" return="boolean" abstract="false" @@ -101434,6 +118254,19 @@ <parameter name="e" type="android.view.MotionEvent"> </parameter> </method> +<method name="onSingleTapConfirmed" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="e" type="android.view.MotionEvent"> +</parameter> +</method> <method name="onSingleTapUp" return="boolean" abstract="false" @@ -101510,6 +118343,23 @@ <parameter name="outRect" type="android.graphics.Rect"> </parameter> </method> +<method name="applyDisplay" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="gravity" type="int"> +</parameter> +<parameter name="display" type="android.graphics.Rect"> +</parameter> +<parameter name="inoutObj" type="android.graphics.Rect"> +</parameter> +</method> <method name="isHorizontal" return="boolean" abstract="false" @@ -101536,6 +118386,17 @@ <parameter name="gravity" type="int"> </parameter> </method> +<field name="AXIS_CLIP" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="AXIS_PULL_AFTER" type="int" transient="false" @@ -101635,6 +118496,50 @@ visibility="public" > </field> +<field name="CLIP_HORIZONTAL" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="CLIP_VERTICAL" + type="int" + transient="false" + volatile="false" + value="128" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DISPLAY_CLIP_HORIZONTAL" + type="int" + transient="false" + volatile="false" + value="16777216" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DISPLAY_CLIP_VERTICAL" + type="int" + transient="false" + volatile="false" + value="268435456" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FILL" type="int" transient="false" @@ -101735,6 +118640,48 @@ > </field> </class> +<class name="HapticFeedbackConstants" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<field name="FLAG_IGNORE_GLOBAL_SETTING" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FLAG_IGNORE_VIEW_SETTING" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="LONG_PRESS" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> <class name="InflateException" extends="java.lang.RuntimeException" abstract="false" @@ -101792,6 +118739,32 @@ deprecated="not deprecated" visibility="public" > +<method name="deviceHasKey" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="keyCode" type="int"> +</parameter> +</method> +<method name="deviceHasKeys" + return="boolean[]" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="keyCodes" type="int[]"> +</parameter> +</method> <method name="get" return="int" abstract="false" @@ -102210,6 +119183,32 @@ deprecated="not deprecated" visibility="public" > +<parameter name="time" type="long"> +</parameter> +<parameter name="characters" type="java.lang.String"> +</parameter> +<parameter name="device" type="int"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</constructor> +<constructor name="KeyEvent" + type="android.view.KeyEvent" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="origEvent" type="android.view.KeyEvent"> +</parameter> +</constructor> +<constructor name="KeyEvent" + type="android.view.KeyEvent" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="origEvent" type="android.view.KeyEvent"> </parameter> <parameter name="eventTime" type="long"> @@ -102217,6 +119216,53 @@ <parameter name="newRepeat" type="int"> </parameter> </constructor> +<method name="changeAction" + return="android.view.KeyEvent" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +<parameter name="action" type="int"> +</parameter> +</method> +<method name="changeFlags" + return="android.view.KeyEvent" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="changeTimeRepeat" + return="android.view.KeyEvent" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +<parameter name="eventTime" type="long"> +</parameter> +<parameter name="newRepeat" type="int"> +</parameter> +</method> <method name="describeContents" return="int" abstract="false" @@ -102252,6 +119298,17 @@ visibility="public" > </method> +<method name="getCharacters" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getDeadChar" return="int" abstract="false" @@ -102374,6 +119431,17 @@ <parameter name="modifiers" type="int"> </parameter> </method> +<method name="getMaxKeyCode" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getMetaState" return="int" abstract="false" @@ -102568,6 +119636,50 @@ visibility="public" > </field> +<field name="FLAG_EDITOR_ACTION" + type="int" + transient="false" + volatile="false" + value="16" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FLAG_FROM_SYSTEM" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FLAG_KEEP_TOUCH_MODE" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FLAG_SOFT_KEYBOARD" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FLAG_WOKE_HERE" type="int" transient="false" @@ -103118,6 +120230,72 @@ visibility="public" > </field> +<field name="KEYCODE_MEDIA_FAST_FORWARD" + type="int" + transient="false" + volatile="false" + value="90" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_MEDIA_NEXT" + type="int" + transient="false" + volatile="false" + value="87" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_MEDIA_PLAY_PAUSE" + type="int" + transient="false" + volatile="false" + value="85" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_MEDIA_PREVIOUS" + type="int" + transient="false" + volatile="false" + value="88" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_MEDIA_REWIND" + type="int" + transient="false" + volatile="false" + value="89" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_MEDIA_STOP" + type="int" + transient="false" + volatile="false" + value="86" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_MENU" type="int" transient="false" @@ -103140,6 +120318,17 @@ visibility="public" > </field> +<field name="KEYCODE_MUTE" + type="int" + transient="false" + volatile="false" + value="91" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_N" type="int" transient="false" @@ -103521,7 +120710,7 @@ value="84" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -104095,6 +121284,17 @@ visibility="public" > </method> +<method name="close" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="findItem" return="android.view.MenuItem" abstract="true" @@ -104108,6 +121308,19 @@ <parameter name="id" type="int"> </parameter> </method> +<method name="getItem" + return="android.view.MenuItem" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +</method> <method name="hasVisibleItems" return="boolean" abstract="true" @@ -105246,6 +122459,17 @@ visibility="public" > </field> +<field name="ACTION_OUTSIDE" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_UP" type="int" transient="false" @@ -105312,7 +122536,7 @@ > </field> </class> -<class name="OrientationListener" +<class name="OrientationEventListener" extends="java.lang.Object" abstract="true" static="false" @@ -105320,6 +122544,94 @@ deprecated="not deprecated" visibility="public" > +<constructor name="OrientationEventListener" + type="android.view.OrientationEventListener" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</constructor> +<constructor name="OrientationEventListener" + type="android.view.OrientationEventListener" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="rate" type="int"> +</parameter> +</constructor> +<method name="canDetectOrientation" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="disable" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="enable" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onOrientationChanged" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="orientation" type="int"> +</parameter> +</method> +<field name="ORIENTATION_UNKNOWN" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="OrientationListener" + extends="java.lang.Object" + abstract="true" + static="false" + final="false" + deprecated="deprecated" + visibility="public" +> <implements name="android.hardware.SensorListener"> </implements> <constructor name="OrientationListener" @@ -105332,6 +122644,18 @@ <parameter name="context" type="android.content.Context"> </parameter> </constructor> +<constructor name="OrientationListener" + type="android.view.OrientationListener" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="rate" type="int"> +</parameter> +</constructor> <method name="disable" return="void" abstract="false" @@ -105767,7 +123091,7 @@ <method name="setOrientation" return="void" abstract="false" - native="true" + native="false" synchronized="false" static="true" final="false" @@ -106760,6 +124084,19 @@ visibility="public" > </method> +<method name="checkInputConnectionProxy" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> <method name="clearAnimation" return="void" abstract="false" @@ -106909,6 +124246,19 @@ <parameter name="event" type="android.view.KeyEvent"> </parameter> </method> +<method name="dispatchKeyEventPreIme" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> <method name="dispatchKeyShortcutEvent" return="boolean" abstract="false" @@ -107383,7 +124733,7 @@ static="false" final="false" deprecated="not deprecated" - visibility="protected" + visibility="public" > </method> <method name="getHeight" @@ -107944,6 +125294,19 @@ visibility="public" > </method> +<method name="getWindowVisibleDisplayFrame" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="outRect" type="android.graphics.Rect"> +</parameter> +</method> <method name="hasFocus" return="boolean" abstract="false" @@ -108153,6 +125516,17 @@ visibility="public" > </method> +<method name="isHapticFeedbackEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isHorizontalFadingEdgeEnabled" return="boolean" abstract="false" @@ -108175,6 +125549,17 @@ visibility="public" > </method> +<method name="isInEditMode" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isInTouchMode" return="boolean" abstract="false" @@ -108404,6 +125789,17 @@ visibility="protected" > </method> +<method name="onCheckIsTextEditor" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="onCreateContextMenu" return="void" abstract="false" @@ -108430,6 +125826,19 @@ <parameter name="extraSpace" type="int"> </parameter> </method> +<method name="onCreateInputConnection" + return="android.view.inputmethod.InputConnection" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="outAttrs" type="android.view.inputmethod.EditorInfo"> +</parameter> +</method> <method name="onDetachedFromWindow" return="void" abstract="false" @@ -108465,6 +125874,17 @@ visibility="protected" > </method> +<method name="onFinishTemporaryDetach" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="onFocusChanged" return="void" abstract="false" @@ -108514,6 +125934,21 @@ <parameter name="event" type="android.view.KeyEvent"> </parameter> </method> +<method name="onKeyPreIme" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="keyCode" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> <method name="onKeyShortcut" return="boolean" abstract="false" @@ -108655,6 +126090,17 @@ <parameter name="oldh" type="int"> </parameter> </method> +<method name="onStartTemporaryDetach" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="onTouchEvent" return="boolean" abstract="false" @@ -108718,6 +126164,34 @@ visibility="public" > </method> +<method name="performHapticFeedback" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="feedbackConstant" type="int"> +</parameter> +</method> +<method name="performHapticFeedback" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="feedbackConstant" type="int"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> <method name="performLongClick" return="boolean" abstract="false" @@ -108737,7 +126211,7 @@ static="false" final="false" deprecated="not deprecated" - visibility="protected" + visibility="public" > <parameter name="soundConstant" type="int"> </parameter> @@ -109204,6 +126678,19 @@ <parameter name="focusableInTouchMode" type="boolean"> </parameter> </method> +<method name="setHapticFeedbackEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="hapticFeedbackEnabled" type="boolean"> +</parameter> +</method> <method name="setHorizontalFadingEdgeEnabled" return="void" abstract="false" @@ -109511,6 +126998,19 @@ <parameter name="style" type="int"> </parameter> </method> +<method name="setScrollContainer" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="isScrollContainer" type="boolean"> +</parameter> +</method> <method name="setSelected" return="void" abstract="false" @@ -109968,6 +127468,17 @@ visibility="public" > </field> +<field name="HAPTIC_FEEDBACK_ENABLED" + type="int" + transient="false" + volatile="false" + value="268435456" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="INVISIBLE" type="int" transient="false" @@ -110570,11 +128081,24 @@ type="android.view.ViewConfiguration" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </constructor> -<method name="getEdgeSlop" +<method name="get" + return="android.view.ViewConfiguration" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="getDoubleTapTimeout" return="int" abstract="false" native="false" @@ -110585,6 +128109,17 @@ visibility="public" > </method> +<method name="getEdgeSlop" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> +</method> <method name="getFadingEdgeLength" return="int" abstract="false" @@ -110592,7 +128127,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -110636,7 +128171,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -110647,7 +128182,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -110662,6 +128197,94 @@ 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" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getScaledFadingEdgeLength" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getScaledMaximumDrawingCacheSize" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getScaledMinimumFlingVelocity" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getScaledScrollBarSize" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getScaledTouchSlop" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getScaledWindowTouchSlop" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getScrollBarSize" return="int" abstract="false" @@ -110669,7 +128292,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -110702,7 +128325,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -110713,7 +128336,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -110745,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" @@ -110852,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" @@ -112129,6 +129778,19 @@ <parameter name="drawingCacheToKeep" type="int"> </parameter> </method> +<method name="setStaticTransformationsEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="enabled" type="boolean"> +</parameter> +</method> <method name="showContextMenuForChild" return="boolean" abstract="false" @@ -112765,6 +130427,23 @@ <parameter name="focused" type="android.view.View"> </parameter> </method> +<method name="requestChildRectangleOnScreen" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="child" type="android.view.View"> +</parameter> +<parameter name="rectangle" type="android.graphics.Rect"> +</parameter> +<parameter name="immediate" type="boolean"> +</parameter> +</method> <method name="requestDisallowInterceptTouchEvent" return="void" abstract="true" @@ -113015,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" @@ -113100,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" @@ -113175,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" @@ -113446,6 +131170,17 @@ visibility="public" > </method> +<method name="hasSoftInputMode" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="protected" +> +</method> <method name="isActive" return="boolean" abstract="false" @@ -113912,6 +131647,19 @@ <parameter name="height" type="int"> </parameter> </method> +<method name="setSoftInputMode" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mode" type="int"> +</parameter> +</method> <method name="setTitle" return="void" abstract="true" @@ -113964,6 +131712,19 @@ <parameter name="streamType" type="int"> </parameter> </method> +<method name="setWindowAnimations" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="resId" type="int"> +</parameter> +</method> <method name="setWindowManager" return="void" abstract="false" @@ -114645,6 +132406,19 @@ visibility="public" > </method> +<method name="mayUseInputMethod" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="flags" type="int"> +</parameter> +</method> <method name="setTitle" return="void" abstract="false" @@ -114760,6 +132534,17 @@ visibility="public" > </field> +<field name="FLAG_ALT_FOCUSABLE_IM" + type="int" + transient="false" + volatile="false" + value="131072" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FLAG_BLUR_BEHIND" type="int" transient="false" @@ -114936,6 +132721,17 @@ visibility="public" > </field> +<field name="FLAG_WATCH_OUTSIDE_TOUCH" + type="int" + transient="false" + volatile="false" + value="262144" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FORMAT_CHANGED" type="int" transient="false" @@ -115046,6 +132842,171 @@ visibility="public" > </field> +<field name="SCREEN_BRIGHTNESS_CHANGED" + type="int" + transient="false" + volatile="false" + value="2048" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SCREEN_ORIENTATION_CHANGED" + type="int" + transient="false" + volatile="false" + value="1024" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_ADJUST_PAN" + type="int" + transient="false" + volatile="false" + value="32" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_ADJUST_RESIZE" + type="int" + transient="false" + volatile="false" + value="16" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_ADJUST_UNSPECIFIED" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_IS_FORWARD_NAVIGATION" + type="int" + transient="false" + volatile="false" + value="256" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_MASK_ADJUST" + type="int" + transient="false" + volatile="false" + value="240" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_MASK_STATE" + type="int" + transient="false" + volatile="false" + value="15" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_MODE_CHANGED" + type="int" + transient="false" + volatile="false" + value="512" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_STATE_ALWAYS_HIDDEN" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_STATE_ALWAYS_VISIBLE" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_STATE_HIDDEN" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_STATE_UNCHANGED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_STATE_UNSPECIFIED" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOFT_INPUT_STATE_VISIBLE" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TITLE_CHANGED" type="int" transient="false" @@ -115068,6 +133029,17 @@ visibility="public" > </field> +<field name="TYPE_APPLICATION_ATTACHED_DIALOG" + type="int" + transient="false" + volatile="false" + value="1003" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TYPE_APPLICATION_MEDIA" type="int" transient="false" @@ -115134,6 +133106,28 @@ visibility="public" > </field> +<field name="TYPE_INPUT_METHOD" + type="int" + transient="false" + volatile="false" + value="2011" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_INPUT_METHOD_DIALOG" + type="int" + transient="false" + volatile="false" + value="2012" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TYPE_KEYGUARD" type="int" transient="false" @@ -115356,6 +133350,36 @@ visibility="public" > </field> +<field name="screenBrightness" + type="float" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="screenOrientation" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="softInputMode" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="token" type="android.os.IBinder" transient="false" @@ -115569,6 +133593,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="java.lang.Cloneable"> +</implements> <constructor name="Animation" type="android.view.animation.Animation" static="false" @@ -115604,6 +133630,17 @@ <parameter name="t" type="android.view.animation.Transformation"> </parameter> </method> +<method name="computeDurationHint" + return="long" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="ensureInterpolator" return="void" abstract="false" @@ -115770,6 +133807,17 @@ <parameter name="parentHeight" type="int"> </parameter> </method> +<method name="isFillEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isInitialized" return="boolean" abstract="false" @@ -115889,6 +133937,19 @@ <parameter name="fillBefore" type="boolean"> </parameter> </method> +<method name="setFillEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fillEnabled" type="boolean"> +</parameter> +</method> <method name="setInterpolator" return="void" abstract="false" @@ -117463,6 +135524,17 @@ <parameter name="transformationType" type="int"> </parameter> </method> +<method name="toShortString" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <field name="TYPE_ALPHA" type="int" transient="false" @@ -117596,6 +135668,2761 @@ </constructor> </class> </package> +<package name="android.view.inputmethod" +> +<class name="BaseInputConnection" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.view.inputmethod.InputConnection"> +</implements> +<constructor name="BaseInputConnection" + type="android.view.inputmethod.BaseInputConnection" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="targetView" type="android.view.View"> +</parameter> +<parameter name="fullEditor" type="boolean"> +</parameter> +</constructor> +<method name="beginBatchEdit" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="clearMetaKeyStates" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="states" type="int"> +</parameter> +</method> +<method name="commitCompletion" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.view.inputmethod.CompletionInfo"> +</parameter> +</method> +<method name="commitText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="newCursorPosition" type="int"> +</parameter> +</method> +<method name="deleteSurroundingText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="leftLength" type="int"> +</parameter> +<parameter name="rightLength" type="int"> +</parameter> +</method> +<method name="endBatchEdit" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="finishComposingText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getComposingSpanEnd" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.text.Spannable"> +</parameter> +</method> +<method name="getComposingSpanStart" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.text.Spannable"> +</parameter> +</method> +<method name="getCursorCapsMode" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="reqModes" type="int"> +</parameter> +</method> +<method name="getEditable" + return="android.text.Editable" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getExtractedText" + return="android.view.inputmethod.ExtractedText" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="request" type="android.view.inputmethod.ExtractedTextRequest"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="getTextAfterCursor" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="length" type="int"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="getTextBeforeCursor" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="length" type="int"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="performContextMenuAction" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +</method> +<method name="performEditorAction" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="actionCode" type="int"> +</parameter> +</method> +<method name="performPrivateCommand" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="action" type="java.lang.String"> +</parameter> +<parameter name="data" type="android.os.Bundle"> +</parameter> +</method> +<method name="removeComposingSpans" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.text.Spannable"> +</parameter> +</method> +<method name="reportFullscreenMode" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="enabled" type="boolean"> +</parameter> +</method> +<method name="sendKeyEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +<method name="setComposingSpans" + return="void" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.text.Spannable"> +</parameter> +</method> +<method name="setComposingText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="newCursorPosition" type="int"> +</parameter> +</method> +<method name="setSelection" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="start" type="int"> +</parameter> +<parameter name="end" type="int"> +</parameter> +</method> +</class> +<class name="CompletionInfo" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="CompletionInfo" + type="android.view.inputmethod.CompletionInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="long"> +</parameter> +<parameter name="index" type="int"> +</parameter> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +</constructor> +<constructor name="CompletionInfo" + type="android.view.inputmethod.CompletionInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="long"> +</parameter> +<parameter name="index" type="int"> +</parameter> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="label" type="java.lang.CharSequence"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getId" + return="long" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getLabel" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPosition" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getText" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="EditorInfo" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.text.InputType"> +</implements> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="EditorInfo" + type="android.view.inputmethod.EditorInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="dump" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pw" type="android.util.Printer"> +</parameter> +<parameter name="prefix" type="java.lang.String"> +</parameter> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_ACTION_DONE" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_ACTION_GO" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_ACTION_NEXT" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_ACTION_NONE" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_ACTION_SEARCH" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_ACTION_SEND" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_ACTION_UNSPECIFIED" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_FLAG_NO_ACCESSORY_ACTION" + type="int" + transient="false" + volatile="false" + value="536870912" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_FLAG_NO_ENTER_ACTION" + type="int" + transient="false" + volatile="false" + value="1073741824" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_FLAG_NO_EXTRACT_UI" + type="int" + transient="false" + volatile="false" + value="268435456" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_MASK_ACTION" + type="int" + transient="false" + volatile="false" + value="255" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="IME_NULL" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="actionId" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="actionLabel" + type="java.lang.CharSequence" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="extras" + type="android.os.Bundle" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="fieldId" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="fieldName" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="hintText" + type="java.lang.CharSequence" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="imeOptions" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="initialCapsMode" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="initialSelEnd" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="initialSelStart" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="inputType" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="label" + type="java.lang.CharSequence" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="packageName" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="privateImeOptions" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="ExtractedText" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="ExtractedText" + type="android.view.inputmethod.ExtractedText" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FLAG_SELECTING" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="FLAG_SINGLE_LINE" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="flags" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="partialEndOffset" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="partialStartOffset" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="selectionEnd" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="selectionStart" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="startOffset" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="text" + type="java.lang.CharSequence" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="ExtractedTextRequest" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="ExtractedTextRequest" + type="android.view.inputmethod.ExtractedTextRequest" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="flags" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="hintMaxChars" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="hintMaxLines" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="token" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="InputBinding" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="InputBinding" + type="android.view.inputmethod.InputBinding" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="conn" type="android.view.inputmethod.InputConnection"> +</parameter> +<parameter name="connToken" type="android.os.IBinder"> +</parameter> +<parameter name="uid" type="int"> +</parameter> +<parameter name="pid" type="int"> +</parameter> +</constructor> +<constructor name="InputBinding" + type="android.view.inputmethod.InputBinding" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="conn" type="android.view.inputmethod.InputConnection"> +</parameter> +<parameter name="binding" type="android.view.inputmethod.InputBinding"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getConnection" + return="android.view.inputmethod.InputConnection" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getConnectionToken" + return="android.os.IBinder" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPid" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getUid" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<interface name="InputConnection" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="beginBatchEdit" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="clearMetaKeyStates" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="states" type="int"> +</parameter> +</method> +<method name="commitCompletion" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.view.inputmethod.CompletionInfo"> +</parameter> +</method> +<method name="commitText" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="newCursorPosition" type="int"> +</parameter> +</method> +<method name="deleteSurroundingText" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="leftLength" type="int"> +</parameter> +<parameter name="rightLength" type="int"> +</parameter> +</method> +<method name="endBatchEdit" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="finishComposingText" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getCursorCapsMode" + return="int" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="reqModes" type="int"> +</parameter> +</method> +<method name="getExtractedText" + return="android.view.inputmethod.ExtractedText" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="request" type="android.view.inputmethod.ExtractedTextRequest"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="getTextAfterCursor" + return="java.lang.CharSequence" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="n" type="int"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="getTextBeforeCursor" + return="java.lang.CharSequence" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="n" type="int"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="performContextMenuAction" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +</method> +<method name="performEditorAction" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="editorAction" type="int"> +</parameter> +</method> +<method name="performPrivateCommand" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="action" type="java.lang.String"> +</parameter> +<parameter name="data" type="android.os.Bundle"> +</parameter> +</method> +<method name="reportFullscreenMode" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="enabled" type="boolean"> +</parameter> +</method> +<method name="sendKeyEvent" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +<method name="setComposingText" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="newCursorPosition" type="int"> +</parameter> +</method> +<method name="setSelection" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="start" type="int"> +</parameter> +<parameter name="end" type="int"> +</parameter> +</method> +<field name="GET_EXTRACTED_TEXT_MONITOR" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="GET_TEXT_WITH_STYLES" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</interface> +<class name="InputConnectionWrapper" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.view.inputmethod.InputConnection"> +</implements> +<constructor name="InputConnectionWrapper" + type="android.view.inputmethod.InputConnectionWrapper" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="target" type="android.view.inputmethod.InputConnection"> +</parameter> +<parameter name="mutable" type="boolean"> +</parameter> +</constructor> +<method name="beginBatchEdit" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="clearMetaKeyStates" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="states" type="int"> +</parameter> +</method> +<method name="commitCompletion" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.view.inputmethod.CompletionInfo"> +</parameter> +</method> +<method name="commitText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="newCursorPosition" type="int"> +</parameter> +</method> +<method name="deleteSurroundingText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="leftLength" type="int"> +</parameter> +<parameter name="rightLength" type="int"> +</parameter> +</method> +<method name="endBatchEdit" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="finishComposingText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getCursorCapsMode" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="reqModes" type="int"> +</parameter> +</method> +<method name="getExtractedText" + return="android.view.inputmethod.ExtractedText" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="request" type="android.view.inputmethod.ExtractedTextRequest"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="getTextAfterCursor" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="n" type="int"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="getTextBeforeCursor" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="n" type="int"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="performContextMenuAction" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +</method> +<method name="performEditorAction" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="editorAction" type="int"> +</parameter> +</method> +<method name="performPrivateCommand" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="action" type="java.lang.String"> +</parameter> +<parameter name="data" type="android.os.Bundle"> +</parameter> +</method> +<method name="reportFullscreenMode" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="enabled" type="boolean"> +</parameter> +</method> +<method name="sendKeyEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +<method name="setComposingText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="java.lang.CharSequence"> +</parameter> +<parameter name="newCursorPosition" type="int"> +</parameter> +</method> +<method name="setSelection" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="start" type="int"> +</parameter> +<parameter name="end" type="int"> +</parameter> +</method> +<method name="setTarget" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="target" type="android.view.inputmethod.InputConnection"> +</parameter> +</method> +</class> +<interface name="InputMethod" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="attachToken" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="token" type="android.os.IBinder"> +</parameter> +</method> +<method name="bindInput" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="binding" type="android.view.inputmethod.InputBinding"> +</parameter> +</method> +<method name="createSession" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="callback" type="android.view.inputmethod.InputMethod.SessionCallback"> +</parameter> +</method> +<method name="hideSoftInput" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="flags" type="int"> +</parameter> +<parameter name="resultReceiver" type="android.os.ResultReceiver"> +</parameter> +</method> +<method name="restartInput" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="inputConnection" type="android.view.inputmethod.InputConnection"> +</parameter> +<parameter name="attribute" type="android.view.inputmethod.EditorInfo"> +</parameter> +</method> +<method name="revokeSession" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="session" type="android.view.inputmethod.InputMethodSession"> +</parameter> +</method> +<method name="setSessionEnabled" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="session" type="android.view.inputmethod.InputMethodSession"> +</parameter> +<parameter name="enabled" type="boolean"> +</parameter> +</method> +<method name="showSoftInput" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="flags" type="int"> +</parameter> +<parameter name="resultReceiver" type="android.os.ResultReceiver"> +</parameter> +</method> +<method name="startInput" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="inputConnection" type="android.view.inputmethod.InputConnection"> +</parameter> +<parameter name="info" type="android.view.inputmethod.EditorInfo"> +</parameter> +</method> +<method name="unbindInput" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<field name="SERVICE_INTERFACE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.view.InputMethod"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SERVICE_META_DATA" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.view.im"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SHOW_EXPLICIT" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SHOW_FORCED" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</interface> +<interface name="InputMethod.SessionCallback" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="sessionCreated" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="session" type="android.view.inputmethod.InputMethodSession"> +</parameter> +</method> +</interface> +<class name="InputMethodInfo" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<constructor name="InputMethodInfo" + type="android.view.inputmethod.InputMethodInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="service" type="android.content.pm.ResolveInfo"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException"> +</exception> +</constructor> +<constructor name="InputMethodInfo" + type="android.view.inputmethod.InputMethodInfo" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="packageName" type="java.lang.String"> +</parameter> +<parameter name="className" type="java.lang.String"> +</parameter> +<parameter name="label" type="java.lang.CharSequence"> +</parameter> +<parameter name="settingsActivity" type="java.lang.String"> +</parameter> +</constructor> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="dump" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pw" type="android.util.Printer"> +</parameter> +<parameter name="prefix" type="java.lang.String"> +</parameter> +</method> +<method name="getComponent" + return="android.content.ComponentName" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getId" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getIsDefaultResourceId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPackageName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getServiceInfo" + return="android.content.pm.ServiceInfo" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getServiceName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSettingsActivity" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="loadIcon" + return="android.graphics.drawable.Drawable" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pm" type="android.content.pm.PackageManager"> +</parameter> +</method> +<method name="loadLabel" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="pm" type="android.content.pm.PackageManager"> +</parameter> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dest" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="InputMethodManager" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<method name="displayCompletions" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="completions" type="android.view.inputmethod.CompletionInfo[]"> +</parameter> +</method> +<method name="getEnabledInputMethodList" + return="java.util.List<android.view.inputmethod.InputMethodInfo>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInputMethodList" + return="java.util.List<android.view.inputmethod.InputMethodInfo>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="hideSoftInputFromInputMethod" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="token" type="android.os.IBinder"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="hideSoftInputFromWindow" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="windowToken" type="android.os.IBinder"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="hideSoftInputFromWindow" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="windowToken" type="android.os.IBinder"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +<parameter name="resultReceiver" type="android.os.ResultReceiver"> +</parameter> +</method> +<method name="hideStatusIcon" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="imeToken" type="android.os.IBinder"> +</parameter> +</method> +<method name="isAcceptingText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isActive" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> +<method name="isActive" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isFullscreenMode" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isWatchingCursor" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> +<method name="restartInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +</method> +<method name="sendAppPrivateCommand" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="action" type="java.lang.String"> +</parameter> +<parameter name="data" type="android.os.Bundle"> +</parameter> +</method> +<method name="setInputMethod" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="token" type="android.os.IBinder"> +</parameter> +<parameter name="id" type="java.lang.String"> +</parameter> +</method> +<method name="showInputMethodPicker" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="showSoftInput" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="showSoftInput" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +<parameter name="resultReceiver" type="android.os.ResultReceiver"> +</parameter> +</method> +<method name="showSoftInputFromInputMethod" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="token" type="android.os.IBinder"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<method name="showStatusIcon" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="imeToken" type="android.os.IBinder"> +</parameter> +<parameter name="packageName" type="java.lang.String"> +</parameter> +<parameter name="iconId" type="int"> +</parameter> +</method> +<method name="toggleSoftInput" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="showFlags" type="int"> +</parameter> +<parameter name="hideFlags" type="int"> +</parameter> +</method> +<method name="toggleSoftInputFromWindow" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="windowToken" type="android.os.IBinder"> +</parameter> +<parameter name="showFlags" type="int"> +</parameter> +<parameter name="hideFlags" type="int"> +</parameter> +</method> +<method name="updateCursor" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="left" type="int"> +</parameter> +<parameter name="top" type="int"> +</parameter> +<parameter name="right" type="int"> +</parameter> +<parameter name="bottom" type="int"> +</parameter> +</method> +<method name="updateExtractedText" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="token" type="int"> +</parameter> +<parameter name="text" type="android.view.inputmethod.ExtractedText"> +</parameter> +</method> +<method name="updateSelection" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="selStart" type="int"> +</parameter> +<parameter name="selEnd" type="int"> +</parameter> +<parameter name="candidatesStart" type="int"> +</parameter> +<parameter name="candidatesEnd" type="int"> +</parameter> +</method> +<field name="HIDE_IMPLICIT_ONLY" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="HIDE_NOT_ALWAYS" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_HIDDEN" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_SHOWN" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_UNCHANGED_HIDDEN" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="RESULT_UNCHANGED_SHOWN" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SHOW_FORCED" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SHOW_IMPLICIT" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<interface name="InputMethodSession" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="appPrivateCommand" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="action" type="java.lang.String"> +</parameter> +<parameter name="data" type="android.os.Bundle"> +</parameter> +</method> +<method name="dispatchKeyEvent" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="seq" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +<parameter name="callback" type="android.view.inputmethod.InputMethodSession.EventCallback"> +</parameter> +</method> +<method name="dispatchTrackballEvent" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="seq" type="int"> +</parameter> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +<parameter name="callback" type="android.view.inputmethod.InputMethodSession.EventCallback"> +</parameter> +</method> +<method name="displayCompletions" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="completions" type="android.view.inputmethod.CompletionInfo[]"> +</parameter> +</method> +<method name="finishInput" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="toggleSoftInput" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="showFlags" type="int"> +</parameter> +<parameter name="hideFlags" type="int"> +</parameter> +</method> +<method name="updateCursor" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="newCursor" type="android.graphics.Rect"> +</parameter> +</method> +<method name="updateExtractedText" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="token" type="int"> +</parameter> +<parameter name="text" type="android.view.inputmethod.ExtractedText"> +</parameter> +</method> +<method name="updateSelection" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="oldSelStart" type="int"> +</parameter> +<parameter name="oldSelEnd" type="int"> +</parameter> +<parameter name="newSelStart" type="int"> +</parameter> +<parameter name="newSelEnd" type="int"> +</parameter> +<parameter name="candidatesStart" type="int"> +</parameter> +<parameter name="candidatesEnd" type="int"> +</parameter> +</method> +</interface> +<interface name="InputMethodSession.EventCallback" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="finishedEvent" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="seq" type="int"> +</parameter> +<parameter name="handled" type="boolean"> +</parameter> +</method> +</interface> +</package> <package name="android.webkit" > <class name="CacheManager" @@ -118171,7 +138998,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="host" type="java.lang.String"> +<parameter name="schemePlusHost" type="java.lang.String"> </parameter> <parameter name="username" type="java.lang.String"> </parameter> @@ -118360,7 +139187,7 @@ return="void" abstract="false" native="false" - synchronized="true" + synchronized="false" static="false" final="false" deprecated="not deprecated" @@ -118371,7 +139198,7 @@ return="void" abstract="false" native="false" - synchronized="true" + synchronized="false" static="false" final="false" deprecated="not deprecated" @@ -118382,7 +139209,7 @@ return="void" abstract="false" native="false" - synchronized="true" + synchronized="false" static="false" final="false" deprecated="not deprecated" @@ -118943,6 +139770,75 @@ </parameter> </method> </interface> +<class name="PluginData" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<constructor name="PluginData" + type="android.webkit.PluginData" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="stream" type="java.io.InputStream"> +</parameter> +<parameter name="length" type="long"> +</parameter> +<parameter name="headers" type="java.util.Map<java.lang.String, java.lang.String[]>"> +</parameter> +<parameter name="code" type="int"> +</parameter> +</constructor> +<method name="getContentLength" + return="long" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getHeaders" + return="java.util.Map<java.lang.String, java.lang.String[]>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInputStream" + return="java.io.InputStream" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getStatusCode" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> <class name="PluginList" extends="java.lang.Object" abstract="false" @@ -119178,7 +140074,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="url" type="java.lang.String"> @@ -119296,6 +140192,21 @@ deprecated="not deprecated" visibility="public" > +<method name="getPluginData" + return="android.webkit.PluginData" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="url" type="java.lang.String"> +</parameter> +<parameter name="headers" type="java.util.Map<java.lang.String, java.lang.String>"> +</parameter> +</method> <method name="service" return="android.webkit.CacheManager.CacheResult" abstract="true" @@ -119303,7 +140214,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="url" type="java.lang.String"> @@ -119328,6 +140239,21 @@ visibility="public" > </constructor> +<method name="getPluginData" + return="android.webkit.PluginData" + abstract="false" + native="false" + synchronized="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="url" type="java.lang.String"> +</parameter> +<parameter name="headers" type="java.util.Map<java.lang.String, java.lang.String>"> +</parameter> +</method> <method name="getSurrogate" return="android.webkit.CacheManager.CacheResult" abstract="false" @@ -119335,7 +140261,7 @@ synchronized="true" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="url" type="java.lang.String"> @@ -119670,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" @@ -119820,6 +140757,17 @@ deprecated="not deprecated" visibility="public" > +<method name="getAllowFileAccess" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getBlockNetworkImage" return="boolean" abstract="false" @@ -119831,6 +140779,17 @@ visibility="public" > </method> +<method name="getBuiltInZoomControls" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getCacheMode" return="int" abstract="false" @@ -120113,10 +141072,34 @@ synchronized="true" static="false" final="false" + deprecated="deprecated" + visibility="public" +> +</method> +<method name="getUserAgentString" + return="java.lang.String" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" deprecated="not deprecated" visibility="public" > </method> +<method name="setAllowFileAccess" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="allow" type="boolean"> +</parameter> +</method> <method name="setBlockNetworkImage" return="void" abstract="false" @@ -120130,6 +141113,19 @@ <parameter name="flag" type="boolean"> </parameter> </method> +<method name="setBuiltInZoomControls" + 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="setCacheMode" return="void" abstract="false" @@ -120514,12 +141510,25 @@ synchronized="true" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="ua" type="int"> </parameter> </method> +<method name="setUserAgentString" + return="void" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ua" type="java.lang.String"> +</parameter> +</method> <method name="supportMultipleWindows" return="boolean" abstract="false" @@ -120961,6 +141970,17 @@ visibility="public" > </method> +<method name="clearMatches" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="clearSslPreferences" return="void" abstract="false" @@ -121064,6 +142084,32 @@ <parameter name="addr" type="java.lang.String"> </parameter> </method> +<method name="findAll" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="find" type="java.lang.String"> +</parameter> +</method> +<method name="findNext" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="forward" type="boolean"> +</parameter> +</method> <method name="flingScroll" return="void" abstract="false" @@ -121138,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" @@ -121211,7 +142268,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -121349,7 +142406,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="oldFocus" type="android.view.View"> @@ -121466,6 +142523,21 @@ <parameter name="msg" type="android.os.Message"> </parameter> </method> +<method name="restorePicture" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="b" type="android.os.Bundle"> +</parameter> +<parameter name="src" type="java.io.File"> +</parameter> +</method> <method name="restoreState" return="android.webkit.WebBackForwardList" abstract="false" @@ -121507,6 +142579,21 @@ <parameter name="password" type="java.lang.String"> </parameter> </method> +<method name="savePicture" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="b" type="android.os.Bundle"> +</parameter> +<parameter name="dest" type="java.io.File"> +</parameter> +</method> <method name="saveState" return="android.webkit.WebBackForwardList" abstract="false" @@ -121604,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" @@ -122417,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" @@ -122461,6 +143572,17 @@ visibility="public" > </method> +<method name="isFastScrollEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isInFilterMode" return="boolean" abstract="false" @@ -122483,6 +143605,17 @@ visibility="public" > </method> +<method name="isSmoothScrollbarEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isStackFromBottom" return="boolean" abstract="false" @@ -122665,6 +143798,19 @@ <parameter name="onTop" type="boolean"> </parameter> </method> +<method name="setFastScrollEnabled" + 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="setFilterText" return="void" abstract="false" @@ -122758,6 +143904,19 @@ <parameter name="sel" type="android.graphics.drawable.Drawable"> </parameter> </method> +<method name="setSmoothScrollbarEnabled" + 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="setStackFromBottom" return="void" abstract="false" @@ -123041,6 +144200,17 @@ <parameter name="defStyle" type="int"> </parameter> </constructor> +<method name="getKeyProgressIncrement" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getThumbOffset" return="int" abstract="false" @@ -123052,6 +144222,19 @@ visibility="public" > </method> +<method name="setKeyProgressIncrement" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="increment" type="int"> +</parameter> +</method> <method name="setThumb" return="void" abstract="false" @@ -123231,7 +144414,7 @@ abstract="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <constructor name="AbsoluteLayout" @@ -124053,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" @@ -124378,6 +145681,19 @@ <parameter name="notifyOnChange" type="boolean"> </parameter> </method> +<method name="sort" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="comparator" type="java.util.Comparator<? super T>"> +</parameter> +</method> </class> <class name="AutoCompleteTextView" extends="android.widget.EditText" @@ -124425,6 +145741,17 @@ <parameter name="defStyle" type="int"> </parameter> </constructor> +<method name="clearListSelection" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="convertSelectionToString" return="java.lang.CharSequence" abstract="false" @@ -124471,6 +145798,28 @@ visibility="public" > </method> +<method name="getDropDownAnchor" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDropDownWidth" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getFilter" return="android.widget.Filter" abstract="false" @@ -124489,7 +145838,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -124500,6 +145849,39 @@ synchronized="false" static="false" final="false" + deprecated="deprecated" + visibility="public" +> +</method> +<method name="getListSelection" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getOnItemClickListener" + return="android.widget.AdapterView.OnItemClickListener" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getOnItemSelectedListener" + return="android.widget.AdapterView.OnItemSelectedListener" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" deprecated="not deprecated" visibility="public" > @@ -124526,6 +145908,17 @@ visibility="public" > </method> +<method name="isPerformingCompletion" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isPopupShowing" return="boolean" abstract="false" @@ -124626,6 +146019,45 @@ <parameter name="hint" type="java.lang.CharSequence"> </parameter> </method> +<method name="setDropDownAnchor" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +</method> +<method name="setDropDownWidth" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="width" type="int"> +</parameter> +</method> +<method name="setListSelection" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="position" type="int"> +</parameter> +</method> <method name="setOnItemClickListener" return="void" abstract="false" @@ -125330,6 +146762,17 @@ visibility="public" > </method> +<method name="getOnChronometerTickListener" + return="android.widget.Chronometer.OnChronometerTickListener" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="setBase" return="void" abstract="false" @@ -125356,6 +146799,19 @@ <parameter name="format" type="java.lang.String"> </parameter> </method> +<method name="setOnChronometerTickListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="android.widget.Chronometer.OnChronometerTickListener"> +</parameter> +</method> <method name="start" return="void" abstract="false" @@ -125379,6 +146835,27 @@ > </method> </class> +<interface name="Chronometer.OnChronometerTickListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onChronometerTick" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="chronometer" type="android.widget.Chronometer"> +</parameter> +</method> +</interface> <class name="CompoundButton" extends="android.widget.Button" abstract="true" @@ -125740,6 +147217,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" @@ -128364,6 +149852,17 @@ visibility="public" > </field> +<field name="STRETCH_SPACING_UNIFORM" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="HeaderViewListAdapter" extends="java.lang.Object" @@ -128612,6 +150111,218 @@ </parameter> </method> </class> +<class name="HorizontalScrollView" + extends="android.widget.FrameLayout" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="HorizontalScrollView" + type="android.widget.HorizontalScrollView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +</constructor> +<constructor name="HorizontalScrollView" + type="android.widget.HorizontalScrollView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +</constructor> +<constructor name="HorizontalScrollView" + type="android.widget.HorizontalScrollView" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +<parameter name="defStyle" type="int"> +</parameter> +</constructor> +<method name="arrowScroll" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="direction" type="int"> +</parameter> +</method> +<method name="computeScrollDeltaToGetChildRectOnScreen" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="rect" type="android.graphics.Rect"> +</parameter> +</method> +<method name="executeKeyEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +<method name="fling" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="velocityX" type="int"> +</parameter> +</method> +<method name="fullScroll" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="direction" type="int"> +</parameter> +</method> +<method name="getMaxScrollAmount" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isFillViewport" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isSmoothScrollingEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="pageScroll" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="direction" type="int"> +</parameter> +</method> +<method name="setFillViewport" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fillViewport" type="boolean"> +</parameter> +</method> +<method name="setSmoothScrollingEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="smoothScrollingEnabled" type="boolean"> +</parameter> +</method> +<method name="smoothScrollBy" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dx" type="int"> +</parameter> +<parameter name="dy" type="int"> +</parameter> +</method> +<method name="smoothScrollTo" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="x" type="int"> +</parameter> +<parameter name="y" type="int"> +</parameter> +</method> +</class> <class name="ImageButton" extends="android.widget.ImageView" abstract="false" @@ -129752,6 +151463,32 @@ <parameter name="height" type="int"> </parameter> </method> +<method name="setFooterDividersEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="footerDividersEnabled" type="boolean"> +</parameter> +</method> +<method name="setHeaderDividersEnabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="headerDividersEnabled" type="boolean"> +</parameter> +</method> <method name="setItemChecked" return="void" abstract="false" @@ -130477,6 +152214,30 @@ visibility="public" > </method> +<method name="getInputMethodMode" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getMaxAvailableHeight" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="anchor" type="android.view.View"> +</parameter> +</method> <method name="getMaxAvailableHeight" return="int" abstract="false" @@ -130489,6 +152250,8 @@ > <parameter name="anchor" type="android.view.View"> </parameter> +<parameter name="yOffset" type="int"> +</parameter> </method> <method name="getWidth" return="int" @@ -130501,6 +152264,28 @@ visibility="public" > </method> +<method name="isAboveAnchor" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isClippingEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isFocusable" return="boolean" abstract="false" @@ -130512,6 +152297,17 @@ visibility="public" > </method> +<method name="isOutsideTouchable" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="isShowing" return="boolean" abstract="false" @@ -130523,6 +152319,17 @@ visibility="public" > </method> +<method name="isTouchable" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="setAnimationStyle" return="void" abstract="false" @@ -130549,6 +152356,19 @@ <parameter name="background" type="android.graphics.drawable.Drawable"> </parameter> </method> +<method name="setClippingEnabled" + 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="setContentView" return="void" abstract="false" @@ -130599,6 +152419,19 @@ visibility="public" > </method> +<method name="setInputMethodMode" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mode" type="int"> +</parameter> +</method> <method name="setOnDismissListener" return="void" abstract="false" @@ -130612,6 +152445,45 @@ <parameter name="onDismissListener" type="android.widget.PopupWindow.OnDismissListener"> </parameter> </method> +<method name="setOutsideTouchable" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="touchable" type="boolean"> +</parameter> +</method> +<method name="setTouchInterceptor" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="l" type="android.view.View.OnTouchListener"> +</parameter> +</method> +<method name="setTouchable" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="touchable" type="boolean"> +</parameter> +</method> <method name="setWidth" return="void" abstract="false" @@ -130625,6 +152497,21 @@ <parameter name="width" type="int"> </parameter> </method> +<method name="setWindowLayoutMode" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="widthSpec" type="int"> +</parameter> +<parameter name="heightSpec" type="int"> +</parameter> +</method> <method name="showAsDropDown" return="void" abstract="false" @@ -130684,6 +152571,17 @@ deprecated="not deprecated" visibility="public" > +</method> +<method name="update" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="x" type="int"> </parameter> <parameter name="y" type="int"> @@ -130703,6 +152601,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"> @@ -130731,13 +152650,46 @@ <parameter name="height" type="int"> </parameter> </method> +<field name="INPUT_METHOD_FROM_FOCUSABLE" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INPUT_METHOD_NEEDED" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INPUT_METHOD_NOT_NEEDED" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <interface name="PopupWindow.OnDismissListener" abstract="true" static="true" final="false" deprecated="not deprecated" - visibility="" + visibility="public" > <method name="onDismiss" return="void" @@ -130898,6 +152850,30 @@ visibility="public" > </method> +<method name="onRestoreInstanceState" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="state" type="android.os.Parcelable"> +</parameter> +</method> +<method name="onSaveInstanceState" + return="android.os.Parcelable" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="setIndeterminate" return="void" abstract="false" @@ -131405,7 +153381,7 @@ </parameter> <parameter name="rating" type="float"> </parameter> -<parameter name="fromTouch" type="boolean"> +<parameter name="fromUser" type="boolean"> </parameter> </method> </interface> @@ -131939,6 +153915,91 @@ <parameter name="v" type="android.view.View"> </parameter> </method> +<method name="setBitmap" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="android.graphics.Bitmap"> +</parameter> +</method> +<method name="setBoolean" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="boolean"> +</parameter> +</method> +<method name="setByte" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="byte"> +</parameter> +</method> +<method name="setChar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="char"> +</parameter> +</method> +<method name="setCharSequence" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="java.lang.CharSequence"> +</parameter> +</method> <method name="setChronometer" return="void" abstract="false" @@ -131955,7 +154016,56 @@ </parameter> <parameter name="format" type="java.lang.String"> </parameter> -<parameter name="running" type="boolean"> +<parameter name="started" type="boolean"> +</parameter> +</method> +<method name="setDouble" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="double"> +</parameter> +</method> +<method name="setFloat" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="float"> +</parameter> +</method> +<method name="setImageViewBitmap" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="bitmap" type="android.graphics.Bitmap"> </parameter> </method> <method name="setImageViewResource" @@ -131988,6 +154098,55 @@ <parameter name="uri" type="android.net.Uri"> </parameter> </method> +<method name="setInt" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="int"> +</parameter> +</method> +<method name="setLong" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="long"> +</parameter> +</method> +<method name="setOnClickPendingIntent" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="pendingIntent" type="android.app.PendingIntent"> +</parameter> +</method> <method name="setProgressBar" return="void" abstract="false" @@ -132007,6 +154166,55 @@ <parameter name="indeterminate" type="boolean"> </parameter> </method> +<method name="setShort" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="short"> +</parameter> +</method> +<method name="setString" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="java.lang.String"> +</parameter> +</method> +<method name="setTextColor" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="color" type="int"> +</parameter> +</method> <method name="setTextViewText" return="void" abstract="false" @@ -132022,6 +154230,23 @@ <parameter name="text" type="java.lang.CharSequence"> </parameter> </method> +<method name="setUri" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="viewId" type="int"> +</parameter> +<parameter name="methodName" type="java.lang.String"> +</parameter> +<parameter name="value" type="android.net.Uri"> +</parameter> +</method> <method name="setViewVisibility" return="void" abstract="false" @@ -132078,6 +154303,16 @@ deprecated="not deprecated" visibility="public" > +<parameter name="ex" type="java.lang.Exception"> +</parameter> +</constructor> +<constructor name="RemoteViews.ActionException" + type="android.widget.RemoteViews.ActionException" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="message" type="java.lang.String"> </parameter> </constructor> @@ -132115,6 +154350,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" @@ -132145,6 +154396,19 @@ <parameter name="dropDownLayout" type="int"> </parameter> </method> +<method name="setViewResource" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="layout" type="int"> +</parameter> +</method> </class> <class name="ResourceCursorTreeAdapter" extends="android.widget.CursorTreeAdapter" @@ -132619,6 +154883,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" @@ -132708,6 +154994,51 @@ > </method> </class> +<interface name="SectionIndexer" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="getPositionForSection" + return="int" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="section" type="int"> +</parameter> +</method> +<method name="getSectionForPosition" + return="int" + abstract="true" + 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="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</interface> <class name="SeekBar" extends="android.widget.AbsSeekBar" abstract="false" @@ -132787,7 +155118,7 @@ </parameter> <parameter name="progress" type="int"> </parameter> -<parameter name="fromTouch" type="boolean"> +<parameter name="fromUser" type="boolean"> </parameter> </method> <method name="onStartTrackingTouch" @@ -133061,6 +155392,23 @@ <parameter name="cursor" type="android.database.Cursor"> </parameter> </method> +<method name="changeCursorAndColumns" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="c" type="android.database.Cursor"> +</parameter> +<parameter name="from" type="java.lang.String[]"> +</parameter> +<parameter name="to" type="int[]"> +</parameter> +</method> <method name="getCursorToStringConverter" return="android.widget.SimpleCursorAdapter.CursorToStringConverter" abstract="false" @@ -133619,6 +155967,323 @@ </parameter> </method> </class> +<class name="SlidingDrawer" + extends="android.view.ViewGroup" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="SlidingDrawer" + type="android.widget.SlidingDrawer" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +</constructor> +<constructor name="SlidingDrawer" + type="android.widget.SlidingDrawer" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="attrs" type="android.util.AttributeSet"> +</parameter> +<parameter name="defStyle" type="int"> +</parameter> +</constructor> +<method name="animateClose" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="animateOpen" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="animateToggle" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="close" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getContent" + return="android.view.View" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getHandle" + return="android.view.View" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isMoving" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isOpened" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="lock" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onLayout" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="changed" type="boolean"> +</parameter> +<parameter name="l" type="int"> +</parameter> +<parameter name="t" type="int"> +</parameter> +<parameter name="r" type="int"> +</parameter> +<parameter name="b" type="int"> +</parameter> +</method> +<method name="open" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setOnDrawerCloseListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="onDrawerCloseListener" type="android.widget.SlidingDrawer.OnDrawerCloseListener"> +</parameter> +</method> +<method name="setOnDrawerOpenListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="onDrawerOpenListener" type="android.widget.SlidingDrawer.OnDrawerOpenListener"> +</parameter> +</method> +<method name="setOnDrawerScrollListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="onDrawerScrollListener" type="android.widget.SlidingDrawer.OnDrawerScrollListener"> +</parameter> +</method> +<method name="toggle" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="unlock" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<field name="ORIENTATION_HORIZONTAL" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ORIENTATION_VERTICAL" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<interface name="SlidingDrawer.OnDrawerCloseListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onDrawerClosed" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</interface> +<interface name="SlidingDrawer.OnDrawerOpenListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onDrawerOpened" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</interface> +<interface name="SlidingDrawer.OnDrawerScrollListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onScrollEnded" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onScrollStarted" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</interface> <class name="Spinner" extends="android.widget.AbsSpinner" abstract="false" @@ -134720,6 +157385,41 @@ <parameter name="end" type="int"> </parameter> </method> +<method name="beginBatchEdit" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="bringPointIntoView" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="offset" type="int"> +</parameter> +</method> +<method name="clearComposingText" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="debug" return="void" abstract="false" @@ -134733,6 +157433,43 @@ <parameter name="depth" type="int"> </parameter> </method> +<method name="didTouchFocusSelect" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="endBatchEdit" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="extractText" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="request" type="android.view.inputmethod.ExtractedTextRequest"> +</parameter> +<parameter name="outText" type="android.view.inputmethod.ExtractedText"> +</parameter> +</method> <method name="getAutoLinkMask" return="int" abstract="false" @@ -134854,6 +157591,17 @@ visibility="protected" > </method> +<method name="getEditableText" + return="android.text.Editable" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getEllipsize" return="android.text.TextUtils.TruncateAt" abstract="false" @@ -134953,6 +157701,63 @@ visibility="public" > </method> +<method name="getImeActionId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getImeActionLabel" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getImeOptions" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInputExtras" + return="android.os.Bundle" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="create" type="boolean"> +</parameter> +</method> +<method name="getInputType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getKeyListener" return="android.text.method.KeyListener" abstract="false" @@ -135067,6 +157872,17 @@ visibility="public" > </method> +<method name="getPrivateImeOptions" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getSelectionEnd" return="int" abstract="false" @@ -135253,6 +158069,17 @@ visibility="public" > </method> +<method name="isInputMethodTarget" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="length" return="int" abstract="false" @@ -135264,6 +158091,65 @@ visibility="public" > </method> +<method name="moveCursorToVisibleOffset" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onBeginBatchEdit" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="onCommitCompletion" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.view.inputmethod.CompletionInfo"> +</parameter> +</method> +<method name="onEditorAction" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="actionCode" type="int"> +</parameter> +</method> +<method name="onEndBatchEdit" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="onPreDraw" return="boolean" abstract="false" @@ -135275,6 +158161,21 @@ visibility="public" > </method> +<method name="onPrivateIMECommand" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="action" type="java.lang.String"> +</parameter> +<parameter name="data" type="android.os.Bundle"> +</parameter> +</method> <method name="onRestoreInstanceState" return="void" abstract="false" @@ -135299,6 +158200,21 @@ visibility="public" > </method> +<method name="onSelectionChanged" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="selStart" type="int"> +</parameter> +<parameter name="selEnd" type="int"> +</parameter> +</method> <method name="onTextChanged" return="void" abstract="false" @@ -135318,6 +158234,19 @@ <parameter name="after" type="int"> </parameter> </method> +<method name="onTextContextMenuItem" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +</method> <method name="removeTextChangedListener" return="void" abstract="false" @@ -135386,6 +158315,25 @@ deprecated="not deprecated" visibility="public" > +<parameter name="left" type="int"> +</parameter> +<parameter name="top" type="int"> +</parameter> +<parameter name="right" type="int"> +</parameter> +<parameter name="bottom" type="int"> +</parameter> +</method> +<method name="setCompoundDrawablesWithIntrinsicBounds" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="left" type="android.graphics.drawable.Drawable"> </parameter> <parameter name="top" type="android.graphics.drawable.Drawable"> @@ -135475,6 +158423,19 @@ <parameter name="icon" type="android.graphics.drawable.Drawable"> </parameter> </method> +<method name="setExtractedText" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="text" type="android.view.inputmethod.ExtractedText"> +</parameter> +</method> <method name="setFilters" return="void" abstract="false" @@ -135624,6 +158585,34 @@ <parameter name="whether" type="boolean"> </parameter> </method> +<method name="setImeActionLabel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="label" type="java.lang.CharSequence"> +</parameter> +<parameter name="actionId" type="int"> +</parameter> +</method> +<method name="setImeOptions" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="imeOptions" type="int"> +</parameter> +</method> <method name="setIncludeFontPadding" return="void" abstract="false" @@ -135637,6 +158626,36 @@ <parameter name="includepad" type="boolean"> </parameter> </method> +<method name="setInputExtras" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="xmlResId" type="int"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException"> +</exception> +</method> +<method name="setInputType" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="type" type="int"> +</parameter> +</method> <method name="setKeyListener" return="void" abstract="false" @@ -135847,6 +158866,19 @@ <parameter name="movement" type="android.text.method.MovementMethod"> </parameter> </method> +<method name="setOnEditorActionListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="l" type="android.widget.TextView.OnEditorActionListener"> +</parameter> +</method> <method name="setPaintFlags" return="void" abstract="false" @@ -135860,6 +158892,32 @@ <parameter name="flags" type="int"> </parameter> </method> +<method name="setPrivateImeOptions" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="type" type="java.lang.String"> +</parameter> +</method> +<method name="setRawInputType" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="type" type="int"> +</parameter> +</method> <method name="setScroller" return="void" abstract="false" @@ -136213,6 +159271,31 @@ > </method> </class> +<interface name="TextView.OnEditorActionListener" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="onEditorAction" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="v" type="android.widget.TextView"> +</parameter> +<parameter name="actionId" type="int"> +</parameter> +<parameter name="event" type="android.view.KeyEvent"> +</parameter> +</method> +</interface> <class name="TextView.SavedState" extends="android.view.View.BaseSavedState" abstract="false" @@ -140496,6 +163579,31 @@ </parameter> </constructor> </class> +<class name="DexClassLoader" + extends="java.lang.ClassLoader" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="DexClassLoader" + type="dalvik.system.DexClassLoader" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dexPath" type="java.lang.String"> +</parameter> +<parameter name="dexOutputDir" type="java.lang.String"> +</parameter> +<parameter name="libPath" type="java.lang.String"> +</parameter> +<parameter name="parent" type="java.lang.ClassLoader"> +</parameter> +</constructor> +</class> <class name="DexFile" extends="java.lang.Object" abstract="false" @@ -140595,6 +163703,25 @@ <parameter name="loader" type="java.lang.ClassLoader"> </parameter> </method> +<method name="loadDex" + return="dalvik.system.DexFile" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="sourcePathName" type="java.lang.String"> +</parameter> +<parameter name="outputPathName" type="java.lang.String"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +</method> </class> <class name="PathClassLoader" extends="java.lang.ClassLoader" @@ -140779,6 +163906,21 @@ deprecated="not deprecated" visibility="public" > +<method name="dumpHprofData" + return="void" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fileName" type="java.lang.String"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +</method> <method name="getAllocCount" return="int" abstract="false" @@ -140827,6 +163969,17 @@ visibility="public" > </method> +<method name="isDebuggingEnabled" + return="boolean" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="lastDebuggerActivity" return="long" abstract="false" @@ -141452,6 +164605,27 @@ </parameter> <parameter name="gids" type="int[]"> </parameter> +<parameter name="debugFlags" type="int"> +</parameter> +<parameter name="rlimits" type="int[][]"> +</parameter> +</method> +<method name="forkAndSpecialize" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +<parameter name="gid" type="int"> +</parameter> +<parameter name="gids" type="int[]"> +</parameter> <parameter name="enableDebugger" type="boolean"> </parameter> <parameter name="rlimits" type="int[][]"> @@ -141473,11 +164647,65 @@ </parameter> <parameter name="gids" type="int[]"> </parameter> +<parameter name="debugFlags" type="int"> +</parameter> +<parameter name="rlimits" type="int[][]"> +</parameter> +</method> +<method name="forkSystemServer" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +<parameter name="gid" type="int"> +</parameter> +<parameter name="gids" type="int[]"> +</parameter> <parameter name="enableDebugger" type="boolean"> </parameter> <parameter name="rlimits" type="int[][]"> </parameter> </method> +<field name="DEBUG_ENABLE_ASSERT" + type="int" + transient="false" + volatile="false" + value="4" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DEBUG_ENABLE_CHECKJNI" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="DEBUG_ENABLE_DEBUGGER" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> </package> <package name="java.awt.font" @@ -142352,6 +165580,434 @@ </field> </class> </package> +<package name="java.beans" +> +<class name="IndexedPropertyChangeEvent" + extends="java.beans.PropertyChangeEvent" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="IndexedPropertyChangeEvent" + type="java.beans.IndexedPropertyChangeEvent" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="source" type="java.lang.Object"> +</parameter> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="oldValue" type="java.lang.Object"> +</parameter> +<parameter name="newValue" type="java.lang.Object"> +</parameter> +<parameter name="index" type="int"> +</parameter> +</constructor> +<method name="getIndex" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> +<class name="PropertyChangeEvent" + extends="java.util.EventObject" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="PropertyChangeEvent" + type="java.beans.PropertyChangeEvent" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="source" type="java.lang.Object"> +</parameter> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="oldValue" type="java.lang.Object"> +</parameter> +<parameter name="newValue" type="java.lang.Object"> +</parameter> +</constructor> +<method name="getNewValue" + return="java.lang.Object" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getOldValue" + return="java.lang.Object" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPropagationId" + return="java.lang.Object" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getPropertyName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="setPropagationId" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propagationId" type="java.lang.Object"> +</parameter> +</method> +</class> +<interface name="PropertyChangeListener" + abstract="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="java.util.EventListener"> +</implements> +<method name="propertyChange" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="java.beans.PropertyChangeEvent"> +</parameter> +</method> +</interface> +<class name="PropertyChangeListenerProxy" + extends="java.util.EventListenerProxy" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="java.beans.PropertyChangeListener"> +</implements> +<constructor name="PropertyChangeListenerProxy" + type="java.beans.PropertyChangeListenerProxy" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</constructor> +<method name="getPropertyName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="propertyChange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="java.beans.PropertyChangeEvent"> +</parameter> +</method> +</class> +<class name="PropertyChangeSupport" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<implements name="java.io.Serializable"> +</implements> +<constructor name="PropertyChangeSupport" + type="java.beans.PropertyChangeSupport" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="sourceBean" type="java.lang.Object"> +</parameter> +</constructor> +<method name="addPropertyChangeListener" + return="void" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</method> +<method name="addPropertyChangeListener" + return="void" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</method> +<method name="fireIndexedPropertyChange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="index" type="int"> +</parameter> +<parameter name="oldValue" type="java.lang.Object"> +</parameter> +<parameter name="newValue" type="java.lang.Object"> +</parameter> +</method> +<method name="fireIndexedPropertyChange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="index" type="int"> +</parameter> +<parameter name="oldValue" type="boolean"> +</parameter> +<parameter name="newValue" type="boolean"> +</parameter> +</method> +<method name="fireIndexedPropertyChange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="index" type="int"> +</parameter> +<parameter name="oldValue" type="int"> +</parameter> +<parameter name="newValue" type="int"> +</parameter> +</method> +<method name="firePropertyChange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="oldValue" type="java.lang.Object"> +</parameter> +<parameter name="newValue" type="java.lang.Object"> +</parameter> +</method> +<method name="firePropertyChange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="oldValue" type="boolean"> +</parameter> +<parameter name="newValue" type="boolean"> +</parameter> +</method> +<method name="firePropertyChange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="oldValue" type="int"> +</parameter> +<parameter name="newValue" type="int"> +</parameter> +</method> +<method name="firePropertyChange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="java.beans.PropertyChangeEvent"> +</parameter> +</method> +<method name="getPropertyChangeListeners" + return="java.beans.PropertyChangeListener[]" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +</method> +<method name="getPropertyChangeListeners" + return="java.beans.PropertyChangeListener[]" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="hasListeners" + return="boolean" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +</method> +<method name="removePropertyChangeListener" + return="void" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="propertyName" type="java.lang.String"> +</parameter> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</method> +<method name="removePropertyChangeListener" + return="void" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</method> +</class> +</package> <package name="java.io" > <class name="BufferedInputStream" @@ -143761,7 +167417,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="oneByte" type="int"> +<parameter name="val" type="int"> </parameter> <exception name="IOException" type="java.io.IOException"> </exception> @@ -149830,7 +173486,7 @@ return="java.nio.channels.FileChannel" abstract="false" native="false" - synchronized="true" + synchronized="false" static="false" final="true" deprecated="not deprecated" @@ -154253,7 +177909,7 @@ native="false" synchronized="false" static="true" - final="false" + final="true" deprecated="not deprecated" visibility="public" > @@ -156253,7 +179909,7 @@ <method name="newInstance" return="T" abstract="false" - native="true" + native="false" synchronized="false" static="false" final="false" @@ -159394,9 +183050,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="d1" type="double"> +<parameter name="x" type="double"> </parameter> -<parameter name="d2" type="double"> +<parameter name="y" type="double"> </parameter> </method> <method name="abs" @@ -159500,9 +183156,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="d1" type="double"> +<parameter name="y" type="double"> </parameter> -<parameter name="d2" type="double"> +<parameter name="x" type="double"> </parameter> </method> <method name="cbrt" @@ -159780,9 +183436,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="d1" type="double"> +<parameter name="x" type="double"> </parameter> -<parameter name="d2" type="double"> +<parameter name="y" type="double"> </parameter> </method> <method name="random" @@ -160434,7 +184090,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="time" type="long"> +<parameter name="millis" type="long"> </parameter> <exception name="InterruptedException" type="java.lang.InterruptedException"> </exception> @@ -160449,9 +184105,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="time" type="long"> +<parameter name="millis" type="long"> </parameter> -<parameter name="frac" type="int"> +<parameter name="nanos" type="int"> </parameter> <exception name="InterruptedException" type="java.lang.InterruptedException"> </exception> @@ -162345,9 +186001,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="d1" type="double"> +<parameter name="x" type="double"> </parameter> -<parameter name="d2" type="double"> +<parameter name="y" type="double"> </parameter> </method> <method name="abs" @@ -162451,9 +186107,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="d1" type="double"> +<parameter name="y" type="double"> </parameter> -<parameter name="d2" type="double"> +<parameter name="x" type="double"> </parameter> </method> <method name="cbrt" @@ -162731,9 +186387,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="d1" type="double"> +<parameter name="x" type="double"> </parameter> -<parameter name="d2" type="double"> +<parameter name="y" type="double"> </parameter> </method> <method name="random" @@ -165013,13 +188669,13 @@ deprecated="not deprecated" visibility="public" > -<parameter name="source" type="java.lang.Object"> +<parameter name="src" type="java.lang.Object"> </parameter> -<parameter name="sourceIndex" type="int"> +<parameter name="srcPos" type="int"> </parameter> -<parameter name="destination" type="java.lang.Object"> +<parameter name="dest" type="java.lang.Object"> </parameter> -<parameter name="destinationIndex" type="int"> +<parameter name="destPos" type="int"> </parameter> <parameter name="length" type="int"> </parameter> @@ -165132,7 +188788,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="var" type="java.lang.String"> +<parameter name="name" type="java.lang.String"> </parameter> </method> <method name="getenv" @@ -165888,7 +189544,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="time" type="long"> +<parameter name="millis" type="long"> </parameter> <parameter name="nanos" type="int"> </parameter> @@ -171361,7 +195017,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="rM" type="int"> +<parameter name="mode" type="int"> </parameter> </method> <method name="values" @@ -186366,7 +210022,7 @@ deprecated="not deprecated" visibility="protected" > -<parameter name="keyFacSpi" type="java.security.AlgorithmParametersSpi"> +<parameter name="algPramSpi" type="java.security.AlgorithmParametersSpi"> </parameter> <parameter name="provider" type="java.security.Provider"> </parameter> @@ -189144,7 +212800,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="alise" type="java.lang.String"> +<parameter name="alias" type="java.lang.String"> </parameter> <exception name="KeyStoreException" type="java.security.KeyStoreException"> </exception> @@ -237887,6 +261543,19 @@ deprecated="not deprecated" visibility="public" > +<method name="addPropertyChangeListener" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</method> <method name="pack" return="void" abstract="true" @@ -237932,6 +261601,19 @@ visibility="public" > </method> +<method name="removePropertyChangeListener" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</method> <field name="CLASS_ATTRIBUTE_PFX" type="java.lang.String" transient="false" @@ -238149,6 +261831,19 @@ deprecated="not deprecated" visibility="public" > +<method name="addPropertyChangeListener" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</method> <method name="properties" return="java.util.SortedMap<java.lang.String, java.lang.String>" abstract="true" @@ -238160,6 +261855,19 @@ visibility="public" > </method> +<method name="removePropertyChangeListener" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="listener" type="java.beans.PropertyChangeListener"> +</parameter> +</method> <method name="unpack" return="void" abstract="true" @@ -238831,12 +262539,14 @@ native="false" synchronized="false" static="true" - final="true" + final="false" deprecated="not deprecated" visibility="public" > <parameter name="name" type="java.lang.String"> </parameter> +<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException"> +</exception> </method> <method name="toString" return="java.lang.String" @@ -238969,6 +262679,19 @@ <parameter name="logger" type="java.util.logging.Logger"> </parameter> </method> +<method name="addPropertyChangeListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="l" type="java.beans.PropertyChangeListener"> +</parameter> +</method> <method name="checkAccess" return="void" abstract="false" @@ -239015,6 +262738,17 @@ visibility="public" > </method> +<method name="getLoggingMXBean" + return="java.util.logging.LoggingMXBean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getProperty" return="java.lang.String" abstract="false" @@ -239056,6 +262790,19 @@ <exception name="IOException" type="java.io.IOException"> </exception> </method> +<method name="removePropertyChangeListener" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="l" type="java.beans.PropertyChangeListener"> +</parameter> +</method> <method name="reset" return="void" abstract="false" @@ -269059,7 +292806,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> </method> <method name="debug" @@ -269072,9 +292819,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> -<parameter name="t" type="java.lang.Throwable"> +<parameter name="arg1" type="java.lang.Throwable"> </parameter> </method> <method name="error" @@ -269087,7 +292834,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> </method> <method name="error" @@ -269100,9 +292847,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> -<parameter name="t" type="java.lang.Throwable"> +<parameter name="arg1" type="java.lang.Throwable"> </parameter> </method> <method name="fatal" @@ -269115,7 +292862,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> </method> <method name="fatal" @@ -269128,9 +292875,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> -<parameter name="t" type="java.lang.Throwable"> +<parameter name="arg1" type="java.lang.Throwable"> </parameter> </method> <method name="info" @@ -269143,7 +292890,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> </method> <method name="info" @@ -269156,9 +292903,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> -<parameter name="t" type="java.lang.Throwable"> +<parameter name="arg1" type="java.lang.Throwable"> </parameter> </method> <method name="isDebugEnabled" @@ -269237,7 +292984,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> </method> <method name="trace" @@ -269250,9 +292997,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> -<parameter name="t" type="java.lang.Throwable"> +<parameter name="arg1" type="java.lang.Throwable"> </parameter> </method> <method name="warn" @@ -269265,7 +293012,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> </method> <method name="warn" @@ -269278,9 +293025,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="message" type="java.lang.Object"> +<parameter name="arg0" type="java.lang.Object"> </parameter> -<parameter name="t" type="java.lang.Throwable"> +<parameter name="arg1" type="java.lang.Throwable"> </parameter> </method> </interface> diff --git a/api/current.xml b/api/current.xml index a6414b5..b608fbf 100644 --- a/api/current.xml +++ b/api/current.xml @@ -27950,6 +27950,17 @@ visibility="public" > </field> +<field name="ACTION_INPUT_METHOD_CHANGED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.INPUT_METHOD_CHANGED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_INSERT" type="java.lang.String" transient="false" @@ -36684,6 +36695,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" @@ -60577,6 +60605,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" @@ -60739,6 +60778,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" @@ -67499,6 +67551,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" @@ -73325,7 +73388,7 @@ visibility="public" > </field> -<field name="RENDERMODE_CONTUOUSLY" +<field name="RENDERMODE_CONTINUOUSLY" type="int" transient="false" volatile="false" @@ -78402,6 +78465,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" @@ -88545,6 +88619,17 @@ visibility="public" > </field> +<field name="NUMBER_OF_SONGS_FOR_ARTIST" + type="java.lang.String" + transient="false" + volatile="false" + value=""numsongs_by_artist"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </interface> <class name="MediaStore.Audio.Albums" extends="java.lang.Object" @@ -91227,6 +91312,17 @@ visibility="public" > </field> +<field name="BACKGROUND_DATA" + type="java.lang.String" + transient="false" + volatile="false" + value=""background_data"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="BLUETOOTH_ON" type="java.lang.String" transient="false" @@ -91424,6 +91520,28 @@ visibility="public" > </field> +<field name="WIFI_MAX_DHCP_RETRY_COUNT" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_max_dhcp_retry_count"" + 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=""wifi_mobile_data_transition_wakelock_timeout_ms"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON" type="java.lang.String" transient="false" @@ -91589,6 +91707,17 @@ visibility="public" > </field> +<field name="WIFI_WATCHDOG_WATCH_LIST" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_watchdog_watch_list"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="Settings.SettingNotFoundException" extends="android.util.AndroidException" @@ -92714,6 +92843,50 @@ visibility="public" > </field> +<field name="WIFI_SLEEP_POLICY" + type="java.lang.String" + transient="false" + volatile="false" + value=""wifi_sleep_policy"" + 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" @@ -95077,6 +95250,17 @@ <parameter name="events" type="int"> </parameter> </method> +<field name="ACTION_PHONE_STATE_CHANGED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.PHONE_STATE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="CALL_STATE_IDLE" type="int" transient="false" @@ -95198,6 +95382,58 @@ visibility="public" > </field> +<field name="EXTRA_INCOMING_NUMBER" + type="java.lang.String" + transient="false" + volatile="false" + value=""incoming_number"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_STATE" + type="java.lang.String" + transient="false" + volatile="false" + value=""state"" + 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" @@ -98018,6 +98254,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<T>"> +</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<T>"> +</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" @@ -119812,17 +120131,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" @@ -119944,198 +120252,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_PREVIOUSSONG" +<field name="KEYCODE_PERIOD" type="int" transient="false" volatile="false" - value="88" + value="56" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="KEYCODE_Q" +<field name="KEYCODE_PLUS" type="int" transient="false" volatile="false" - value="45" + value="81" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="KEYCODE_R" +<field name="KEYCODE_POUND" type="int" transient="false" volatile="false" - value="46" + value="18" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="KEYCODE_REWIND" +<field name="KEYCODE_POWER" type="int" transient="false" volatile="false" - value="89" + value="26" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_Q" + type="int" + transient="false" + volatile="false" + 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" @@ -120263,17 +120593,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" @@ -122794,7 +123113,7 @@ <method name="setOrientation" return="void" abstract="false" - native="true" + native="false" synchronized="false" static="true" final="false" @@ -127801,6 +128120,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" @@ -127889,6 +128219,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" @@ -128049,6 +128390,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" @@ -128156,6 +128512,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" @@ -130349,6 +130716,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" @@ -130434,6 +130814,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" @@ -130509,6 +130902,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" @@ -140206,6 +140618,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" @@ -141783,6 +142206,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" @@ -142279,6 +142713,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" @@ -143092,6 +143539,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" @@ -144800,6 +145258,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" @@ -146256,19 +146834,6 @@ <parameter name="listener" type="android.widget.Chronometer.OnChronometerTickListener"> </parameter> </method> -<method name="setStarted" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="started" type="boolean"> -</parameter> -</method> <method name="start" return="void" abstract="false" @@ -146674,6 +147239,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" @@ -152047,6 +152623,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"> @@ -153775,6 +154372,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" @@ -154292,6 +154905,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" diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java index b4c0e31..53c7935 100644 --- a/core/java/android/app/AlarmManager.java +++ b/core/java/android/app/AlarmManager.java @@ -29,6 +29,17 @@ import android.os.ServiceManager; * if it is not already running. Registered alarms are retained while the * device is asleep (and can optionally wake the device up if they go off * during that time), but will be cleared if it is turned off and rebooted. + * + * <p>The Alarm Manager holds a CPU wake lock as long as the alarm receiver's + * onReceive() method is executing. This guarantees that the phone will not sleep + * until you have finished handling the broadcast. Once onReceive() returns, the + * Alarm Manager releases this wake lock. This means that the phone will in some + * cases sleep as soon as your onReceive() method completes. If your alarm receiver + * called {@link android.content.Context#startService Context.startService()}, it + * is possible that the phone will sleep before the requested service is launched. + * To prevent this, your BroadcastReceiver and Service will need to implement a + * separate wake lock policy to ensure that the phone continues running until the + * service becomes available. * * <p><b>Note: The Alarm Manager is intended for cases where you want to have * your application code run at a specific time, even if your application is diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java index 021dc2e..20a579a 100644 --- a/core/java/android/app/AlertDialog.java +++ b/core/java/android/app/AlertDialog.java @@ -738,7 +738,10 @@ public class AlertDialog extends Dialog implements DialogInterface { * @return This Builder object to allow for chaining of calls to set * methods * - * @hide pending API review + * + * This is currently hidden because it seems like people should just + * be able to put padding around the view. + * @hide */ public Builder setView(View view, int viewSpacingLeft, int viewSpacingTop, int viewSpacingRight, int viewSpacingBottom) { diff --git a/core/java/android/app/ProgressDialog.java b/core/java/android/app/ProgressDialog.java index c87e398..bdea069 100644 --- a/core/java/android/app/ProgressDialog.java +++ b/core/java/android/app/ProgressDialog.java @@ -21,6 +21,9 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.style.StyleSpan; import android.view.LayoutInflater; import android.view.View; import android.widget.ProgressBar; @@ -52,6 +55,7 @@ public class ProgressDialog extends AlertDialog { private int mProgressStyle = STYLE_SPINNER; private TextView mProgressNumber; + private String mProgressNumberFormat; private TextView mProgressPercent; private NumberFormat mProgressPercentFormat; @@ -121,13 +125,18 @@ public class ProgressDialog extends AlertDialog { int progress = mProgress.getProgress(); int max = mProgress.getMax(); double percent = (double) progress / (double) max; - mProgressNumber.setText(progress + "/" + max); - mProgressPercent.setText(mProgressPercentFormat.format(percent)); + String format = mProgressNumberFormat; + mProgressNumber.setText(String.format(format, progress, max)); + SpannableString tmp = new SpannableString(mProgressPercentFormat.format(percent)); + tmp.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), + 0, tmp.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + mProgressPercent.setText(tmp); } }; View view = inflater.inflate(R.layout.alert_dialog_progress, null); mProgress = (ProgressBar) view.findViewById(R.id.progress); mProgressNumber = (TextView) view.findViewById(R.id.progress_number); + mProgressNumberFormat = "%d/%d"; mProgressPercent = (TextView) view.findViewById(R.id.progress_percent); mProgressPercentFormat = NumberFormat.getPercentInstance(); mProgressPercentFormat.setMaximumFractionDigits(0); @@ -293,6 +302,17 @@ public class ProgressDialog extends AlertDialog { mProgressStyle = style; } + /** + * Change the format of Progress Number. The default is "current/max". + * Should not be called during the number is progressing. + * @param format Should contain two "%d". The first is used for current number + * and the second is used for the maximum. + * @hide + */ + public void setProgressNumberFormat(String format) { + mProgressNumberFormat = format; + } + private void onProgressChanged() { if (mProgressStyle == STYLE_HORIZONTAL) { mViewUpdateHandler.sendEmptyMessage(0); diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index abf08cb..951b4b0 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -485,7 +485,8 @@ public class BluetoothDevice { * Get the major, minor and servics classes of a remote device. * These classes are encoded as a 32-bit integer. See BluetoothClass. * @param address remote device - * @return 32-bit class suitable for use with BluetoothClass. + * @return 32-bit class suitable for use with BluetoothClass, or + * BluetoothClass.ERROR on error */ public int getRemoteClass(String address) { try { diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java index a41627a..b391c57 100644 --- a/core/java/android/content/BroadcastReceiver.java +++ b/core/java/android/content/BroadcastReceiver.java @@ -44,14 +44,14 @@ import android.util.Log; * <ul> * <li> <b>Normal broadcasts</b> (sent with {@link Context#sendBroadcast(Intent) * Context.sendBroadcast}) are completely asynchronous. All receivers of the - * broadcast are run, in an undefined order, often at the same time. This is - * more efficient, but means that receivers can not use the result or abort + * broadcast are run in an undefined order, often at the same time. This is + * more efficient, but means that receivers cannot use the result or abort * APIs included here. * <li> <b>Ordered broadcasts</b> (sent with {@link Context#sendOrderedBroadcast(Intent, String) * Context.sendOrderedBroadcast}) are delivered to one receiver at a time. * As each receiver executes in turn, it can propagate a result to the next * receiver, or it can completely abort the broadcast so that it won't be passed - * to other receivers. The order receivers runs in can be controlled with the + * to other receivers. The order receivers run in can be controlled with the * {@link android.R.styleable#AndroidManifestIntentFilter_priority * android:priority} attribute of the matching intent-filter; receivers with * the same priority will be run in an arbitrary order. @@ -61,8 +61,8 @@ import android.util.Log; * situations revert to delivering the broadcast one receiver at a time. In * particular, for receivers that may require the creation of a process, only * one will be run at a time to avoid overloading the system with new processes. - * In this situation, however, the non-ordered semantics hold: these receivers - * can not return results or abort their broadcast.</p> + * In this situation, however, the non-ordered semantics hold: these receivers still + * cannot return results or abort their broadcast.</p> * * <p>Note that, although the Intent class is used for sending and receiving * these broadcasts, the Intent broadcast mechanism here is completely separate @@ -156,7 +156,7 @@ import android.util.Log; * more important processes. * * <p>This means that for longer-running operations you will often use - * an {@link android.app.Service} in conjunction with a BroadcastReceiver to keep + * a {@link android.app.Service} in conjunction with a BroadcastReceiver to keep * the containing process active for the entire time of your operation. */ public abstract class BroadcastReceiver { @@ -167,7 +167,7 @@ public abstract class BroadcastReceiver { * This method is called when the BroadcastReceiver is receiving an Intent * broadcast. During this time you can use the other methods on * BroadcastReceiver to view/modify the current result values. The function - * is normally called from the main thread of its process, so you should + * is normally called within the main thread of its process, so you should * never perform long-running operations in it (there is a timeout of * 10 seconds that the system allows before considering the receiver to * be blocked and a candidate to be killed). You cannot launch a popup dialog @@ -183,6 +183,14 @@ public abstract class BroadcastReceiver { * to interact with a service that is already running, you can use * {@link #peekService}. * + * <p>The Intent filters used in {@link android.content.Context#registerReceiver} + * and in application manifests are <em>not</em> guaranteed to be exclusive. They + * are hints to the operating system about how to find suitable recipients. It is + * possible for senders to force delivery to specific recipients, bypassing filter + * resolution. For this reason, {@link #onReceive(Context, Intent) onReceive()} + * implementations should respond only to known actions, ignoring any unexpected + * Intents that they may receive. + * * @param context The Context in which the receiver is running. * @param intent The Intent being received. */ diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 9a0dc9f..600dfa4 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -738,7 +738,7 @@ public abstract class Context { public abstract void removeStickyBroadcast(Intent intent); /** - * Register an BroadcastReceiver to be run in the main activity thread. The + * Register a BroadcastReceiver to be run in the main activity thread. The * <var>receiver</var> will be called with any broadcast Intent that * matches <var>filter</var>, in the main application thread. * @@ -762,11 +762,12 @@ public abstract class Context { * * <p>See {@link BroadcastReceiver} for more information on Intent broadcasts. * - * <p class="note">Note: this method <em>can not be called from an - * {@link BroadcastReceiver} component</em>. It is okay, however, to use - * this method from another BroadcastReceiver that has itself been registered with - * {@link #registerReceiver}, since the lifetime of such an BroadcastReceiver - * is tied to another object (the one that registered it).</p> + * <p class="note">Note: this method <em>cannot be called from a + * {@link BroadcastReceiver} component;</em> that is, from a BroadcastReceiver + * that is declared in an application's manifest. It is okay, however, to call + * this method from another BroadcastReceiver that has itself been registered + * at run time with {@link #registerReceiver}, since the lifetime of such a + * registered BroadcastReceiver is tied to the object that registered it.</p> * * @param receiver The BroadcastReceiver to handle the broadcast. * @param filter Selects the Intent broadcasts to be received. diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index d320c4b..f5397c4 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1428,7 +1428,6 @@ public class Intent implements Parcelable { /** * Broadcast Action: An input method has been changed. - * {@hide pending API Council approval} */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_INPUT_METHOD_CHANGED = @@ -2081,6 +2080,12 @@ public class Intent implements Parcelable { * android.intent.action.VIEW; an application's custom action would be * something like com.google.app.myapp.CUSTOM_ACTION. * + * <p><em>Note: scheme and host name matching in the Android framework is + * case-sensitive, unlike the formal RFC. As a result, + * you should always ensure that you write your Uri with these elements + * using lower case letters, and normalize any Uris you receive from + * outside of Android to ensure the scheme and host is lower case.</em></p> + * * @param action The Intent action, such as ACTION_VIEW. * @param uri The Intent data URI. */ @@ -2115,6 +2120,12 @@ public class Intent implements Parcelable { * construct the Intent and then calling {@link #setClass} to set its * class. * + * <p><em>Note: scheme and host name matching in the Android framework is + * case-sensitive, unlike the formal RFC. As a result, + * you should always ensure that you write your Uri with these elements + * using lower case letters, and normalize any Uris you receive from + * outside of Android to ensure the scheme and host is lower case.</em></p> + * * @param action The Intent action, such as ACTION_VIEW. * @param uri The Intent data URI. * @param packageContext A Context of the application package implementing @@ -3164,6 +3175,12 @@ public class Intent implements Parcelable { * Set the data this intent is operating on. This method automatically * clears any type that was previously set by {@link #setType}. * + * <p><em>Note: scheme and host name matching in the Android framework is + * case-sensitive, unlike the formal RFC. As a result, + * you should always ensure that you write your Uri with these elements + * using lower case letters, and normalize any Uris you receive from + * outside of Android to ensure the scheme and host is lower case.</em></p> + * * @param data The URI of the data this intent is now targeting. * * @return Returns the same Intent object, for chaining multiple calls @@ -3184,6 +3201,12 @@ public class Intent implements Parcelable { * only specify a type and not data, for example to indicate the type of * data to return. This method automatically clears any data that was * previously set by {@link #setData}. + * + * <p><em>Note: MIME type matching in the Android framework is + * case-sensitive, unlike formal RFC MIME types. As a result, + * you should always write your MIME types with lower case letters, + * and any MIME types you receive from outside of Android should be + * converted to lower case before supplying them here.</em></p> * * @param type The MIME type of the data being handled by this intent. * @@ -3206,6 +3229,13 @@ public class Intent implements Parcelable { * to override the MIME type that would ordinarily be inferred from the * data with your own type given here. * + * <p><em>Note: MIME type, Uri scheme, and host name matching in the + * Android framework is case-sensitive, unlike the formal RFC definitions. + * As a result, you should always write these elements with lower case letters, + * and normalize any MIME types or Uris you receive from + * outside of Android to ensure these elements are lower case before + * supplying them here.</em></p> + * * @param data The URI of the data this intent is now targeting. * @param type The MIME type of the data being handled by this intent. * diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index b151de5..9ba85b2 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -86,18 +86,27 @@ import com.android.internal.util.XmlUtils; * type is determined by calling {@link Intent#resolveType}. A wildcard can be * used for the MIME sub-type, in both the Intent and IntentFilter, so that the * type "audio/*" will match "audio/mpeg", "audio/aiff", "audio/*", etc. + * <em>Note that MIME type matching here is <b>case sensitive</b>, unlike + * formal RFC MIME types!</em> You should thus always use lower case letters + * for your MIME types. * * <p><strong>Data Scheme</strong> matches if any of the given values match the * Intent data's scheme. * The Intent scheme is determined by calling {@link Intent#getData} * and {@link android.net.Uri#getScheme} on that URI. + * <em>Note that scheme matching here is <b>case sensitive</b>, unlike + * formal RFC schemes!</em> You should thus always use lower case letters + * for your schemes. * * <p><strong>Data Authority</strong> matches if any of the given values match * the Intent's data authority <em>and</em> one of the data scheme's in the filter * has matched the Intent, <em>or</em> no authories were supplied in the filter. * The Intent authority is determined by calling * {@link Intent#getData} and {@link android.net.Uri#getAuthority} on that URI. - * + * <em>Note that authority matching here is <b>case sensitive</b>, unlike + * formal RFC host names!</em> You should thus always use lower case letters + * for your authority. + * * <p><strong>Data Path</strong> matches if any of the given values match the * Intent's data path <em>and</em> both a scheme and authority in the filter * has matched against the Intent, <em>or</em> no paths were supplied in the @@ -340,6 +349,12 @@ public class IntentFilter implements Parcelable { /** * New IntentFilter that matches a single action and data type. * + * <p><em>Note: MIME type matching in the Android framework is + * case-sensitive, unlike formal RFC MIME types. As a result, + * you should always write your MIME types with lower case letters, + * and any MIME types you receive from outside of Android should be + * converted to lower case before supplying them here.</em></p> + * * <p>Throws {@link MalformedMimeTypeException} if the given MIME type is * not syntactically correct. * @@ -478,6 +493,12 @@ public class IntentFilter implements Parcelable { * one of these types <em>or</em> a matching scheme. If no data types * are included, then an Intent will only match if it specifies no data. * + * <p><em>Note: MIME type matching in the Android framework is + * case-sensitive, unlike formal RFC MIME types. As a result, + * you should always write your MIME types with lower case letters, + * and any MIME types you receive from outside of Android should be + * converted to lower case before supplying them here.</em></p> + * * <p>Throws {@link MalformedMimeTypeException} if the given MIME type is * not syntactically correct. * @@ -547,6 +568,12 @@ public class IntentFilter implements Parcelable { * one of these schemes <em>or</em> a matching data type. If no schemes * are included, then an Intent will match only if it includes no data. * + * <p><em>Note: scheme matching in the Android framework is + * case-sensitive, unlike formal RFC schemes. As a result, + * you should always write your schemes with lower case letters, + * and any schemes you receive from outside of Android should be + * converted to lower case before supplying them here.</em></p> + * * @param scheme Name of the scheme to match, i.e. "http". * * @see #matchData @@ -631,6 +658,16 @@ public class IntentFilter implements Parcelable { return mPort; } + /** + * Determine whether this AuthorityEntry matches the given data Uri. + * <em>Note that this comparison is case-sensitive, unlike formal + * RFC host names. You thus should always normalize to lower-case.</em> + * + * @param data The Uri to match. + * @return Returns either {@link IntentFilter#NO_MATCH_DATA}, + * {@link IntentFilter#MATCH_CATEGORY_PORT}, or + * {@link IntentFilter#MATCH_CATEGORY_HOST}. + */ public int match(Uri data) { String host = data.getHost(); if (host == null) { @@ -664,6 +701,12 @@ public class IntentFilter implements Parcelable { * included in the filter, then an Intent's data must match one of * them. If no authorities are included, then only the scheme must match. * + * <p><em>Note: host name in the Android framework is + * case-sensitive, unlike formal RFC host names. As a result, + * you should always write your host names with lower case letters, + * and any host names you receive from outside of Android should be + * converted to lower case before supplying them here.</em></p> + * * @param host The host part of the authority to match. May start with a * single '*' to wildcard the front of the host name. * @param port Optional port part of the authority to match. If null, any @@ -822,13 +865,20 @@ public class IntentFilter implements Parcelable { * schemes/paths, the match will only succeed if the intent does not * also specify a type or data. * - * <p>Note that to match against an authority, you must also specify a base + * <p>Be aware that to match against an authority, you must also specify a base * scheme the authority is in. To match against a data path, both a scheme * and authority must be specified. If the filter does not specify any * types or schemes that it matches against, it is considered to be empty * (any authority or data path given is ignored, as if it were empty as * well). * + * <p><em>Note: MIME type, Uri scheme, and host name matching in the + * Android framework is case-sensitive, unlike the formal RFC definitions. + * As a result, you should always write these elements with lower case letters, + * and normalize any MIME types or Uris you receive from + * outside of Android to ensure these elements are lower case before + * supplying them here.</em></p> + * * @param type The desired data type to look for, as returned by * Intent.resolveType(). * @param scheme The desired data scheme to look for, as returned by diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 7e4b7ac..956b15a 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -35,8 +35,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration public Locale locale; /** - * Locale should persist on setting - * @hide pending API council approval + * Locale should persist on setting. This is hidden because it is really + * questionable whether this is the right way to expose the functionality. + * @hide */ public boolean userSetLocale; diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 1a963f6..e020462 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -756,7 +756,7 @@ public class Resources { /** * Open a data stream for reading a raw resource. This can only be used - * with resources whose value is the name of an asset files -- that is, it can be + * with resources whose value is the name of an asset file -- that is, it can be * used to open drawable, sound, and raw resources; it will fail on string * and color resources. * @@ -766,8 +766,6 @@ public class Resources { * @return InputStream Access to the resource data. * * @throws NotFoundException Throws NotFoundException if the given ID does not exist. - * - * @hide Pending API council approval */ public InputStream openRawResource(int id, TypedValue value) throws NotFoundException { getValue(id, value, true); diff --git a/core/java/android/database/AbstractCursor.java b/core/java/android/database/AbstractCursor.java index 76f0860..038eedf 100644 --- a/core/java/android/database/AbstractCursor.java +++ b/core/java/android/database/AbstractCursor.java @@ -463,14 +463,16 @@ public abstract class AbstractCursor implements CrossProcessCursor { } /** - * @hide pending API council approval + * This is hidden until the data set change model has been re-evaluated. + * @hide */ protected void notifyDataSetChange() { mDataSetObservable.notifyChanged(); } /** - * @hide pending API council approval + * This is hidden until the data set change model has been re-evaluated. + * @hide */ protected DataSetObservable getDataSetObservable() { return mDataSetObservable; diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 2af080a..7d331dc 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -1143,7 +1143,10 @@ public class SQLiteDatabase extends SQLiteClosable { * @param initialRead set the initial count of items to read from the cursor * @param maxRead set the count of items to read on each iteration after the first * @return A {@link Cursor} object, which is positioned before the first entry - * @hide pending API council approval + * + * This work is incomplete and not fully tested or reviewed, so currently + * hidden. + * @hide */ public Cursor rawQuery(String sql, String[] selectionArgs, int initialRead, int maxRead) { diff --git a/core/java/android/database/sqlite/SQLiteQuery.java b/core/java/android/database/sqlite/SQLiteQuery.java index 1386a0d..cdd9f86 100644 --- a/core/java/android/database/sqlite/SQLiteQuery.java +++ b/core/java/android/database/sqlite/SQLiteQuery.java @@ -131,7 +131,6 @@ public class SQLiteQuery extends SQLiteProgram { } } - /** {@hide pending API Council approval} */ @Override public String toString() { return "SQLiteQuery: " + mQuery; diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 7fbb3a7..0c88a2e 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -616,7 +616,8 @@ public class SensorManager extends IRotationWatcher.Stub * @param sensors a bit masks of the sensors to register to * @param rate rate of events. This is only a hint to the system. events * may be received faster or slower than the specified rate. Usually events - * are received faster. + * are received faster. The value must be one of {@link #SENSOR_DELAY_NORMAL}, + * {@link #SENSOR_DELAY_UI}, {@link #SENSOR_DELAY_GAME}, or {@link #SENSOR_DELAY_FASTEST}. * * @return true if the sensor is supported and successfully enabled */ @@ -785,7 +786,9 @@ public class SensorManager extends IRotationWatcher.Stub * @param sensor The {@link android.hardware.Sensor Sensor} to register to. * @param rate The rate {@link android.hardware.SensorEvent sensor events} are delivered at. * This is only a hint to the system. Events may be received faster or - * slower than the specified rate. Usually events are received faster. + * slower than the specified rate. Usually events are received faster. The value must be + * one of {@link #SENSOR_DELAY_NORMAL}, {@link #SENSOR_DELAY_UI}, {@link #SENSOR_DELAY_GAME}, + * or {@link #SENSOR_DELAY_FASTEST}. * * @return true if the sensor is supported and successfully enabled. * @@ -802,7 +805,9 @@ public class SensorManager extends IRotationWatcher.Stub * @param sensor The {@link android.hardware.Sensor Sensor} to register to. * @param rate The rate {@link android.hardware.SensorEvent sensor events} are delivered at. * This is only a hint to the system. Events may be received faster or - * slower than the specified rate. Usually events are received faster. + * slower than the specified rate. Usually events are received faster. The value must be one + * of {@link #SENSOR_DELAY_NORMAL}, {@link #SENSOR_DELAY_UI}, {@link #SENSOR_DELAY_GAME}, or + * {@link #SENSOR_DELAY_FASTEST}. * @param handler The {@link android.os.Handler Handler} the * {@link android.hardware.SensorEvent sensor events} will be delivered to. * diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java index 9b8b5db..65c9893 100755 --- a/core/java/android/inputmethodservice/KeyboardView.java +++ b/core/java/android/inputmethodservice/KeyboardView.java @@ -486,19 +486,17 @@ public class KeyboardView extends View implements View.OnClickListener { } /** - * Enables or disables proximity correction. When enabled, {@link OnKeyboardActionListener#onKey} - * gets called with key codes for adjacent keys. Otherwise only the primary code is returned. + * When enabled, calls to {@link OnKeyboardActionListener#onKey} will include key + * codes for adjacent keys. When disabled, only the primary key code will be + * reported. * @param enabled whether or not the proximity correction is enabled - * @hide Pending API Council approval */ public void setProximityCorrectionEnabled(boolean enabled) { mProximityCorrectOn = enabled; } /** - * Returns the enabled state of the proximity correction. - * @return true if proximity correction is enabled, false otherwise - * @hide Pending API Council approval + * Returns true if proximity correction is enabled. */ public boolean isProximityCorrectionEnabled() { return mProximityCorrectOn; diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index b0ae0e6..17594d4 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -41,18 +41,25 @@ public abstract class BatteryStats implements Parcelable { public static final int SENSOR = 3; /** + * A constant indicating a a wifi turn on timer + * + * {@hide} + */ + public static final int WIFI_TURNED_ON = 4; + + /** * A constant indicating a full wifi lock timer * * {@hide} */ - public static final int FULL_WIFI_LOCK = 4; + public static final int FULL_WIFI_LOCK = 5; /** * A constant indicating a scan wifi lock timer * * {@hide} */ - public static final int SCAN_WIFI_LOCK = 5; + public static final int SCAN_WIFI_LOCK = 6; /** * Include all of the data in the stats, including previously saved data. @@ -77,7 +84,11 @@ public abstract class BatteryStats implements Parcelable { /** * Bump the version on this if the checkin format changes. */ - private static final int BATTERY_STATS_CHECKIN_VERSION = 1; + private static final int BATTERY_STATS_CHECKIN_VERSION = 3; + + private static final long BYTES_PER_KB = 1024; + private static final long BYTES_PER_MB = 1048576; // 1024^2 + private static final long BYTES_PER_GB = 1073741824; //1024^3 // TODO: Update this list if you add/change any stats above. private static final String[] STAT_NAMES = { "total", "last", "current", "unplugged" }; @@ -87,16 +98,39 @@ public abstract class BatteryStats implements Parcelable { private static final String SENSOR_DATA = "sensor"; private static final String WAKELOCK_DATA = "wakelock"; private static final String NETWORK_DATA = "network"; + private static final String USER_ACTIVITY_DATA = "useract"; private static final String BATTERY_DATA = "battery"; private static final String WIFI_LOCK_DATA = "wifilock"; private static final String MISC_DATA = "misc"; - private static final String SIGNAL_STRENGTH_DATA = "signal"; - private static final String DATA_CONNECTION_DATA = "dataconn"; + private static final String SCREEN_BRIGHTNESS_DATA = "brightness"; + private static final String SIGNAL_STRENGTH_TIME_DATA = "sigtime"; + private static final String SIGNAL_STRENGTH_COUNT_DATA = "sigcnt"; + private static final String DATA_CONNECTION_TIME_DATA = "dconntime"; + private static final String DATA_CONNECTION_COUNT_DATA = "dconncnt"; private final StringBuilder mFormatBuilder = new StringBuilder(8); private final Formatter mFormatter = new Formatter(mFormatBuilder); /** + * State for keeping track of counting information. + */ + public static abstract class Counter { + + /** + * Returns the count associated with this Counter for the + * selected type of statistics. + * + * @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT + */ + public abstract int getCount(int which); + + /** + * Temporary for debugging. + */ + public abstract void logState(Printer pw, String prefix); + } + + /** * State for keeping track of timing information. */ public static abstract class Timer { @@ -180,13 +214,29 @@ public abstract class BatteryStats implements Parcelable { */ public abstract long getTcpBytesSent(int which); + public abstract void noteWifiTurnedOnLocked(); + public abstract void noteWifiTurnedOffLocked(); public abstract void noteFullWifiLockAcquiredLocked(); public abstract void noteFullWifiLockReleasedLocked(); public abstract void noteScanWifiLockAcquiredLocked(); public abstract void noteScanWifiLockReleasedLocked(); + public abstract long getWifiTurnedOnTime(long batteryRealtime, int which); public abstract long getFullWifiLockTime(long batteryRealtime, int which); public abstract long getScanWifiLockTime(long batteryRealtime, int which); + /** + * Note that these must match the constants in android.os.LocalPowerManager. + */ + static final String[] USER_ACTIVITY_TYPES = { + "other", "cheek", "touch", "long_touch", "touch_up", "button", "unknown" + }; + + public static final int NUM_USER_ACTIVITY_TYPES = 7; + + public abstract void noteUserActivityLocked(int type); + public abstract boolean hasUserActivity(); + public abstract int getUserActivityCount(int type, int which); + public static abstract class Sensor { // Magic sensor number for the GPS. public static final int GPS = -10000; @@ -285,6 +335,29 @@ public abstract class BatteryStats implements Parcelable { */ public abstract long getScreenOnTime(long batteryRealtime, int which); + public static final int SCREEN_BRIGHTNESS_DARK = 0; + public static final int SCREEN_BRIGHTNESS_DIM = 1; + public static final int SCREEN_BRIGHTNESS_MEDIUM = 2; + public static final int SCREEN_BRIGHTNESS_LIGHT = 3; + public static final int SCREEN_BRIGHTNESS_BRIGHT = 4; + + static final String[] SCREEN_BRIGHTNESS_NAMES = { + "dark", "dim", "medium", "light", "bright" + }; + + public static final int NUM_SCREEN_BRIGHTNESS_BINS = 5; + + /** + * Returns the time in milliseconds that the screen has been on with + * the given brightness + * + * {@hide} + */ + public abstract long getScreenBrightnessTime(int brightnessBin, + long batteryRealtime, int which); + + public abstract int getInputEventCount(int which); + /** * Returns the time in milliseconds that the phone has been on while the device was * running on battery. @@ -314,6 +387,13 @@ public abstract class BatteryStats implements Parcelable { public abstract long getPhoneSignalStrengthTime(int strengthBin, long batteryRealtime, int which); + /** + * Returns the number of times the phone has entered the given signal strength. + * + * {@hide} + */ + public abstract int getPhoneSignalStrengthCount(int strengthBin, int which); + public static final int DATA_CONNECTION_NONE = 0; public static final int DATA_CONNECTION_GPRS = 1; public static final int DATA_CONNECTION_EDGE = 2; @@ -336,6 +416,14 @@ public abstract class BatteryStats implements Parcelable { long batteryRealtime, int which); /** + * Returns the number of times the phone has entered the given data + * connection type. + * + * {@hide} + */ + public abstract int getPhoneDataConnectionCount(int dataType, int which); + + /** * Returns the time in milliseconds that wifi has been on while the device was * running on battery. * @@ -482,6 +570,23 @@ public abstract class BatteryStats implements Parcelable { return mFormatBuilder.toString(); } + private final String formatBytesLocked(long bytes) { + mFormatBuilder.setLength(0); + + if (bytes < BYTES_PER_KB) { + return bytes + "B"; + } else if (bytes < BYTES_PER_MB) { + mFormatter.format("%.2fKB", bytes / (double) BYTES_PER_KB); + return mFormatBuilder.toString(); + } else if (bytes < BYTES_PER_GB){ + mFormatter.format("%.2fMB", bytes / (double) BYTES_PER_MB); + return mFormatBuilder.toString(); + } else { + mFormatter.format("%.2fGB", bytes / (double) BYTES_PER_GB); + return mFormatBuilder.toString(); + } + } + /** * * @param sb a StringBuilder object. @@ -590,40 +695,89 @@ public abstract class BatteryStats implements Parcelable { StringBuilder sb = new StringBuilder(128); + SparseArray<? extends Uid> uidStats = getUidStats(); + final int NU = uidStats.size(); + String category = STAT_NAMES[which]; // Dump "battery" stat dumpLine(pw, 0 /* uid */, category, BATTERY_DATA, which == STATS_TOTAL ? getStartCount() : "N/A", - whichBatteryUptime / 1000, whichBatteryRealtime / 1000, - totalUptime / 1000, totalRealtime / 1000); + whichBatteryRealtime / 1000, whichBatteryUptime / 1000, + totalRealtime / 1000, totalUptime / 1000); + + // Calculate total network and wakelock times across all uids. + long rxTotal = 0; + long txTotal = 0; + long fullWakeLockTimeTotal = 0; + long partialWakeLockTimeTotal = 0; + + for (int iu = 0; iu < NU; iu++) { + Uid u = uidStats.valueAt(iu); + rxTotal += u.getTcpBytesReceived(which); + txTotal += u.getTcpBytesSent(which); + + Map<String, ? extends BatteryStats.Uid.Wakelock> wakelocks = u.getWakelockStats(); + if (wakelocks.size() > 0) { + for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> ent + : wakelocks.entrySet()) { + Uid.Wakelock wl = ent.getValue(); + + Timer fullWakeTimer = wl.getWakeTime(WAKE_TYPE_FULL); + if (fullWakeTimer != null) { + fullWakeLockTimeTotal += fullWakeTimer.getTotalTime(batteryRealtime, which); + } + + Timer partialWakeTimer = wl.getWakeTime(WAKE_TYPE_PARTIAL); + if (partialWakeTimer != null) { + partialWakeLockTimeTotal += partialWakeTimer.getTotalTime( + batteryRealtime, which); + } + } + } + } // Dump misc stats dumpLine(pw, 0 /* uid */, category, MISC_DATA, screenOnTime / 1000, phoneOnTime / 1000, wifiOnTime / 1000, - wifiRunningTime / 1000, bluetoothOnTime / 1000); + wifiRunningTime / 1000, bluetoothOnTime / 1000, rxTotal, txTotal, + fullWakeLockTimeTotal, partialWakeLockTimeTotal, + getInputEventCount(which)); + + // Dump screen brightness stats + Object[] args = new Object[NUM_SCREEN_BRIGHTNESS_BINS]; + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + args[i] = getScreenBrightnessTime(i, batteryRealtime, which) / 1000; + } + dumpLine(pw, 0 /* uid */, category, SCREEN_BRIGHTNESS_DATA, args); // Dump signal strength stats - Object[] args = new Object[NUM_SIGNAL_STRENGTH_BINS]; + args = new Object[NUM_SIGNAL_STRENGTH_BINS]; for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { args[i] = getPhoneSignalStrengthTime(i, batteryRealtime, which) / 1000; } - dumpLine(pw, 0 /* uid */, category, SIGNAL_STRENGTH_DATA, args); + dumpLine(pw, 0 /* uid */, category, SIGNAL_STRENGTH_TIME_DATA, args); + for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { + args[i] = getPhoneSignalStrengthCount(i, which); + } + dumpLine(pw, 0 /* uid */, category, SIGNAL_STRENGTH_COUNT_DATA, args); // Dump network type stats args = new Object[NUM_DATA_CONNECTION_TYPES]; for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) { args[i] = getPhoneDataConnectionTime(i, batteryRealtime, which) / 1000; } - dumpLine(pw, 0 /* uid */, category, DATA_CONNECTION_DATA, args); + dumpLine(pw, 0 /* uid */, category, DATA_CONNECTION_TIME_DATA, args); + for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) { + args[i] = getPhoneDataConnectionCount(i, which); + } + dumpLine(pw, 0 /* uid */, category, DATA_CONNECTION_COUNT_DATA, args); if (which == STATS_UNPLUGGED) { dumpLine(pw, 0 /* uid */, category, BATTERY_DATA, getUnpluggedStartLevel(), getPluggedStartLevel()); } - SparseArray<? extends Uid> uidStats = getUidStats(); - final int NU = uidStats.size(); for (int iu = 0; iu < NU; iu++) { final int uid = uidStats.keyAt(iu); Uid u = uidStats.valueAt(iu); @@ -632,14 +786,29 @@ public abstract class BatteryStats implements Parcelable { long tx = u.getTcpBytesSent(which); long fullWifiLockOnTime = u.getFullWifiLockTime(batteryRealtime, which); long scanWifiLockOnTime = u.getScanWifiLockTime(batteryRealtime, which); + long wifiTurnedOnTime = u.getWifiTurnedOnTime(batteryRealtime, which); if (rx > 0 || tx > 0) dumpLine(pw, uid, category, NETWORK_DATA, rx, tx); - if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0) { + if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0 + || wifiTurnedOnTime != 0) { dumpLine(pw, uid, category, WIFI_LOCK_DATA, - fullWifiLockOnTime, scanWifiLockOnTime); + fullWifiLockOnTime, scanWifiLockOnTime, wifiTurnedOnTime); } + if (u.hasUserActivity()) { + args = new Object[Uid.NUM_USER_ACTIVITY_TYPES]; + boolean hasData = false; + for (int i=0; i<Uid.NUM_USER_ACTIVITY_TYPES; i++) { + int val = u.getUserActivityCount(i, which); + args[i] = val; + if (val != 0) hasData = true; + } + if (hasData) { + dumpLine(pw, 0 /* uid */, category, USER_ACTIVITY_DATA, args); + } + } + Map<String, ? extends BatteryStats.Uid.Wakelock> wakelocks = u.getWakelockStats(); if (wakelocks.size() > 0) { for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> ent @@ -741,20 +910,24 @@ public abstract class BatteryStats implements Parcelable { final long totalUptime = computeUptime(rawUptime, which); StringBuilder sb = new StringBuilder(128); + + SparseArray<? extends Uid> uidStats = getUidStats(); + final int NU = uidStats.size(); pw.println(prefix - + " Time on battery: " + formatTimeMs(whichBatteryUptime / 1000) - + "(" + formatRatioLocked(whichBatteryUptime, totalRealtime) - + ") uptime, " + + " Time on battery: " + formatTimeMs(whichBatteryRealtime / 1000) + "(" + formatRatioLocked(whichBatteryRealtime, totalRealtime) - + ") realtime"); + + ") realtime, " + + formatTimeMs(whichBatteryUptime / 1000) + + "(" + formatRatioLocked(whichBatteryUptime, totalRealtime) + + ") uptime"); pw.println(prefix - + " Total: " - + formatTimeMs(totalUptime / 1000) - + "uptime, " + + " Total run time: " + formatTimeMs(totalRealtime / 1000) - + "realtime"); + + "realtime, " + + formatTimeMs(totalUptime / 1000) + + "uptime, "); final long screenOnTime = getScreenOnTime(batteryRealtime, which); final long phoneOnTime = getPhoneOnTime(batteryRealtime, which); @@ -764,19 +937,73 @@ public abstract class BatteryStats implements Parcelable { pw.println(prefix + " Screen on: " + formatTimeMs(screenOnTime / 1000) + "(" + formatRatioLocked(screenOnTime, whichBatteryRealtime) - + "), Phone on: " + formatTimeMs(phoneOnTime / 1000) - + "(" + formatRatioLocked(phoneOnTime, whichBatteryRealtime)); + + "), Input events: " + getInputEventCount(which) + + ", Active phone call: " + formatTimeMs(phoneOnTime / 1000) + + "(" + formatRatioLocked(phoneOnTime, whichBatteryRealtime) + ")"); + sb.setLength(0); + sb.append(" Screen brightnesses: "); + boolean didOne = false; + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + final long time = getScreenBrightnessTime(i, batteryRealtime, which); + if (time == 0) { + continue; + } + if (didOne) sb.append(", "); + didOne = true; + sb.append(SCREEN_BRIGHTNESS_NAMES[i]); + sb.append(" "); + sb.append(formatTimeMs(time/1000)); + sb.append("("); + sb.append(formatRatioLocked(time, screenOnTime)); + sb.append(")"); + } + if (!didOne) sb.append("No activity"); + pw.println(sb.toString()); + + // Calculate total network and wakelock times across all uids. + long rxTotal = 0; + long txTotal = 0; + long fullWakeLockTimeTotalMicros = 0; + long partialWakeLockTimeTotalMicros = 0; + + for (int iu = 0; iu < NU; iu++) { + Uid u = uidStats.valueAt(iu); + rxTotal += u.getTcpBytesReceived(which); + txTotal += u.getTcpBytesSent(which); + + Map<String, ? extends BatteryStats.Uid.Wakelock> wakelocks = u.getWakelockStats(); + if (wakelocks.size() > 0) { + for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> ent + : wakelocks.entrySet()) { + Uid.Wakelock wl = ent.getValue(); + + Timer fullWakeTimer = wl.getWakeTime(WAKE_TYPE_FULL); + if (fullWakeTimer != null) { + fullWakeLockTimeTotalMicros += fullWakeTimer.getTotalTime( + batteryRealtime, which); + } + + Timer partialWakeTimer = wl.getWakeTime(WAKE_TYPE_PARTIAL); + if (partialWakeTimer != null) { + partialWakeLockTimeTotalMicros += partialWakeTimer.getTotalTime( + batteryRealtime, which); + } + } + } + } + pw.println(prefix - + " Wifi on: " + formatTimeMs(wifiOnTime / 1000) - + "(" + formatRatioLocked(wifiOnTime, whichBatteryRealtime) - + "), Wifi running: " + formatTimeMs(wifiRunningTime / 1000) - + "(" + formatRatioLocked(wifiRunningTime, whichBatteryRealtime) - + "), Bluetooth on: " + formatTimeMs(bluetoothOnTime / 1000) - + "(" + formatRatioLocked(bluetoothOnTime, whichBatteryRealtime)+ ")"); + + " Total received: " + formatBytesLocked(rxTotal) + + ", Total sent: " + formatBytesLocked(txTotal)); + pw.println(prefix + + " Total full wakelock time: " + formatTimeMs( + (fullWakeLockTimeTotalMicros + 500) / 1000) + + ", Total partial waklock time: " + formatTimeMs( + (partialWakeLockTimeTotalMicros + 500) / 1000)); sb.setLength(0); - sb.append(" Signal strengths: "); - boolean didOne = false; + sb.append(" Signal levels: "); + didOne = false; for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { final long time = getPhoneSignalStrengthTime(i, batteryRealtime, which); if (time == 0) { @@ -789,13 +1016,15 @@ public abstract class BatteryStats implements Parcelable { sb.append(formatTimeMs(time/1000)); sb.append("("); sb.append(formatRatioLocked(time, whichBatteryRealtime)); - sb.append(")"); + sb.append(") "); + sb.append(getPhoneSignalStrengthCount(i, which)); + sb.append("x"); } if (!didOne) sb.append("No activity"); pw.println(sb.toString()); sb.setLength(0); - sb.append(" Data types: "); + sb.append(" Radio types: "); didOne = false; for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) { final long time = getPhoneDataConnectionTime(i, batteryRealtime, which); @@ -809,11 +1038,21 @@ public abstract class BatteryStats implements Parcelable { sb.append(formatTimeMs(time/1000)); sb.append("("); sb.append(formatRatioLocked(time, whichBatteryRealtime)); - sb.append(")"); + sb.append(") "); + sb.append(getPhoneDataConnectionCount(i, which)); + sb.append("x"); } if (!didOne) sb.append("No activity"); pw.println(sb.toString()); + pw.println(prefix + + " Wifi on: " + formatTimeMs(wifiOnTime / 1000) + + "(" + formatRatioLocked(wifiOnTime, whichBatteryRealtime) + + "), Wifi running: " + formatTimeMs(wifiRunningTime / 1000) + + "(" + formatRatioLocked(wifiRunningTime, whichBatteryRealtime) + + "), Bluetooth on: " + formatTimeMs(bluetoothOnTime / 1000) + + "(" + formatRatioLocked(bluetoothOnTime, whichBatteryRealtime)+ ")"); + pw.println(" "); if (which == STATS_UNPLUGGED) { @@ -828,12 +1067,10 @@ public abstract class BatteryStats implements Parcelable { pw.println(prefix + " Last discharge cycle end level: " + getPluggedStartLevel()); } + pw.println(" "); } - pw.println(" "); - SparseArray<? extends Uid> uidStats = getUidStats(); - final int NU = uidStats.size(); for (int iu=0; iu<NU; iu++) { final int uid = uidStats.keyAt(iu); Uid u = uidStats.valueAt(iu); @@ -844,12 +1081,41 @@ public abstract class BatteryStats implements Parcelable { long tcpSent = u.getTcpBytesSent(which); long fullWifiLockOnTime = u.getFullWifiLockTime(batteryRealtime, which); long scanWifiLockOnTime = u.getScanWifiLockTime(batteryRealtime, which); + long wifiTurnedOnTime = u.getWifiTurnedOnTime(batteryRealtime, which); if (tcpReceived != 0 || tcpSent != 0) { - pw.println(prefix + " Network: " + tcpReceived + " bytes received, " - + tcpSent + " bytes sent"); + pw.println(prefix + " Network: " + formatBytesLocked(tcpReceived) + " received, " + + formatBytesLocked(tcpSent) + " sent"); } - if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0) { + + if (u.hasUserActivity()) { + boolean hasData = false; + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + int val = u.getUserActivityCount(i, which); + if (val != 0) { + if (!hasData) { + sb.setLength(0); + sb.append(" User activity: "); + hasData = true; + } else { + sb.append(", "); + } + sb.append(val); + sb.append(" "); + sb.append(Uid.USER_ACTIVITY_TYPES[i]); + } + } + if (hasData) { + pw.println(sb.toString()); + } + } + + if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0 + || wifiTurnedOnTime != 0) { + pw.println(prefix + " Turned Wifi On Time: " + + formatTimeMs(wifiTurnedOnTime / 1000) + + "(" + formatRatioLocked(wifiTurnedOnTime, + whichBatteryRealtime)+ ")"); pw.println(prefix + " Full Wifi Lock Time: " + formatTimeMs(fullWifiLockOnTime / 1000) + "(" + formatRatioLocked(fullWifiLockOnTime, diff --git a/core/java/android/os/LocalPowerManager.java b/core/java/android/os/LocalPowerManager.java index 9e88f5a..2c6b29a 100644 --- a/core/java/android/os/LocalPowerManager.java +++ b/core/java/android/os/LocalPowerManager.java @@ -18,6 +18,8 @@ package android.os; /** @hide */ public interface LocalPowerManager { + // Note: be sure to update BatteryStats if adding or modifying event constants. + public static final int OTHER_EVENT = 0; public static final int CHEEK_EVENT = 1; public static final int TOUCH_EVENT = 2; // touch events are TOUCH for 300ms, and then either diff --git a/core/java/android/os/Looper.java b/core/java/android/os/Looper.java index 9581893..69b3540 100644 --- a/core/java/android/os/Looper.java +++ b/core/java/android/os/Looper.java @@ -175,9 +175,6 @@ public class Looper { /** * Return the Thread associated with this Looper. - * - * @since CURRENT - * {@hide pending API Council approval} */ public Thread getThread() { return mThread; diff --git a/core/java/android/provider/Contacts.java b/core/java/android/provider/Contacts.java index fe15962..064ed88 100644 --- a/core/java/android/provider/Contacts.java +++ b/core/java/android/provider/Contacts.java @@ -279,7 +279,9 @@ public class Contacts { * at least one E-mail or IM {@link ContactMethods} that match the * filter. * - * @hide pending API council review + * Not exposed because we expect significant changes in the contacts + * schema and do not want to have to support this. + * @hide */ public static final Uri WITH_EMAIL_OR_IM_FILTER_URI = Uri.parse("content://contacts/people/with_email_or_im_filter"); diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index b91bc9d..b6f96c4 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -1152,19 +1152,25 @@ public final class MediaStore * and indicates the number of songs on the album by the given * artist. * <P>Type: INTEGER</P> - * - * @hide pending API Council approval */ public static final String NUMBER_OF_SONGS_FOR_ARTIST = "numsongs_by_artist"; /** - * The year in which the earliest and latest songs - * on this album were released. These will often - * be the same, but for compilation albums they - * might differ. + * The year in which the earliest songs + * on this album were released. This will often + * be the same as {@link #LAST_YEAR}, but for compilation albums + * they might differ. * <P>Type: INTEGER</P> */ public static final String FIRST_YEAR = "minyear"; + + /** + * The year in which the latest songs + * on this album were released. This will often + * be the same as {@link #FIRST_YEAR}, but for compilation albums + * they might differ. + * <P>Type: INTEGER</P> + */ public static final String LAST_YEAR = "maxyear"; /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4c9471c..c035be2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -885,8 +885,6 @@ public final class Settings { * Set to one of {@link #WIFI_SLEEP_POLICY_DEFAULT}, * {@link #WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED}, or * {@link #WIFI_SLEEP_POLICY_NEVER}. - * - * @hide pending API council */ public static final String WIFI_SLEEP_POLICY = "wifi_sleep_policy"; @@ -894,8 +892,6 @@ public final class Settings { * Value for {@link #WIFI_SLEEP_POLICY} to use the default Wi-Fi sleep * policy, which is to sleep shortly after the turning off * according to the {@link #STAY_ON_WHILE_PLUGGED_IN} setting. - * - * @hide pending API council */ public static final int WIFI_SLEEP_POLICY_DEFAULT = 0; @@ -903,15 +899,11 @@ public final class Settings { * Value for {@link #WIFI_SLEEP_POLICY} to use the default policy when * the device is on battery, and never go to sleep when the device is * plugged in. - * - * @hide pending API council */ public static final int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; /** * Value for {@link #WIFI_SLEEP_POLICY} to never go to sleep. - * - * @hide pending API council */ public static final int WIFI_SLEEP_POLICY_NEVER = 2; @@ -2005,7 +1997,6 @@ public final class Settings { /** * A comma-separated list of SSIDs for which the Wi-Fi watchdog should be enabled. - * @hide pending API council */ public static final String WIFI_WATCHDOG_WATCH_LIST = "wifi_watchdog_watch_list"; @@ -2028,16 +2019,12 @@ public final class Settings { * The maximum number of times we will retry a connection to an access * point for which we have failed in acquiring an IP address from DHCP. * A value of N means that we will make N+1 connection attempts in all. - * - * @hide pending API Council approval */ public static final String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count"; /** * Maximum amount of time in milliseconds to hold a wakelock while waiting for mobile * data connectivity to be established after a disconnect from Wi-Fi. - * - * @hide pending API Council approval */ public static final String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms"; @@ -2045,8 +2032,6 @@ public final class Settings { /** * Whether background data usage is allowed by the user. See * ConnectivityManager for more info. - * - * @hide pending API council */ public static final String BACKGROUND_DATA = "background_data"; } diff --git a/core/java/android/server/BluetoothDeviceService.java b/core/java/android/server/BluetoothDeviceService.java index f1a7d25..8e5cee9 100644 --- a/core/java/android/server/BluetoothDeviceService.java +++ b/core/java/android/server/BluetoothDeviceService.java @@ -24,6 +24,7 @@ package android.server; +import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothError; import android.bluetooth.BluetoothHeadset; @@ -970,8 +971,8 @@ public class BluetoothDeviceService extends IBluetoothDevice.Stub { */ public synchronized int getRemoteClass(String address) { if (!BluetoothDevice.checkBluetoothAddress(address)) { - mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); - return -1; + mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); + return BluetoothClass.ERROR; } return getRemoteClassNative(address); } @@ -1254,4 +1255,3 @@ public class BluetoothDeviceService extends IBluetoothDevice.Stub { Log.d(TAG, msg); } } - diff --git a/core/java/android/speech/srec/UlawEncoderInputStream.java b/core/java/android/speech/srec/UlawEncoderInputStream.java index 132fe027..a488ead 100644 --- a/core/java/android/speech/srec/UlawEncoderInputStream.java +++ b/core/java/android/speech/srec/UlawEncoderInputStream.java @@ -26,8 +26,9 @@ import java.io.InputStream; /** * InputStream which transforms 16 bit pcm data to ulaw data. - * - * @hide pending API council approval + * + * Not yet ready to be supported, so + * @hide */ public final class UlawEncoderInputStream extends InputStream { private final static String TAG = "UlawEncoderInputStream"; diff --git a/core/java/android/speech/srec/WaveHeader.java b/core/java/android/speech/srec/WaveHeader.java index a99496d..4c3b172 100644 --- a/core/java/android/speech/srec/WaveHeader.java +++ b/core/java/android/speech/srec/WaveHeader.java @@ -30,7 +30,9 @@ import java.io.OutputStream; * <li> bitsPerSample - usually 16 for PCM, 8 for ALAW, or 8 for ULAW. * <li> numBytes - size of audio data after this header, in bytes. * </ul> - * @hide pending API council approval + * + * Not yet ready to be supported, so + * @hide */ public class WaveHeader { diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 686e8f5..c133cf2 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -618,7 +618,9 @@ extends Layout * - is class HY: a breakpoint * except when followed by a digit. * - * Ideographs are class ID: breakpoints when adjacent. + * Ideographs are class ID: breakpoints when adjacent, + * except for NS (non-starters), which can be broken + * after but not before. */ if (c == ' ' || c == '\t' || @@ -627,8 +629,8 @@ extends Layout (j + 1 >= next || !Character.isDigit(chs[j + 1 - start]))) || ((c == '/' || c == '-') && (j + 1 >= next || !Character.isDigit(chs[j + 1 - start]))) || - (c >= FIRST_CJK && isIdeographic(c) && - j + 1 < next && isIdeographic(chs[j + 1 - start]))) { + (c >= FIRST_CJK && isIdeographic(c, true) && + j + 1 < next && isIdeographic(chs[j + 1 - start], false))) { okwidth = w; ok = j + 1; @@ -807,8 +809,12 @@ extends Layout * as being Ideographic (class ID) by the Unicode Line Breaking Algorithm * (http://www.unicode.org/unicode/reports/tr14/), and is therefore OK * to break between a pair of. + * + * @param includeNonStarters also return true for category NS + * (non-starters), which can be broken + * after but not before. */ - private static final boolean isIdeographic(char c) { + private static final boolean isIdeographic(char c, boolean includeNonStarters) { if (c >= '\u2E80' && c <= '\u2FFF') { return true; // CJK, KANGXI RADICALS, DESCRIPTION SYMBOLS } @@ -816,9 +822,52 @@ extends Layout return true; // IDEOGRAPHIC SPACE } if (c >= '\u3040' && c <= '\u309F') { + if (!includeNonStarters) { + switch (c) { + case '\u3041': // # HIRAGANA LETTER SMALL A + case '\u3043': // # HIRAGANA LETTER SMALL I + case '\u3045': // # HIRAGANA LETTER SMALL U + case '\u3047': // # HIRAGANA LETTER SMALL E + case '\u3049': // # HIRAGANA LETTER SMALL O + case '\u3063': // # HIRAGANA LETTER SMALL TU + case '\u3083': // # HIRAGANA LETTER SMALL YA + case '\u3085': // # HIRAGANA LETTER SMALL YU + case '\u3087': // # HIRAGANA LETTER SMALL YO + case '\u308E': // # HIRAGANA LETTER SMALL WA + case '\u3095': // # HIRAGANA LETTER SMALL KA + case '\u3096': // # HIRAGANA LETTER SMALL KE + case '\u309B': // # KATAKANA-HIRAGANA VOICED SOUND MARK + case '\u309C': // # KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK + case '\u309D': // # HIRAGANA ITERATION MARK + case '\u309E': // # HIRAGANA VOICED ITERATION MARK + return false; + } + } return true; // Hiragana (except small characters) } if (c >= '\u30A0' && c <= '\u30FF') { + if (!includeNonStarters) { + switch (c) { + case '\u30A0': // # KATAKANA-HIRAGANA DOUBLE HYPHEN + case '\u30A1': // # KATAKANA LETTER SMALL A + case '\u30A3': // # KATAKANA LETTER SMALL I + case '\u30A5': // # KATAKANA LETTER SMALL U + case '\u30A7': // # KATAKANA LETTER SMALL E + case '\u30A9': // # KATAKANA LETTER SMALL O + case '\u30C3': // # KATAKANA LETTER SMALL TU + case '\u30E3': // # KATAKANA LETTER SMALL YA + case '\u30E5': // # KATAKANA LETTER SMALL YU + case '\u30E7': // # KATAKANA LETTER SMALL YO + case '\u30EE': // # KATAKANA LETTER SMALL WA + case '\u30F5': // # KATAKANA LETTER SMALL KA + case '\u30F6': // # KATAKANA LETTER SMALL KE + case '\u30FB': // # KATAKANA MIDDLE DOT + case '\u30FC': // # KATAKANA-HIRAGANA PROLONGED SOUND MARK + case '\u30FD': // # KATAKANA ITERATION MARK + case '\u30FE': // # KATAKANA VOICED ITERATION MARK + return false; + } + } return true; // Katakana (except small characters) } if (c >= '\u3400' && c <= '\u4DB5') { diff --git a/core/java/android/text/method/QwertyKeyListener.java b/core/java/android/text/method/QwertyKeyListener.java index 21bc2a6..e420c27 100644 --- a/core/java/android/text/method/QwertyKeyListener.java +++ b/core/java/android/text/method/QwertyKeyListener.java @@ -405,23 +405,34 @@ public class QwertyKeyListener extends BaseKeyListener { PICKER_SETS.put('<', "\u00AB"); PICKER_SETS.put('>', "\u00BB"); PICKER_SETS.put('?', "\u00BF"); - PICKER_SETS.put('A', "\u00C0\u00C1\u00C2\u00C4\u00C6\u00C3\u00C5"); - PICKER_SETS.put('C', "\u00C7"); - PICKER_SETS.put('E', "\u00C8\u00C9\u00CA\u00CB"); - PICKER_SETS.put('I', "\u00CC\u00CD\u00CE\u00CF"); - PICKER_SETS.put('N', "\u00D1"); - PICKER_SETS.put('O', "\u00D8\u0152\u00D5\u00D2\u00D3\u00D4\u00D6"); - PICKER_SETS.put('U', "\u00D9\u00DA\u00DB\u00DC"); + PICKER_SETS.put('A', "\u00C0\u00C1\u00C2\u00C4\u00C6\u00C3\u00C5\u0104\u0100"); + PICKER_SETS.put('C', "\u00C7\u0106\u010C"); + PICKER_SETS.put('D', "\u010E"); + PICKER_SETS.put('E', "\u00C8\u00C9\u00CA\u00CB\u0118\u011A\u0112"); + PICKER_SETS.put('L', "\u0141"); + PICKER_SETS.put('I', "\u00CC\u00CD\u00CE\u00CF\u012A"); + PICKER_SETS.put('N', "\u00D1\u0143\u0147"); + PICKER_SETS.put('O', "\u00D8\u0152\u00D5\u00D2\u00D3\u00D4\u00D6\u014C"); + PICKER_SETS.put('R', "\u0158"); + PICKER_SETS.put('S', "\u015A\u0160"); + PICKER_SETS.put('T', "\u0164"); + PICKER_SETS.put('U', "\u00D9\u00DA\u00DB\u00DC\u016E\u016A"); PICKER_SETS.put('Y', "\u00DD\u0178"); - PICKER_SETS.put('a', "\u00E0\u00E1\u00E2\u00E4\u00E6\u00E3\u00E5"); - PICKER_SETS.put('c', "\u00E7"); - PICKER_SETS.put('e', "\u00E8\u00E9\u00EA\u00EB"); - PICKER_SETS.put('i', "\u00EC\u00ED\u00EE\u00EF"); - PICKER_SETS.put('n', "\u00F1"); - PICKER_SETS.put('o', "\u00F8\u0153\u00F5\u00F2\u00F3\u00F4\u00F6"); - PICKER_SETS.put('s', "\u00A7\u00DF"); - PICKER_SETS.put('u', "\u00F9\u00FA\u00FB\u00FC"); + PICKER_SETS.put('Z', "\u0179\u017B\u017D"); + PICKER_SETS.put('a', "\u00E0\u00E1\u00E2\u00E4\u00E6\u00E3\u00E5\u0105\u0101"); + PICKER_SETS.put('c', "\u00E7\u0107\u010D"); + PICKER_SETS.put('d', "\u010F"); + PICKER_SETS.put('e', "\u00E8\u00E9\u00EA\u00EB\u0119\u011B\u0113"); + PICKER_SETS.put('i', "\u00EC\u00ED\u00EE\u00EF\u012B"); + PICKER_SETS.put('l', "\u0142"); + PICKER_SETS.put('n', "\u00F1\u0144\u0148"); + PICKER_SETS.put('o', "\u00F8\u0153\u00F5\u00F2\u00F3\u00F4\u00F6\u014D"); + PICKER_SETS.put('r', "\u0159"); + PICKER_SETS.put('s', "\u00A7\u00DF\u015B\u0161"); + PICKER_SETS.put('t', "\u0165"); + PICKER_SETS.put('u', "\u00F9\u00FA\u00FB\u00FC\u016F\u016B"); PICKER_SETS.put('y', "\u00FD\u00FF"); + PICKER_SETS.put('z', "\u017A\u017C\u017E"); PICKER_SETS.put(KeyCharacterMap.PICKER_DIALOG_INPUT, "\u2026\u00A5\u2022\u00AE\u00A9\u00B1"); }; diff --git a/core/java/android/text/util/Rfc822Token.java b/core/java/android/text/util/Rfc822Token.java index e6472df..7fe11bc 100644 --- a/core/java/android/text/util/Rfc822Token.java +++ b/core/java/android/text/util/Rfc822Token.java @@ -114,7 +114,7 @@ public class Rfc822Token { for (int i = 0; i < len; i++) { char c = name.charAt(i); - if (! ((c >= 'A' && i <= 'Z') || + if (! ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c == ' ') || (c >= '0' && c <= '9'))) { diff --git a/core/java/android/view/Gravity.java b/core/java/android/view/Gravity.java index 36d8ce6..cf79638 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 41779ba..6349288 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/VelocityTracker.java b/core/java/android/view/VelocityTracker.java index c80167e..3951b2c 100644 --- a/core/java/android/view/VelocityTracker.java +++ b/core/java/android/view/VelocityTracker.java @@ -58,6 +58,7 @@ public final class VelocityTracker { VelocityTracker vt = mPool[0]; if (vt != null) { vt.clear(); + mPool[0] = null; return vt; } return new VelocityTracker(); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 04447ca..0a84aa0 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5531,7 +5531,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback { (mBGDrawable != null && mBGDrawable.getOpacity() == PixelFormat.OPAQUE); if (width <= 0 || height <= 0 || - (width * height * (opaque ? 2 : 4) >= // Projected bitmap size in bytes + (width * height * (opaque ? 2 : 4) > // Projected bitmap size in bytes ViewConfiguration.get(mContext).getScaledMaximumDrawingCacheSize())) { destroyDrawingCache(); return; @@ -5628,6 +5628,62 @@ public class View implements Drawable.Callback, KeyEvent.Callback { } /** + * Create a snapshot of the view into a bitmap. We should probably make + * some form of this public, but should think about the API. + */ + /*package*/ Bitmap createSnapshot(Bitmap.Config quality, int backgroundColor) { + final int width = mRight - mLeft; + final int height = mBottom - mTop; + + Bitmap bitmap = Bitmap.createBitmap(width, height, quality); + if (bitmap == null) { + throw new OutOfMemoryError(); + } + + Canvas canvas; + final AttachInfo attachInfo = mAttachInfo; + if (attachInfo != null) { + canvas = attachInfo.mCanvas; + if (canvas == null) { + canvas = new Canvas(); + } + canvas.setBitmap(bitmap); + // Temporarily clobber the cached Canvas in case one of our children + // is also using a drawing cache. Without this, the children would + // steal the canvas by attaching their own bitmap to it and bad, bad + // things would happen (invisible views, corrupted drawings, etc.) + attachInfo.mCanvas = null; + } else { + // This case should hopefully never or seldom happen + canvas = new Canvas(bitmap); + } + + if ((backgroundColor&0xff000000) != 0) { + bitmap.eraseColor(backgroundColor); + } + + computeScroll(); + final int restoreCount = canvas.save(); + canvas.translate(-mScrollX, -mScrollY); + + // Fast path for layouts with no backgrounds + if ((mPrivateFlags & SKIP_DRAW) == SKIP_DRAW) { + dispatchDraw(canvas); + } else { + draw(canvas); + } + + canvas.restoreToCount(restoreCount); + + if (attachInfo != null) { + // Restore the cached Canvas for our siblings + attachInfo.mCanvas = canvas; + } + + return bitmap; + } + + /** * Indicates whether this View is currently in edit mode. A View is usually * in edit mode when displayed within a developer tool. For instance, if * this View is being drawn by a visual user interface builder, this method @@ -7402,7 +7458,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback { } /** - * Provide haptic feedback to the user for this view. + * BZZZTT!!1! + * + * <p>Provide haptic feedback to the user for this view. * * <p>The framework will provide haptic feedback for some built in actions, * such as long presses, but you may wish to provide feedback for your @@ -7419,7 +7477,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback { } /** - * Like {@link #performHapticFeedback(int)}, with additional options. + * BZZZTT!!1! + * + * <p>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 d3f48c6..8e1524b 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 f604bc5..367c9a2 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 <some type of data>. - * - * @hide pending API Council approval + * and must return a valid type of data. */ @Target({ ElementType.FIELD, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @@ -741,22 +739,18 @@ public class ViewDebug { final CountDownLatch latch = new CountDownLatch(1); final Bitmap[] cache = new Bitmap[1]; - final boolean hasCache = captureView.isDrawingCacheEnabled(); - final boolean willNotCache = captureView.willNotCacheDrawing(); - - if (willNotCache) { - // TODO: Should happen on the UI thread - captureView.setWillNotCacheDrawing(false); - } - root.post(new Runnable() { public void run() { try { - if (!hasCache) { - captureView.buildDrawingCache(); + cache[0] = captureView.createSnapshot( + Bitmap.Config.ARGB_8888, 0); + } catch (OutOfMemoryError e) { + try { + cache[0] = captureView.createSnapshot( + Bitmap.Config.ARGB_4444, 0); + } catch (OutOfMemoryError e2) { + Log.w("View", "Out of memory for bitmap"); } - - cache[0] = captureView.getDrawingCache(); } finally { latch.countDown(); } @@ -776,20 +770,15 @@ public class ViewDebug { if (out != null) { out.close(); } + cache[0].recycle(); } + } else { + Log.w("View", "Failed to create capture bitmap!"); + clientStream.close(); } } catch (InterruptedException e) { Log.w("View", "Could not complete the capture of the view " + captureView); Thread.currentThread().interrupt(); - } finally { - if (willNotCache) { - // TODO: Should happen on the UI thread - captureView.setWillNotCacheDrawing(true); - } - if (!hasCache) { - // TODO: Should happen on the UI thread - captureView.destroyDrawingCache(); - } } } } @@ -1354,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 4230afa..26e5cbc 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/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index 220869c..1371932 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -580,8 +580,11 @@ public interface WindowManagerPolicy { * Called when layout of the windows is finished. After this function has * returned, all windows given to layoutWindow() <em>must</em> have had a * frame assigned. + * + * @return Return true if layout state may have changed (so that another + * layout will be performed). */ - public void finishLayoutLw(); + public boolean finishLayoutLw(); /** * Called when animation of the windows is about to start. diff --git a/core/java/android/webkit/WebHistoryItem.java b/core/java/android/webkit/WebHistoryItem.java index a408e06..fd26b98 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 4199854..4fc4e5b 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1006,11 +1006,10 @@ 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) { - BrowserFrame.sJavaBridge.setNetworkOnLine(networkUp); + mWebViewCore.sendMessage(EventHub.SET_NETWORK_STATE, + networkUp ? 1 : 0, 0); } /** @@ -1872,8 +1871,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/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 3e4daf7..72b30f6 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -521,7 +521,7 @@ final class WebViewCore { "SET_GLOBAL_BOUNDS", // = 116; "UPDATE_CACHE_AND_TEXT_ENTRY", // = 117; "CLICK", // = 118; - "119", + "SET_NETWORK_STATE", // = 119; "DOC_HAS_IMAGES", // = 120; "SET_SNAP_ANCHOR", // = 121; "DELETE_SELECTION", // = 122; @@ -567,6 +567,7 @@ final class WebViewCore { static final int SET_GLOBAL_BOUNDS = 116; static final int UPDATE_CACHE_AND_TEXT_ENTRY = 117; static final int CLICK = 118; + static final int SET_NETWORK_STATE = 119; static final int DOC_HAS_IMAGES = 120; static final int SET_SNAP_ANCHOR = 121; static final int DELETE_SELECTION = 122; @@ -781,6 +782,15 @@ final class WebViewCore { } break; + case SET_NETWORK_STATE: + if (BrowserFrame.sJavaBridge == null) { + throw new IllegalStateException("No WebView " + + "has been created in this process!"); + } + BrowserFrame.sJavaBridge + .setNetworkOnLine(msg.arg1 == 1); + break; + case CLEAR_CACHE: mBrowserFrame.clearCache(); if (msg.arg1 == 1) { 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/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index e613541..dfb971e 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -809,6 +809,22 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe } /** + * Set the horizontal offset with respect to {@link #setDropDownAnchor(int)} + * @hide pending API council review + */ + public void setDropDownHorizontalOffset(int horizontalOffset) { + mDropDownHorizontalOffset = horizontalOffset; + } + + /** + * Set the vertical offset with respect to {@link #setDropDownAnchor(int)} + * @hide pending API council review + */ + public void setDropDownVerticalOffset(int verticalOffset) { + mDropDownVerticalOffset = verticalOffset; + } + + /** * <p>Used for lazy instantiation of the anchor view from the id we have. If the value of * the id is NO_ID or we can't find a view for the given id, we return this TextView as * the default anchoring point.</p> diff --git a/core/java/android/widget/Chronometer.java b/core/java/android/widget/Chronometer.java index 91add58..7e66722 100644 --- a/core/java/android/widget/Chronometer.java +++ b/core/java/android/widget/Chronometer.java @@ -199,6 +199,7 @@ public class Chronometer extends TextView { /** * The same as calling {@link #start} or {@link #stop}. + * @hide pending API council approval */ @android.view.RemotableViewMethod public void setStarted(boolean started) { 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/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 47db6f2..80fbf9e 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -24,6 +24,7 @@ import android.graphics.Region; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.View; +import android.view.ViewDebug; import android.view.ViewGroup; import android.view.Gravity; import android.widget.RemoteViews.RemoteView; @@ -45,21 +46,31 @@ import android.widget.RemoteViews.RemoteView; */ @RemoteView public class FrameLayout extends ViewGroup { + @ViewDebug.ExportedProperty boolean mMeasureAllChildren = false; + @ViewDebug.ExportedProperty private Drawable mForeground; + @ViewDebug.ExportedProperty private int mForegroundPaddingLeft = 0; + @ViewDebug.ExportedProperty private int mForegroundPaddingTop = 0; + @ViewDebug.ExportedProperty private int mForegroundPaddingRight = 0; + @ViewDebug.ExportedProperty private int mForegroundPaddingBottom = 0; private final Rect mSelfBounds = new Rect(); private final Rect mOverlayBounds = new Rect(); + @ViewDebug.ExportedProperty private int mForegroundGravity = Gravity.FILL; /** {@hide} */ + @ViewDebug.ExportedProperty protected boolean mForegroundInPadding = true; + boolean mForegroundBoundsChanged = false; + public FrameLayout(Context context) { super(context); } @@ -269,6 +280,8 @@ public class FrameLayout extends ViewGroup { final int parentTop = mPaddingTop + mForegroundPaddingTop; final int parentBottom = bottom - top - mPaddingBottom - mForegroundPaddingBottom; + mForegroundBoundsChanged = true; + for (int i = 0; i < count; i++) { final View child = getChildAt(i); if (child.getVisibility() != GONE) { @@ -328,22 +341,7 @@ public class FrameLayout extends ViewGroup { @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { super.onSizeChanged(w, h, oldw, oldh); - - final Drawable foreground = mForeground; - if (foreground != null) { - final Rect selfBounds = mSelfBounds; - final Rect overlayBounds = mOverlayBounds; - - if (mForegroundInPadding) { - selfBounds.set(0, 0, w, h); - } else { - selfBounds.set(mPaddingLeft, mPaddingTop, w - mPaddingRight, h - mPaddingBottom); - } - - Gravity.apply(mForegroundGravity, foreground.getIntrinsicWidth(), - foreground.getIntrinsicHeight(), selfBounds, overlayBounds); - foreground.setBounds(overlayBounds); - } + mForegroundBoundsChanged = true; } /** @@ -354,7 +352,29 @@ public class FrameLayout extends ViewGroup { super.draw(canvas); if (mForeground != null) { - mForeground.draw(canvas); + final Drawable foreground = mForeground; + if (mForegroundBoundsChanged) { + mForegroundBoundsChanged = false; + if (foreground != null) { + final Rect selfBounds = mSelfBounds; + final Rect overlayBounds = mOverlayBounds; + + final int w = mRight-mLeft; + final int h = mBottom-mTop; + + if (mForegroundInPadding) { + selfBounds.set(0, 0, w, h); + } else { + selfBounds.set(mPaddingLeft, mPaddingTop, w - mPaddingRight, h - mPaddingBottom); + } + + Gravity.apply(mForegroundGravity, foreground.getIntrinsicWidth(), + foreground.getIntrinsicHeight(), selfBounds, overlayBounds); + foreground.setBounds(overlayBounds); + } + } + + foreground.draw(canvas); } } 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(); diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl index fff8dcf..bb0c912 100644 --- a/core/java/com/android/internal/app/IBatteryStats.aidl +++ b/core/java/com/android/internal/app/IBatteryStats.aidl @@ -27,13 +27,16 @@ interface IBatteryStats { void noteStartGps(int uid); void noteStopGps(int uid); void noteScreenOn(); + void noteScreenBrightness(int brightness); void noteScreenOff(); + void noteInputEvent(); + void noteUserActivity(int uid, int event); void notePhoneOn(); void notePhoneOff(); void notePhoneSignalStrength(int asu); void notePhoneDataConnectionState(int dataType, boolean hasData); - void noteWifiOn(); - void noteWifiOff(); + void noteWifiOn(int uid); + void noteWifiOff(int uid); void noteWifiRunning(); void noteWifiStopped(); void noteBluetoothOn(); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 9e07fd8..8085080 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -48,7 +48,7 @@ public final class BatteryStatsImpl extends BatteryStats { private static final int MAGIC = 0xBA757475; // 'BATSTATS' // Current on-disk Parcel version - private static final int VERSION = 29; + private static final int VERSION = 32; private final File mFile; private final File mBackupFile; @@ -90,6 +90,11 @@ public final class BatteryStatsImpl extends BatteryStats { boolean mScreenOn; Timer mScreenOnTimer; + int mScreenBrightnessBin = -1; + final Timer[] mScreenBrightnessTimer = new Timer[NUM_SCREEN_BRIGHTNESS_BINS]; + + Counter mInputEventCounter; + boolean mPhoneOn; Timer mPhoneOnTimer; @@ -101,6 +106,7 @@ public final class BatteryStatsImpl extends BatteryStats { boolean mWifiOn; Timer mWifiOnTimer; + int mWifiOnUid = -1; boolean mWifiRunning; Timer mWifiRunningTimer; @@ -141,6 +147,99 @@ public final class BatteryStatsImpl extends BatteryStats { } /** + * State for keeping track of counting information. + */ + public static final class Counter extends BatteryStats.Counter implements Unpluggable { + int mCount; + int mLoadedCount; + int mLastCount; + int mUnpluggedCount; + int mPluggedCount; + + Counter(ArrayList<Unpluggable> unpluggables, Parcel in) { + mPluggedCount = mCount = in.readInt(); + mLoadedCount = in.readInt(); + mLastCount = in.readInt(); + mUnpluggedCount = in.readInt(); + unpluggables.add(this); + } + + Counter(ArrayList<Unpluggable> unpluggables) { + unpluggables.add(this); + } + + public void writeToParcel(Parcel out) { + out.writeInt(mCount); + out.writeInt(mLoadedCount); + out.writeInt(mLastCount); + out.writeInt(mUnpluggedCount); + } + + public void unplug(long batteryUptime, long batteryRealtime) { + mUnpluggedCount = mCount = mPluggedCount; + } + + public void plug(long batteryUptime, long batteryRealtime) { + mPluggedCount = mCount; + } + + /** + * Writes a possibly null Counter to a Parcel. + * + * @param out the Parcel to be written to. + * @param counter a Counter, or null. + */ + public static void writeCounterToParcel(Parcel out, Counter counter) { + if (counter == null) { + out.writeInt(0); // indicates null + return; + } + out.writeInt(1); // indicates non-null + + counter.writeToParcel(out); + } + + @Override + public int getCount(int which) { + int val; + if (which == STATS_LAST) { + val = mLastCount; + } else { + val = mCount; + if (which == STATS_UNPLUGGED) { + val -= mUnpluggedCount; + } else if (which != STATS_TOTAL) { + val -= mLoadedCount; + } + } + + return val; + } + + public void logState(Printer pw, String prefix) { + pw.println(prefix + "mCount=" + mCount + + " mLoadedCount=" + mLoadedCount + " mLastCount=" + mLastCount + + " mUnpluggedCount=" + mUnpluggedCount + + " mPluggedCount=" + mPluggedCount); + } + + void stepLocked() { + mCount++; + } + + void writeSummaryFromParcelLocked(Parcel out) { + out.writeInt(mCount); + out.writeInt(mCount - mLoadedCount); + } + + void readSummaryFromParcelLocked(Parcel in) { + mCount = mLoadedCount = in.readInt(); + mLastCount = in.readInt(); + mUnpluggedCount = mPluggedCount = mCount; + } + } + + /** * State for keeping track of timing information. */ public static final class Timer extends BatteryStats.Timer implements Unpluggable { @@ -469,6 +568,9 @@ public final class BatteryStatsImpl extends BatteryStats { if (!mScreenOn) { mScreenOn = true; mScreenOnTimer.startRunningLocked(this); + if (mScreenBrightnessBin >= 0) { + mScreenBrightnessTimer[mScreenBrightnessBin].startRunningLocked(this); + } } } @@ -476,6 +578,36 @@ public final class BatteryStatsImpl extends BatteryStats { if (mScreenOn) { mScreenOn = false; mScreenOnTimer.stopRunningLocked(this); + if (mScreenBrightnessBin >= 0) { + mScreenBrightnessTimer[mScreenBrightnessBin].stopRunningLocked(this); + } + } + } + + public void noteScreenBrightnessLocked(int brightness) { + // Bin the brightness. + int bin = brightness / (256/NUM_SCREEN_BRIGHTNESS_BINS); + if (bin < 0) bin = 0; + else if (bin >= NUM_SCREEN_BRIGHTNESS_BINS) bin = NUM_SCREEN_BRIGHTNESS_BINS-1; + if (mScreenBrightnessBin != bin) { + if (mScreenOn) { + if (mScreenBrightnessBin >= 0) { + mScreenBrightnessTimer[mScreenBrightnessBin].stopRunningLocked(this); + } + mScreenBrightnessTimer[bin].startRunningLocked(this); + } + mScreenBrightnessBin = bin; + } + } + + public void noteInputEventLocked() { + mInputEventCounter.stepLocked(); + } + + public void noteUserActivityLocked(int uid, int event) { + Uid u = mUidStats.get(uid); + if (u != null) { + u.noteUserActivityLocked(event); } } @@ -537,18 +669,38 @@ public final class BatteryStatsImpl extends BatteryStats { } } - public void noteWifiOnLocked() { + public void noteWifiOnLocked(int uid) { if (!mWifiOn) { mWifiOn = true; mWifiOnTimer.startRunningLocked(this); } + if (mWifiOnUid != uid) { + if (mWifiOnUid >= 0) { + Uid u = mUidStats.get(mWifiOnUid); + if (u != null) { + u.noteWifiTurnedOffLocked(); + } + } + mWifiOnUid = uid; + Uid u = mUidStats.get(uid); + if (u != null) { + u.noteWifiTurnedOnLocked(); + } + } } - public void noteWifiOffLocked() { + public void noteWifiOffLocked(int uid) { if (mWifiOn) { mWifiOn = false; mWifiOnTimer.stopRunningLocked(this); } + if (mWifiOnUid >= 0) { + Uid u = mUidStats.get(mWifiOnUid); + if (u != null) { + u.noteWifiTurnedOffLocked(); + } + mWifiOnUid = -1; + } } public void noteWifiRunningLocked() { @@ -611,6 +763,16 @@ public final class BatteryStatsImpl extends BatteryStats { return mScreenOnTimer.getTotalTime(batteryRealtime, which); } + @Override public long getScreenBrightnessTime(int brightnessBin, + long batteryRealtime, int which) { + return mScreenBrightnessTimer[brightnessBin].getTotalTime( + batteryRealtime, which); + } + + @Override public int getInputEventCount(int which) { + return mInputEventCounter.getCount(which); + } + @Override public long getPhoneOnTime(long batteryRealtime, int which) { return mPhoneOnTimer.getTotalTime(batteryRealtime, which); } @@ -621,12 +783,20 @@ public final class BatteryStatsImpl extends BatteryStats { batteryRealtime, which); } + @Override public int getPhoneSignalStrengthCount(int dataType, int which) { + return mPhoneDataConnectionsTimer[dataType].getCount(which); + } + @Override public long getPhoneDataConnectionTime(int dataType, long batteryRealtime, int which) { return mPhoneDataConnectionsTimer[dataType].getTotalTime( batteryRealtime, which); } + @Override public int getPhoneDataConnectionCount(int dataType, int which) { + return mPhoneDataConnectionsTimer[dataType].getCount(which); + } + @Override public long getWifiOnTime(long batteryRealtime, int which) { return mWifiOnTimer.getTotalTime(batteryRealtime, which); } @@ -665,12 +835,17 @@ public final class BatteryStatsImpl extends BatteryStats { long mStartedTcpBytesReceived = -1; long mStartedTcpBytesSent = -1; + boolean mWifiTurnedOn; + Timer mWifiTurnedOnTimer; + boolean mFullWifiLockOut; Timer mFullWifiLockTimer; boolean mScanWifiLockOut; Timer mScanWifiLockTimer; + Counter[] mUserActivityCounters; + /** * The statistics we have collected for this uid's wake locks. */ @@ -693,6 +868,7 @@ public final class BatteryStatsImpl extends BatteryStats { public Uid(int uid) { mUid = uid; + mWifiTurnedOnTimer = new Timer(WIFI_TURNED_ON, null, mUnpluggables); mFullWifiLockTimer = new Timer(FULL_WIFI_LOCK, null, mUnpluggables); mScanWifiLockTimer = new Timer(SCAN_WIFI_LOCK, null, mUnpluggables); } @@ -755,6 +931,22 @@ public final class BatteryStatsImpl extends BatteryStats { } @Override + public void noteWifiTurnedOnLocked() { + if (!mWifiTurnedOn) { + mWifiTurnedOn = true; + mWifiTurnedOnTimer.startRunningLocked(BatteryStatsImpl.this); + } + } + + @Override + public void noteWifiTurnedOffLocked() { + if (mWifiTurnedOn) { + mWifiTurnedOn = false; + mWifiTurnedOnTimer.stopRunningLocked(BatteryStatsImpl.this); + } + } + + @Override public void noteFullWifiLockAcquiredLocked() { if (!mFullWifiLockOut) { mFullWifiLockOut = true; @@ -785,6 +977,12 @@ public final class BatteryStatsImpl extends BatteryStats { mScanWifiLockTimer.stopRunningLocked(BatteryStatsImpl.this); } } + + @Override + public long getWifiTurnedOnTime(long batteryRealtime, int which) { + return mWifiTurnedOnTimer.getTotalTime(batteryRealtime, which); + } + @Override public long getFullWifiLockTime(long batteryRealtime, int which) { return mFullWifiLockTimer.getTotalTime(batteryRealtime, which); @@ -795,6 +993,36 @@ public final class BatteryStatsImpl extends BatteryStats { return mScanWifiLockTimer.getTotalTime(batteryRealtime, which); } + @Override + public void noteUserActivityLocked(int type) { + if (mUserActivityCounters == null) { + initUserActivityLocked(); + } + if (type < 0) type = 0; + else if (type >= NUM_USER_ACTIVITY_TYPES) type = NUM_USER_ACTIVITY_TYPES-1; + mUserActivityCounters[type].stepLocked(); + } + + @Override + public boolean hasUserActivity() { + return mUserActivityCounters != null; + } + + @Override + public int getUserActivityCount(int type, int which) { + if (mUserActivityCounters == null) { + return 0; + } + return mUserActivityCounters[type].getCount(which); + } + + void initUserActivityLocked() { + mUserActivityCounters = new Counter[NUM_USER_ACTIVITY_TYPES]; + for (int i=0; i<NUM_USER_ACTIVITY_TYPES; i++) { + mUserActivityCounters[i] = new Counter(mUnpluggables); + } + } + public long computeCurrentTcpBytesSent() { return mCurrentTcpBytesSent + (mStartedTcpBytesSent >= 0 ? (NetStat.getUidTxBytes(mUid) - mStartedTcpBytesSent) : 0); @@ -835,8 +1063,17 @@ public final class BatteryStatsImpl extends BatteryStats { out.writeLong(computeCurrentTcpBytesSent()); out.writeLong(mTcpBytesReceivedAtLastUnplug); out.writeLong(mTcpBytesSentAtLastUnplug); + mWifiTurnedOnTimer.writeToParcel(out, batteryRealtime); mFullWifiLockTimer.writeToParcel(out, batteryRealtime); mScanWifiLockTimer.writeToParcel(out, batteryRealtime); + if (mUserActivityCounters == null) { + out.writeInt(0); + } else { + out.writeInt(1); + for (int i=0; i<NUM_USER_ACTIVITY_TYPES; i++) { + mUserActivityCounters[i].writeToParcel(out); + } + } } void readFromParcelLocked(ArrayList<Unpluggable> unpluggables, Parcel in) { @@ -882,10 +1119,20 @@ public final class BatteryStatsImpl extends BatteryStats { mCurrentTcpBytesSent = in.readLong(); mTcpBytesReceivedAtLastUnplug = in.readLong(); mTcpBytesSentAtLastUnplug = in.readLong(); + mWifiTurnedOn = false; + mWifiTurnedOnTimer = new Timer(WIFI_TURNED_ON, null, mUnpluggables, in); mFullWifiLockOut = false; mFullWifiLockTimer = new Timer(FULL_WIFI_LOCK, null, mUnpluggables, in); mScanWifiLockOut = false; mScanWifiLockTimer = new Timer(SCAN_WIFI_LOCK, null, mUnpluggables, in); + if (in.readInt() == 0) { + mUserActivityCounters = null; + } else { + mUserActivityCounters = new Counter[NUM_USER_ACTIVITY_TYPES]; + for (int i=0; i<NUM_USER_ACTIVITY_TYPES; i++) { + mUserActivityCounters[i] = new Counter(mUnpluggables, in); + } + } } /** @@ -1679,12 +1926,16 @@ public final class BatteryStatsImpl extends BatteryStats { mBackupFile = new File(filename + ".bak"); mStartCount++; mScreenOnTimer = new Timer(-1, null, mUnpluggables); + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + mScreenBrightnessTimer[i] = new Timer(-100-i, null, mUnpluggables); + } + mInputEventCounter = new Counter(mUnpluggables); mPhoneOnTimer = new Timer(-2, null, mUnpluggables); for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { - mPhoneSignalStrengthsTimer[i] = new Timer(-100-i, null, mUnpluggables); + mPhoneSignalStrengthsTimer[i] = new Timer(-200-i, null, mUnpluggables); } for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) { - mPhoneDataConnectionsTimer[i] = new Timer(-200-i, null, mUnpluggables); + mPhoneDataConnectionsTimer[i] = new Timer(-300-i, null, mUnpluggables); } mWifiOnTimer = new Timer(-3, null, mUnpluggables); mWifiRunningTimer = new Timer(-4, null, mUnpluggables); @@ -2022,6 +2273,10 @@ public final class BatteryStatsImpl extends BatteryStats { mScreenOn = false; mScreenOnTimer.readSummaryFromParcelLocked(in); + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + mScreenBrightnessTimer[i].readSummaryFromParcelLocked(in); + } + mInputEventCounter.readSummaryFromParcelLocked(in); mPhoneOn = false; mPhoneOnTimer.readSummaryFromParcelLocked(in); for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { @@ -2043,11 +2298,22 @@ public final class BatteryStatsImpl extends BatteryStats { Uid u = new Uid(uid); mUidStats.put(uid, u); + u.mWifiTurnedOn = false; + u.mWifiTurnedOnTimer.readSummaryFromParcelLocked(in); u.mFullWifiLockOut = false; u.mFullWifiLockTimer.readSummaryFromParcelLocked(in); u.mScanWifiLockOut = false; u.mScanWifiLockTimer.readSummaryFromParcelLocked(in); + if (in.readInt() != 0) { + if (u.mUserActivityCounters == null) { + u.initUserActivityLocked(); + } + for (int i=0; i<Uid.NUM_USER_ACTIVITY_TYPES; i++) { + u.mUserActivityCounters[i].readSummaryFromParcelLocked(in); + } + } + int NW = in.readInt(); for (int iw = 0; iw < NW; iw++) { String wlName = in.readString(); @@ -2135,6 +2401,10 @@ public final class BatteryStatsImpl extends BatteryStats { mScreenOnTimer.writeSummaryFromParcelLocked(out, NOWREAL); + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + mScreenBrightnessTimer[i].writeSummaryFromParcelLocked(out, NOWREAL); + } + mInputEventCounter.writeSummaryFromParcelLocked(out); mPhoneOnTimer.writeSummaryFromParcelLocked(out, NOWREAL); for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { mPhoneSignalStrengthsTimer[i].writeSummaryFromParcelLocked(out, NOWREAL); @@ -2152,9 +2422,19 @@ public final class BatteryStatsImpl extends BatteryStats { out.writeInt(mUidStats.keyAt(iu)); Uid u = mUidStats.valueAt(iu); + u.mWifiTurnedOnTimer.writeSummaryFromParcelLocked(out, NOWREAL); u.mFullWifiLockTimer.writeSummaryFromParcelLocked(out, NOWREAL); u.mScanWifiLockTimer.writeSummaryFromParcelLocked(out, NOWREAL); + if (u.mUserActivityCounters == null) { + out.writeInt(0); + } else { + out.writeInt(1); + for (int i=0; i<Uid.NUM_USER_ACTIVITY_TYPES; i++) { + u.mUserActivityCounters[i].writeSummaryFromParcelLocked(out); + } + } + int NW = u.mWakelockStats.size(); out.writeInt(NW); if (NW > 0) { @@ -2265,13 +2545,17 @@ public final class BatteryStatsImpl extends BatteryStats { mBatteryLastRealtime = in.readLong(); mScreenOn = false; mScreenOnTimer = new Timer(-1, null, mUnpluggables, in); + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + mScreenBrightnessTimer[i] = new Timer(-100-i, null, mUnpluggables, in); + } + mInputEventCounter = new Counter(mUnpluggables, in); mPhoneOn = false; mPhoneOnTimer = new Timer(-2, null, mUnpluggables, in); for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { - mPhoneSignalStrengthsTimer[i] = new Timer(-100-i, null, mUnpluggables, in); + mPhoneSignalStrengthsTimer[i] = new Timer(-200-i, null, mUnpluggables, in); } for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) { - mPhoneDataConnectionsTimer[i] = new Timer(-200-i, null, mUnpluggables, in); + mPhoneDataConnectionsTimer[i] = new Timer(-300-i, null, mUnpluggables, in); } mWifiOn = false; mWifiOnTimer = new Timer(-2, null, mUnpluggables, in); @@ -2329,6 +2613,10 @@ public final class BatteryStatsImpl extends BatteryStats { out.writeLong(mBatteryRealtime); out.writeLong(mBatteryLastRealtime); mScreenOnTimer.writeToParcel(out, batteryRealtime); + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + mScreenBrightnessTimer[i].writeToParcel(out, batteryRealtime); + } + mInputEventCounter.writeToParcel(out); mPhoneOnTimer.writeToParcel(out, batteryRealtime); for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { mPhoneSignalStrengthsTimer[i].writeToParcel(out, batteryRealtime); @@ -2381,6 +2669,12 @@ public final class BatteryStatsImpl extends BatteryStats { if (DEBUG) { pw.println("*** Screen timer:"); mScreenOnTimer.logState(pw, " "); + for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + pw.println("*** Screen brightness #" + i + ":"); + mScreenBrightnessTimer[i].logState(pw, " "); + } + pw.println("*** Input event counter:"); + mInputEventCounter.logState(pw, " "); pw.println("*** Phone timer:"); mPhoneOnTimer.logState(pw, " "); for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) { diff --git a/core/jni/android_server_BluetoothDeviceService.cpp b/core/jni/android_server_BluetoothDeviceService.cpp index 796da15..a0e0b84 100644 --- a/core/jni/android_server_BluetoothDeviceService.cpp +++ b/core/jni/android_server_BluetoothDeviceService.cpp @@ -44,6 +44,8 @@ namespace android { +#define BLUETOOTH_CLASS_ERROR 0xFF000000 + #ifdef HAVE_BLUETOOTH // We initialize these variables when we load class // android.server.BluetoothDeviceService @@ -724,11 +726,11 @@ static jstring lastUsedNative(JNIEnv *env, jobject obj, jstring address) { } static jint getRemoteClassNative(JNIEnv *env, jobject object, jstring address) { + jint result = BLUETOOTH_CLASS_ERROR; #ifdef HAVE_BLUETOOTH LOGV(__FUNCTION__); native_data_t *nat = get_native_data(env, object); if (nat) { - jint ret = 0; const char *c_address = env->GetStringUTFChars(address, NULL); LOGV("... address = %s", c_address); @@ -744,17 +746,15 @@ static jint getRemoteClassNative(JNIEnv *env, jobject object, jstring address) { DBusError err; dbus_error_init(&err); if (!dbus_message_get_args(reply, &err, - DBUS_TYPE_UINT32, &ret, + DBUS_TYPE_UINT32, &result, DBUS_TYPE_INVALID)) { LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply); } dbus_message_unref(reply); } - - return ret; } #endif - return 0; + return result; } static jbyteArray getRemoteFeaturesNative(JNIEnv *env, jobject object, diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 3a70d9a..9f6ebed 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -203,12 +203,14 @@ <!-- Allows an application to create mock location providers for testing --> <permission android:name="android.permission.ACCESS_MOCK_LOCATION" android:permissionGroup="android.permission-group.LOCATION" + android:protectionLevel="dangerous" android:label="@string/permlab_accessMockLocation" android:description="@string/permdesc_accessMockLocation" /> <!-- Allows an application to access extra location provider commands --> <permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" android:permissionGroup="android.permission-group.LOCATION" + android:protectionLevel="normal" android:label="@string/permlab_accessLocationExtraCommands" android:description="@string/permdesc_accessLocationExtraCommands" /> diff --git a/core/res/res/drawable/blank_tile.png b/core/res/res/drawable/blank_tile.png Binary files differnew file mode 100644 index 0000000..63b9296 --- /dev/null +++ b/core/res/res/drawable/blank_tile.png diff --git a/core/res/res/drawable/loading_tile.png b/core/res/res/drawable/loading_tile.png Binary files differnew file mode 100644 index 0000000..f5a80c9 --- /dev/null +++ b/core/res/res/drawable/loading_tile.png diff --git a/core/res/res/drawable/no_tile_128.png b/core/res/res/drawable/no_tile_128.png Binary files differnew file mode 100644 index 0000000..a9b007d --- /dev/null +++ b/core/res/res/drawable/no_tile_128.png diff --git a/core/res/res/layout/alert_dialog_progress.xml b/core/res/res/layout/alert_dialog_progress.xml index 9279eff..d2bb691 100644 --- a/core/res/res/layout/alert_dialog_progress.xml +++ b/core/res/res/layout/alert_dialog_progress.xml @@ -21,7 +21,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="12dip" - android:layout_marginBottom="12dip" + android:layout_marginBottom="1dip" android:layout_marginLeft="10dip" android:layout_marginRight="10dip" android:layout_centerHorizontal="true" /> @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingBottom="12dip" - android:layout_marginLeft="15dip" + android:layout_marginLeft="10dip" android:layout_marginRight="10dip" android:layout_alignParentLeft="true" android:layout_below="@id/progress" @@ -40,9 +40,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingBottom="12dip" - android:layout_marginLeft="10dip" + android:layout_marginLeft="50dip" android:layout_marginRight="15dip" - android:layout_alignParentRight="true" + android:layout_alignParentLeft="true" android:layout_below="@id/progress" /> </RelativeLayout> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index b3fca3e..35a3f9a 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"Ve výchozím nastavení není identifikace volajícího omezena. Příští hovor: Neomezeno"</string> <string name="serviceNotProvisioned">"Služba není zřízena."</string> <string name="CLIRPermanent">"Nelze změnit nastavení identifikace volajícího."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"Omezený přístup byl změněn."</string> + <string name="RestrictedOnData">"Datová služba je zablokována."</string> + <string name="RestrictedOnEmergency">"Tísňová linka je zablokována."</string> + <string name="RestrictedOnNormal">"Hlasová služba a služba SMS jsou zablokovány."</string> + <string name="RestrictedOnAll">"Veškeré hlasové služby a služby SMS jsou zablokovány."</string> <string name="serviceClassVoice">"Hlas"</string> <string name="serviceClassData">"Data"</string> <string name="serviceClassFAX">"FAX"</string> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"Prosím vložte kartu SIM."</string> <string name="lockscreen_network_locked_message">"Síť je blokována"</string> <string name="lockscreen_sim_puk_locked_message">"Karta SIM je zablokována pomocí kódu PUK."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"Další informace naleznete v uživatelské příručce, nebo kontaktujte podporu zákazníků."</string> <string name="lockscreen_sim_locked_message">"Karta SIM je zablokována."</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"Odblokování karty SIM..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"<xliff:g id="NUMBER_0">%d</xliff:g>krát jste nakreslili nesprávné bezpečnostní gesto. "\n\n"Opakujte prosím akci za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"Další"</string> <string name="ime_action_done">"Hotovo"</string> <string name="ime_action_default">"Spustit"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"Vytočit číslo"\n" <xliff:g id="NUMBER">%s</xliff:g>."</string> + <string name="create_contact_using">"Vytvořit kontakt"\n"pro <xliff:g id="NUMBER">%s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 54e8864..4d813b4 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -43,7 +43,7 @@ <string name="needPuk2">"Geben Sie zum Entsperren der SIM-Karte den PUK2 ein."</string> <string name="ClipMmi">"Anrufer-ID für eingehenden Anruf"</string> <string name="ClirMmi">"Anrufer-ID für abgehenden Anruf"</string> - <string name="CfMmi">"Anrufweiterleitung"</string> + <string name="CfMmi">"Rufweiterleitung"</string> <string name="CwMmi">"Anklopfen"</string> <string name="BaMmi">"Anrufsperre"</string> <string name="PwdMmi">"Passwort-Änderung"</string> @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"Anrufer-ID ist standardmäßig nicht beschränkt. Nächster Anruf: Nicht beschränkt"</string> <string name="serviceNotProvisioned">"Dienst nicht eingerichtet."</string> <string name="CLIRPermanent">"Die Einstellung für die Anrufer-ID kann nicht geändert werden."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"Eingeschränkter Zugriff geändert"</string> + <string name="RestrictedOnData">"Daten-Dienst ist gesperrt."</string> + <string name="RestrictedOnEmergency">"Notruf ist gesperrt."</string> + <string name="RestrictedOnNormal">"Sprach-/SMS-Dienst ist gesperrt."</string> + <string name="RestrictedOnAll">"Alle Sprach-/SMS-Dienste sind gesperrt."</string> <string name="serviceClassVoice">"Sprachnotiz"</string> <string name="serviceClassData">"Daten"</string> <string name="serviceClassFAX">"FAX"</string> @@ -113,9 +108,9 @@ <string name="global_action_toggle_silent_mode">"Lautlos"</string> <string name="global_action_silent_mode_on_status">"Ton ist bereits AUS"</string> <string name="global_action_silent_mode_off_status">"Ton ist momentan AN"</string> - <string name="global_actions_toggle_airplane_mode">"Flugzeugmodus"</string> - <string name="global_actions_airplane_mode_on_status">"Flugzeugmodus ist AN"</string> - <string name="global_actions_airplane_mode_off_status">"Flugzeugmodus ist AUS"</string> + <string name="global_actions_toggle_airplane_mode">"Flugmodus"</string> + <string name="global_actions_airplane_mode_on_status">"Flugmodus ist AN"</string> + <string name="global_actions_airplane_mode_off_status">"Flugmodus ist AUS"</string> <string name="safeMode">"Abgesicherter Modus"</string> <string name="android_system_label">"Android System"</string> <string name="permgrouplab_costMoney">"Kostenpflichtige Dienste"</string> @@ -258,7 +253,7 @@ <string name="permdesc_accessLocationExtraCommands">"Zugriff auf zusätzliche Dienstanbieterbefehle für Standort. Schädliche Anwendungen könnten so die Funktionsweise von GPS oder anderen Standortquellen beeinträchtigen."</string> <string name="permlab_accessFineLocation">"genauer (GPS-) Standort"</string> <string name="permdesc_accessFineLocation">"Zugriff auf genaue Standortquellen wie GPS auf dem Telefon (falls verfügbar). Schädliche Anwendungen können damit bestimmen, so Sie sich befinden und so Ihren Akku zusätzlich belasten."</string> - <string name="permlab_accessCoarseLocation">"Ungefährer (netzwerkbasierter) Standort"</string> + <string name="permlab_accessCoarseLocation">"ungefährer (netzwerkbasierter) Standort"</string> <string name="permdesc_accessCoarseLocation">"Greift auf Quellen mit ungefähren Standortbestimmungen wie die Datenbank des Mobilfunknetzwerks zu, um falls möglich den ungefähren Standort des Telefons zu bestimmen. Schädliche Anwendungen können damit herauszufinden, wo Sie sich ungefähr befinden."</string> <string name="permlab_accessSurfaceFlinger">"Auf SurfaceFlinger zugreifen"</string> <string name="permdesc_accessSurfaceFlinger">"Ermöglicht einer Anwendung, die systemnahen SurfaceFlinger-Funktionen zu verwenden."</string> @@ -289,13 +284,13 @@ <string name="permlab_callPrivileged">"Alle Telefonnummern direkt anrufen"</string> <string name="permdesc_callPrivileged">"Ermöglicht der Anwendung, ohne Ihr Eingreifen eine beliebige Telefonnummer zu wählen, einschließlich Notfallnummern. Schädliche Anwendungen können so unnötige und illegale Anrufe an Notdienste tätigen."</string> <string name="permlab_locationUpdates">"Benachrichtigungen für Standortaktualisierung steuern"</string> - <string name="permdesc_locationUpdates">"Ermöglicht die Aktivierung/Deaktivierung der Radio-Benachrichtigungen über Standort-Updates. Nicht für normale Anwendungen vorgesehen."</string> + <string name="permdesc_locationUpdates">"Ermöglicht die Aktivierung/Deaktivierung der Mobilfunkbenachrichtigungen über Standort-Updates. Nicht für normale Anwendungen vorgesehen."</string> <string name="permlab_checkinProperties">"Auf Check-In-Eigenschaften zugreifen"</string> <string name="permdesc_checkinProperties">"Ermöglicht den Schreib-/Lesezugriff auf vom Check-In-Service hochgeladene Elemente. Nicht für normale Anwendungen vorgesehen."</string> <string name="permlab_bindGadget">"Widgets auswählen"</string> <string name="permdesc_bindGadget">"Ermöglicht der Anwendung, dem System zu melden, welche Widgets von welcher Anwendung verwendet werden können. Mit dieser Berechtigung können Anwendungen anderen Anwendungen Zugriff auf persönliche Daten gewähren. Nicht für normale Anwendungen vorgesehen."</string> <string name="permlab_modifyPhoneState">"Telefonstatus ändern"</string> - <string name="permdesc_modifyPhoneState">"Ermöglicht einer Anwendung, die Telefonfunktionen des Gerätes zu steuern. Eine Anwendung mit dieser Berechtigung kann unter anderem das Netzwerk wechseln oder das Radio des Telefons ein- und ausschalten, ohne Sie darüber zu informieren."</string> + <string name="permdesc_modifyPhoneState">"Ermöglicht einer Anwendung, die Telefonfunktionen des Gerätes zu steuern. Eine Anwendung mit dieser Berechtigung kann unter anderem das Netzwerk wechseln oder die Mobilfunkverbindung des Telefons ein- und ausschalten, ohne Sie darüber zu informieren."</string> <string name="permlab_readPhoneState">"Telefonstatus lesen"</string> <string name="permdesc_readPhoneState">"Ermöglicht der Anwendung, auf die Telefonfunktionen des Gerätes zuzugreifen. Eine Anwendung mit dieser Berechtigung kann unter anderem bestimmen, welche Telefonnummer dieses Telefon verwendet, ob ein Anruf aktiv ist oder mit welcher Nummer der Anrufer verbunden ist."</string> <string name="permlab_wakeLock">"Standby-Modus deaktivieren"</string> @@ -393,12 +388,12 @@ </string-array> <string name="keyguard_password_enter_pin_code">"PIN-Code eingeben"</string> <string name="keyguard_password_wrong_pin_code">"Falscher PIN-Code!"</string> - <string name="keyguard_label_text">"Drücken Sie zum Entsperren auf \"Menü\" und dann auf \"0\"."</string> + <string name="keyguard_label_text">"Drücken Sie zum Entsperren die Menütaste und dann auf \"0\"."</string> <string name="emergency_call_dialog_number_for_display">"Notrufnummer"</string> <string name="lockscreen_carrier_default">"(kein Dienst)"</string> <string name="lockscreen_screen_locked">"Display gesperrt."</string> - <string name="lockscreen_instructions_when_pattern_enabled">"Drücken Sie auf \"Menü\", um das Telefon zu entsperren oder einen Notruf zu tätigen."</string> - <string name="lockscreen_instructions_when_pattern_disabled">"Drücken Sie zum Entsperren auf \"Menü\"."</string> + <string name="lockscreen_instructions_when_pattern_enabled">"Drücken Sie die Menütaste, um das Telefon zu entsperren oder einen Notruf zu tätigen."</string> + <string name="lockscreen_instructions_when_pattern_disabled">"Zum Entsperren die Menütaste drücken"</string> <string name="lockscreen_pattern_instructions">"Schema für Entsperrung zeichnen"</string> <string name="lockscreen_emergency_call">"Notruf"</string> <string name="lockscreen_pattern_correct">"Korrekt!"</string> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"Bitte legen Sie eine SIM-Karte ein."</string> <string name="lockscreen_network_locked_message">"Netzwerk gesperrt"</string> <string name="lockscreen_sim_puk_locked_message">"SIM-Karte ist gesperrt. PUK-Eingabe erforderlich."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"Weitere Informationen finden Sie in der Bedienungsanleitung oder wenden Sie sich an den Kundendienst."</string> <string name="lockscreen_sim_locked_message">"SIM-Karte ist gesperrt."</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"SIM-Karte wird entsperrt..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"Sie haben Ihr Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. "\n\n"Versuchen Sie es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string> @@ -582,7 +576,7 @@ <string name="Noon">"Mittag"</string> <string name="midnight">"Mitternacht"</string> <string name="Midnight">"Mitternacht"</string> - <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string> + <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string> <!-- no translation found for month (7026169712234774086) --> <skip /> <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g>. <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> @@ -712,7 +706,7 @@ <string name="dialog_alert_title">"Achtung"</string> <string name="capital_on">"EIN"</string> <string name="capital_off">"AUS"</string> - <string name="whichApplication">"Aktion beenden mit"</string> + <string name="whichApplication">"Aktion durchführen mit"</string> <string name="alwaysUse">"Standardmäßig für diese Aktion verwenden."</string> <string name="clearDefaultHintMsg">"Löschen Sie die Standardeinstellungen unter \"Starteinstellungen > Anwendungen > Anwendungen verwalten\"."</string> <string name="chooseActivity">"Aktion auswählen"</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"Weiter"</string> <string name="ime_action_done">"Fertig"</string> <string name="ime_action_default">"Ausführen"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"Nummer"\n"mit <xliff:g id="NUMBER">%s</xliff:g> wählen"</string> + <string name="create_contact_using">"Neuer Kontakt"\n"mit <xliff:g id="NUMBER">%s</xliff:g> erstellen"</string> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 8cacdc4..9e97b4c 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -53,17 +53,12 @@ <string name="CLIRDefaultOffNextCallOn">"El ID de emisor presenta el valor predeterminado de no restringido. Siguiente llamada: Restringido"</string> <string name="CLIRDefaultOffNextCallOff">"El ID de emisor presenta el valor predeterminado de no restringido. Siguiente llamada: No restringido"</string> <string name="serviceNotProvisioned">"El servicio no se suministra."</string> - <string name="CLIRPermanent">"El ID del emisor no se puede modificar."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="CLIRPermanent">"El ID de emisor no se puede modificar."</string> + <string name="RestrictedChangedTitle">"El acceso restringido se ha modificado."</string> + <string name="RestrictedOnData">"El servicio de datos está bloqueado."</string> + <string name="RestrictedOnEmergency">"El servicio de emergencia está bloqueado."</string> + <string name="RestrictedOnNormal">"El servicio de voz y SMS está bloqueado."</string> + <string name="RestrictedOnAll">"Todos los servicios de voz y SMS están bloqueados."</string> <string name="serviceClassVoice">"Voz"</string> <string name="serviceClassData">"Datos"</string> <string name="serviceClassFAX">"FAX"</string> @@ -393,12 +388,12 @@ </string-array> <string name="keyguard_password_enter_pin_code">"Introduce el código PIN"</string> <string name="keyguard_password_wrong_pin_code">"El código PIN es incorrecto."</string> - <string name="keyguard_label_text">"Para desbloquear el teléfono, pulsa la tecla de menú y, a continuación, pulsa 0."</string> + <string name="keyguard_label_text">"Para desbloquear el teléfono, pulsa la tecla Menu y, a continuación, pulsa 0."</string> <string name="emergency_call_dialog_number_for_display">"Número de emergencia"</string> <string name="lockscreen_carrier_default">"(Sin cobertura)"</string> <string name="lockscreen_screen_locked">"Pantalla bloqueada"</string> - <string name="lockscreen_instructions_when_pattern_enabled">"Pulsa la tecla de menú para desbloquear el teléfono o realizar una llamada de emergencia."</string> - <string name="lockscreen_instructions_when_pattern_disabled">"Pulsa la tecla de menú para desbloquear la pantalla."</string> + <string name="lockscreen_instructions_when_pattern_enabled">"Pulsa la tecla Menu para desbloquear el teléfono o realizar una llamada de emergencia."</string> + <string name="lockscreen_instructions_when_pattern_disabled">"Pulsa la tecla Menu para desbloquear la pantalla."</string> <string name="lockscreen_pattern_instructions">"Dibujar patrón de desbloqueo"</string> <string name="lockscreen_emergency_call">"Llamada de emergencia"</string> <string name="lockscreen_pattern_correct">"Correcto"</string> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"Inserta una tarjeta SIM."</string> <string name="lockscreen_network_locked_message">"Bloqueada para la red"</string> <string name="lockscreen_sim_puk_locked_message">"La tarjeta SIM está bloqueada con el código PUK."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"Consulta la guía del usuario o ponte en contacto con el servicio de atención al cliente."</string> <string name="lockscreen_sim_locked_message">"La tarjeta SIM está bloqueada."</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"Desbloqueando tarjeta SIM..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"Has realizado <xliff:g id="NUMBER_0">%d</xliff:g> intentos fallidos de creación de un patrón de desbloqueo. "\n\n"Inténtalo de nuevo dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> @@ -582,7 +576,7 @@ <string name="Noon">"Mediodía"</string> <string name="midnight">"medianoche"</string> <string name="Midnight">"Medianoche"</string> - <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string> + <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string> <!-- no translation found for month (7026169712234774086) --> <skip /> <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string> @@ -798,7 +792,7 @@ <string name="activity_list_empty">"No se ha encontrado ninguna actividad coincidente."</string> <string name="permlab_pkgUsageStats">"actualizar estadísticas de uso de componentes"</string> <string name="permdesc_pkgUsageStats">"Permite la modificación de estadísticas recopiladas sobre el uso de componentes. No está destinado al uso por parte de aplicaciones normales."</string> - <string name="tutorial_double_tap_to_zoom_message_short">"Pulsa dos veces para acceder al control de zoom."</string> + <string name="tutorial_double_tap_to_zoom_message_short">"Da dos toques para acceder al control de zoom."</string> <string name="gadget_host_error_inflating">"Error al aumentar el widget"</string> <string name="ime_action_go">"Ir"</string> <string name="ime_action_search">"Buscar"</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"Siguiente"</string> <string name="ime_action_done">"Hecho"</string> <string name="ime_action_default">"Ejecutar"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"Marcar número"\n"con <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using">"Crear un contacto"\n"a partir de <xliff:g id="NUMBER">%s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 6e76fe7..46d63e3 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"Par défaut, les identifiants d\'appelant ne sont pas restreints. Appel suivant : non restreint"</string> <string name="serviceNotProvisioned">"Ce service n\'est pas pris en charge."</string> <string name="CLIRPermanent">"Le paramètre Identifiant d\'appelant ne peut pas être modifié."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"L\'accès limité a été modifié."</string> + <string name="RestrictedOnData">"Le service de données est bloqué."</string> + <string name="RestrictedOnEmergency">"Le service d\'appel d\'urgence est bloqué."</string> + <string name="RestrictedOnNormal">"Le service vocal/SMS est bloqué."</string> + <string name="RestrictedOnAll">"Tous les services vocaux/SMS sont bloqués."</string> <string name="serviceClassVoice">"Voix"</string> <string name="serviceClassData">"Données"</string> <string name="serviceClassFAX">"Télécopie"</string> @@ -350,7 +345,7 @@ <string name="permdesc_writeDictionary">"Permet à une application d\'enregistrer de nouveaux mots dans le dictionnaire personnel de l\'utilisateur."</string> <string-array name="phoneTypes"> <item>"Domicile"</item> - <item>"Mobile"</item> + <item>"Portable"</item> <item>"Bureau"</item> <item>"Télécopie bureau"</item> <item>"Télécopie domicile"</item> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"Insérez une carte SIM."</string> <string name="lockscreen_network_locked_message">"Réseau verrouillé"</string> <string name="lockscreen_sim_puk_locked_message">"La carte SIM est verrouillée par code PUK."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"Veuillez consulter le guide d\'utilisation ou contacter l\'assistance clientèle."</string> <string name="lockscreen_sim_locked_message">"Téléphone verrouillé"</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"Déblocage de la carte SIM..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"Vous avez mal reproduit le motif de déverrouillage <xliff:g id="NUMBER_0">%d</xliff:g> fois. "\n\n"Veuillez réessayer dans <xliff:g id="NUMBER_1">%d</xliff:g> secondes."</string> @@ -534,8 +528,8 @@ <string name="days">"jours"</string> <string name="hour">"heure"</string> <string name="hours">"heures"</string> - <string name="minute">"mn"</string> - <string name="minutes">"mn"</string> + <string name="minute">"min"</string> + <string name="minutes">"min"</string> <string name="second">"s"</string> <string name="seconds">"s"</string> <string name="week">"semaine"</string> @@ -582,7 +576,7 @@ <string name="Noon">"Midi"</string> <string name="midnight">"minuit"</string> <string name="Midnight">"Minuit"</string> - <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string> + <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string> <!-- no translation found for month (7026169712234774086) --> <skip /> <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> @@ -794,7 +788,7 @@ <string name="ext_media_safe_unmount_notification_title">"La carte SD peut être retirée en toute sécurité"</string> <string name="ext_media_safe_unmount_notification_message">"Vous pouvez désormais retirer la carte SD en toute sécurité."</string> <string name="ext_media_nomedia_notification_title">"Carte SD manquante"</string> - <string name="ext_media_nomedia_notification_message">"La carte SD a été retirée. Insérez une autre carte pour augmenter la capacité de stockage de votre appareil."</string> + <string name="ext_media_nomedia_notification_message">"Carte SD manquante. Insérez une autre carte pour augmenter la capacité de stockage."</string> <string name="activity_list_empty">"Aucune activité correspondante trouvée"</string> <string name="permlab_pkgUsageStats">"mettre à jour les données statistiques du composant"</string> <string name="permdesc_pkgUsageStats">"Permet de modifier les données statistiques collectées du composant. Cette option n\'est pas utilisée par les applications standard."</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"Suivant"</string> <string name="ime_action_done">"Terminé"</string> <string name="ime_action_default">"Exécuter"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"Composer le numéro"\n"en utilisant <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using">"Ajouter un contact"\n"en utilisant <xliff:g id="NUMBER">%s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 50e25c0..f80a4f4 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"ID chiamante generalmente non limitato. Prossima chiamata: non limitato"</string> <string name="serviceNotProvisioned">"Servizio non fornito."</string> <string name="CLIRPermanent">"Impossibile modificare l\'impostazione dell\'ID del chiamante."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"Accesso limitato modificato"</string> + <string name="RestrictedOnData">"Il servizio dati è bloccato."</string> + <string name="RestrictedOnEmergency">"Il servizio di emergenza è bloccato."</string> + <string name="RestrictedOnNormal">"Il servizio vocale/SMS è bloccato."</string> + <string name="RestrictedOnAll">"Tutti i servizi vocali/SMS sono bloccati."</string> <string name="serviceClassVoice">"Voce"</string> <string name="serviceClassData">"Dati"</string> <string name="serviceClassFAX">"FAX"</string> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"Inserisci una SIM."</string> <string name="lockscreen_network_locked_message">"Rete bloccata"</string> <string name="lockscreen_sim_puk_locked_message">"La SIM è bloccata tramite PUK."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"Consulta il Manuale utente o contatta il servizio clienti."</string> <string name="lockscreen_sim_locked_message">"La SIM è bloccata."</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"Sblocco SIM..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"<xliff:g id="NUMBER_0">%d</xliff:g> tentativi di inserimento della sequenza di sblocco. "\n\n"Riprova fra <xliff:g id="NUMBER_1">%d</xliff:g> secondi."</string> @@ -582,7 +576,7 @@ <string name="Noon">"Mezzogiorno"</string> <string name="midnight">"mezzanotte"</string> <string name="Midnight">"Mezzanotte"</string> - <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string> + <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string> <!-- no translation found for month (7026169712234774086) --> <skip /> <string name="month_day_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"Avanti"</string> <string name="ime_action_done">"Fine"</string> <string name="ime_action_default">"Esegui"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"Componi numero"\n"utilizzando <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using">"Crea contatto"\n"utilizzando <xliff:g id="NUMBER">%s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index ccc7f19..36a3b75 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -42,8 +42,8 @@ <string name="needPuk">"SIMカードはPUKでロックされています。ロックを解除するにはPUKコードを入力してください。"</string> <string name="needPuk2">"SIMカードのロック解除のためPUK2を入力します。"</string> <string name="ClipMmi">"着信時の発信者番号"</string> - <string name="ClirMmi">"発信時の発信者番号"</string> - <string name="CfMmi">"電話の転送"</string> + <string name="ClirMmi">"発信者番号"</string> + <string name="CfMmi">"着信転送"</string> <string name="CwMmi">"通話中着信"</string> <string name="BaMmi">"発信制限"</string> <string name="PwdMmi">"パスワードの変更"</string> @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"既定: 発信者番号通知、次の発信: 通知"</string> <string name="serviceNotProvisioned">"提供可能なサービスがありません。"</string> <string name="CLIRPermanent">"発信者番号の設定は変更できません。"</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"アクセス制限が変更されました"</string> + <string name="RestrictedOnData">"データサービスがブロックされています。"</string> + <string name="RestrictedOnEmergency">"緊急サービスがブロックされています。"</string> + <string name="RestrictedOnNormal">"音声/SMSサービスがブロックされています。"</string> + <string name="RestrictedOnAll">"すべての音声/SMSサービスがブロックされています。"</string> <string name="serviceClassVoice">"音声"</string> <string name="serviceClassData">"データ"</string> <string name="serviceClassFAX">"FAX"</string> @@ -143,7 +138,7 @@ <string name="permlab_expandStatusBar">"ステータスバーの拡大/縮小"</string> <string name="permdesc_expandStatusBar">"ステータスバーの拡大や縮小をアプリケーションに許可します。"</string> <string name="permlab_processOutgoingCalls">"発信の傍受"</string> - <string name="permdesc_processOutgoingCalls">"通話の発信とダイヤルする番号の変更とをアプリケーションに許可します。悪意のあるアプリケーションが発信を監視、転送、阻止する恐れがあります。"</string> + <string name="permdesc_processOutgoingCalls">"通話発信とダイヤルする番号の変更をアプリケーションに許可します。悪意のあるアプリケーションが発信を監視、転送、阻止する恐れがあります。"</string> <string name="permlab_receiveSms">"SMSの受信"</string> <string name="permdesc_receiveSms">"SMSメッセージの受信と処理をアプリケーションに許可します。悪意のあるアプリケーションがメッセージを監視したり、表示せずに削除する恐れがあります。"</string> <string name="permlab_receiveMms">"MMSの受信"</string> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"SIMカードを挿入してください。"</string> <string name="lockscreen_network_locked_message">"ネットワークがロックされました"</string> <string name="lockscreen_sim_puk_locked_message">"SIMカードはPUKでロックされています。"</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"ユーザーガイドを参照するか、お客様サポートにお問い合わせください。"</string> <string name="lockscreen_sim_locked_message">"SIMカードはロックされています。"</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"SIMカードのロック解除中..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"ロック解除のパターンは<xliff:g id="NUMBER_0">%d</xliff:g>回とも正しく指定されていません。"\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>秒後にもう一度指定してください。"</string> @@ -572,11 +566,11 @@ <string name="date_time">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="relative_time">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="time_wday">"<xliff:g id="WEEKDAY">%2$s</xliff:g>、<xliff:g id="TIME_RANGE">%1$s</xliff:g>"</string> - <string name="full_date_month_first" format="date">"<xliff:g id="YEAR">yyyy</xliff:g>'/'<xliff:g id="MONTH">MMMM</xliff:g>'/'<xliff:g id="DAY">d</xliff:g>"</string> + <string name="full_date_month_first" format="date">"<xliff:g id="MONTH">MMMM</xliff:g><xliff:g id="DAY">d</xliff:g>'日 '<xliff:g id="YEAR">yyyy</xliff:g>"</string> <string name="full_date_day_first" format="date">"<xliff:g id="YEAR">yyyy</xliff:g>'年'<xliff:g id="MONTH">MMMM</xliff:g>'月'<xliff:g id="DAY">d</xliff:g>'日'"</string> <string name="medium_date_month_first" format="date">"<xliff:g id="MONTH">MMM</xliff:g>'/'<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>'年'"</string> <string name="medium_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>'/'<xliff:g id="MONTH">MMM</xliff:g>'/'<xliff:g id="YEAR">yyyy</xliff:g>"</string> - <string name="twelve_hour_time_format" format="date">"<xliff:g id="HOUR">h</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>' '<xliff:g id="AMPM">a</xliff:g>"</string> + <string name="twelve_hour_time_format" format="date">"<xliff:g id="AMPM">a</xliff:g><xliff:g id="HOUR">h</xliff:g>'時'<xliff:g id="MINUTE">mm</xliff:g>'分'"</string> <string name="twenty_four_hour_time_format" format="date">"<xliff:g id="HOUR">HH</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>"</string> <string name="noon">"正午"</string> <string name="Noon">"正午"</string> @@ -586,16 +580,16 @@ <!-- no translation found for month (7026169712234774086) --> <skip /> <string name="month_day_year">"<xliff:g id="YEAR">%Y</xliff:g>年<xliff:g id="MONTH">%B</xliff:g><xliff:g id="DAY">%-d</xliff:g>日"</string> - <string name="month_year">"<xliff:g id="YEAR">%Y</xliff:g>年<xliff:g id="MONTH">%B</xliff:g>月"</string> + <string name="month_year">"<xliff:g id="YEAR">%Y</xliff:g>年<xliff:g id="MONTH">%B</xliff:g>"</string> <string name="time_of_day">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string> <string name="date_and_time">"<xliff:g id="YEAR">%Y</xliff:g>/<xliff:g id="MONTH">%B</xliff:g>/<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string> - <string name="same_year_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日～<xliff:g id="MONTH2">%7$s</xliff:g>月<xliff:g id="DAY2">%8$s</xliff:g>日"</string> + <string name="same_year_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>"</string> <string name="same_year_wday1_md1_wday2_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string> - <string name="same_year_mdy1_mdy2">"<xliff:g id="YEAR">%9$s</xliff:g>年<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日～<xliff:g id="MONTH2">%7$s</xliff:g>月<xliff:g id="DAY2">%8$s</xliff:g>日"</string> + <string name="same_year_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR">%9$s</xliff:g>"</string> <string name="same_year_wday1_mdy1_wday2_mdy2">"<xliff:g id="YEAR">%9$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string> - <string name="same_year_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日<xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>月<xliff:g id="DAY2">%8$s</xliff:g>日<xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_year_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="TIME2">%10$s</xliff:g>"</string> <string name="same_year_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="same_year_mdy1_time1_mdy2_time2">"<xliff:g id="YEAR1">%4$s</xliff:g>年<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日 <xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>年<xliff:g id="MONTH2">%7$s</xliff:g>月<xliff:g id="DAY2">%8$s</xliff:g>日 <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_year_mdy1_time1_mdy2_time2">"<xliff:g id="YEAR1">%4$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>/<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="TIME2">%10$s</xliff:g>"</string> <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="YEAR1">%4$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>/<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string> <string name="numeric_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>"</string> <string name="numeric_wday1_md1_wday2_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string> @@ -607,7 +601,7 @@ <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="YEAR1">%4$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>/<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string> <string name="same_month_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日～<xliff:g id="DAY2">%8$s</xliff:g>日"</string> <string name="same_month_wday1_md1_wday2_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string> - <string name="same_month_mdy1_mdy2">"<xliff:g id="YEAR2">%9$s</xliff:g>年<xliff:g id="MONTH1">%2$s</xliff:g>月<xliff:g id="DAY1">%3$s</xliff:g>日～<xliff:g id="DAY2">%8$s</xliff:g>日"</string> + <string name="same_month_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g> - <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>"</string> <string name="same_month_wday1_mdy1_wday2_mdy2">"<xliff:g id="YEAR1">%4$s</xliff:g>/<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g>～<xliff:g id="YEAR2">%9$s</xliff:g>/<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g>"</string> <string name="same_month_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string> <string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g><xliff:g id="WEEKDAY1">%1$s</xliff:g><xliff:g id="TIME1">%5$s</xliff:g>～<xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g><xliff:g id="WEEKDAY2">%6$s</xliff:g><xliff:g id="TIME2">%10$s</xliff:g>"</string> @@ -625,13 +619,13 @@ <string name="day_of_week_long_thursday">"木曜日"</string> <string name="day_of_week_long_friday">"金曜日"</string> <string name="day_of_week_long_saturday">"土曜日"</string> - <string name="day_of_week_medium_sunday">"（日）"</string> - <string name="day_of_week_medium_monday">"（月）"</string> - <string name="day_of_week_medium_tuesday">"（火）"</string> - <string name="day_of_week_medium_wednesday">"（水）"</string> - <string name="day_of_week_medium_thursday">"（木）"</string> - <string name="day_of_week_medium_friday">"（金）"</string> - <string name="day_of_week_medium_saturday">"（土）"</string> + <string name="day_of_week_medium_sunday">"(日)"</string> + <string name="day_of_week_medium_monday">"(月)"</string> + <string name="day_of_week_medium_tuesday">"(火)"</string> + <string name="day_of_week_medium_wednesday">"(水)"</string> + <string name="day_of_week_medium_thursday">"(木)"</string> + <string name="day_of_week_medium_friday">"(金)"</string> + <string name="day_of_week_medium_saturday">"(土)"</string> <string name="day_of_week_short_sunday">"日"</string> <string name="day_of_week_short_monday">"月"</string> <string name="day_of_week_short_tuesday">"火"</string> @@ -665,18 +659,18 @@ <string name="month_long_october">"10月"</string> <string name="month_long_november">"11月"</string> <string name="month_long_december">"12月"</string> - <string name="month_medium_january">"1月"</string> - <string name="month_medium_february">"2月"</string> - <string name="month_medium_march">"3月"</string> - <string name="month_medium_april">"4月"</string> - <string name="month_medium_may">"5月"</string> - <string name="month_medium_june">"6月"</string> - <string name="month_medium_july">"7月"</string> - <string name="month_medium_august">"8月"</string> - <string name="month_medium_september">"9月"</string> - <string name="month_medium_october">"10月"</string> - <string name="month_medium_november">"11月"</string> - <string name="month_medium_december">"12月"</string> + <string name="month_medium_january">"1"</string> + <string name="month_medium_february">"2"</string> + <string name="month_medium_march">"3"</string> + <string name="month_medium_april">"4"</string> + <string name="month_medium_may">"5"</string> + <string name="month_medium_june">"6"</string> + <string name="month_medium_july">"7"</string> + <string name="month_medium_august">"8"</string> + <string name="month_medium_september">"9"</string> + <string name="month_medium_october">"10"</string> + <string name="month_medium_november">"11"</string> + <string name="month_medium_december">"12"</string> <string name="month_shortest_january">"1"</string> <string name="month_shortest_february">"2"</string> <string name="month_shortest_march">"3"</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"次へ"</string> <string name="ime_action_done">"完了"</string> <string name="ime_action_default">"実行"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"<xliff:g id="NUMBER">%s</xliff:g>を使って"\n"発信"</string> + <string name="create_contact_using">"<xliff:g id="NUMBER">%s</xliff:g>を使って"\n"連絡先を新規登録"</string> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index f44332a..96b897a 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"발신자 번호가 기본적으로 제한되지 않음으로 설정됩니다. 다음 통화: 제한되지 않음"</string> <string name="serviceNotProvisioned">"서비스가 준비되지 않았습니다."</string> <string name="CLIRPermanent">"발신자 번호 설정을 변경할 수 없습니다."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"제한된 액세스가 변경되었습니다."</string> + <string name="RestrictedOnData">"데이터 서비스가 차단되었습니다."</string> + <string name="RestrictedOnEmergency">"응급 서비스가 차단되었습니다."</string> + <string name="RestrictedOnNormal">"음성/SMS 서비스가 차단되었습니다."</string> + <string name="RestrictedOnAll">"모든 음성/SMS 서비스가 차단되었습니다."</string> <string name="serviceClassVoice">"음성"</string> <string name="serviceClassData">"데이터"</string> <string name="serviceClassFAX">"팩스"</string> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"SIM 카드를 삽입하세요."</string> <string name="lockscreen_network_locked_message">"네트워크 잠김"</string> <string name="lockscreen_sim_puk_locked_message">"SIM 카드의 PUK가 잠겨 있습니다."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"사용자 가이드를 참조하거나 고객지원팀에 문의하세요."</string> <string name="lockscreen_sim_locked_message">"SIM 카드가 잠겨 있습니다."</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"SIM 카드 잠금해제 중..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"잠금해제 패턴을 <xliff:g id="NUMBER_0">%d</xliff:g>회 잘못 가져왔습니다. "\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>초 후에 다시 시도하세요."</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"다음"</string> <string name="ime_action_done">"완료"</string> <string name="ime_action_default">"실행"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"다음 번호로 전화걸기"\n": <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using">"다음 번호로 주소록 만들기"\n": <xliff:g id="NUMBER">%s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index fc7ddca..3a9e32c 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -39,7 +39,7 @@ <string name="badPuk">"De PUK-code die u heeft ingevoerd, is onjuist."</string> <string name="mismatchPin">"De PIN-codes die u heeft ingevoerd, komen niet overeen."</string> <string name="invalidPin">"Voer een PIN-code van 4 tot 8 cijfers in."</string> - <string name="needPuk">"Uw SIM-kaart is geblokkeerd met de PUK-code. Typ de PUK-code om de blokkering op te heffen."</string> + <string name="needPuk">"Uw SIM-kaart is vergrendeld met de PUK-code. Typ de PUK-code om te ontgrendelen."</string> <string name="needPuk2">"Voer de PUK2-code in om de SIM-kaart te ontgrendelen."</string> <string name="ClipMmi">"Inkomende beller-id"</string> <string name="ClirMmi">"Uitgaande beller-id"</string> @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"Beller-id standaard ingesteld op \'onbeperkt\'. Volgende oproep: onbeperkt."</string> <string name="serviceNotProvisioned">"Service niet voorzien."</string> <string name="CLIRPermanent">"De instelling voor beller-id kan niet worden gewijzigd."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"Beperkte toegang gewijzigd"</string> + <string name="RestrictedOnData">"Gegevensservice is geblokkeerd."</string> + <string name="RestrictedOnEmergency">"Alarmservice is geblokkeerd."</string> + <string name="RestrictedOnNormal">"Spraak-/SMS-service is geblokkeerd."</string> + <string name="RestrictedOnAll">"Alle spraak-/SMS-services zijn geblokkeerd."</string> <string name="serviceClassVoice">"Spraak"</string> <string name="serviceClassData">"Gegevens"</string> <string name="serviceClassFAX">"FAX"</string> @@ -102,13 +97,13 @@ <string name="silent_mode">"Stille modus"</string> <string name="turn_on_radio">"Draadloos inschakelen"</string> <string name="turn_off_radio">"Draadloos uitschakelen"</string> - <string name="screen_lock">"Schermblokkering"</string> + <string name="screen_lock">"Schermvergrendeling"</string> <string name="power_off">"Uitschakelen"</string> <string name="shutdown_progress">"Uitschakelen..."</string> <string name="shutdown_confirm">"Uw telefoon wordt uitgeschakeld."</string> <string name="no_recent_tasks">"Geen recente toepassingen."</string> <string name="global_actions">"Telefoonopties"</string> - <string name="global_action_lock">"Schermblokkering"</string> + <string name="global_action_lock">"Schermvergrendeling"</string> <string name="global_action_power_off">"Uitschakelen"</string> <string name="global_action_toggle_silent_mode">"Stille modus"</string> <string name="global_action_silent_mode_on_status">"Geluid is UIT"</string> @@ -332,8 +327,8 @@ <string name="permdesc_bluetoothAdmin">"Hiermee kan een toepassing de lokale Bluetooth-telefoon configureren en externe apparaten zoeken en aansluiten."</string> <string name="permlab_bluetooth">"Bluetooth-verbindingen maken"</string> <string name="permdesc_bluetooth">"Hiermee kan een toepassing de configuratie van een lokale Bluetooth-telefoon bekijken en verbindingen met gekoppelde apparaten maken en accepteren."</string> - <string name="permlab_disableKeyguard">"toetsblokkering uitschakelen"</string> - <string name="permdesc_disableKeyguard">"Hiermee kan een toepassing de toetsblokkering en bijbehorende wachtwoordbeveiliging uitschakelen. Een voorbeeld: de telefoon schakelt de toetsblokkering uit als er een oproep binnenkomt en schakelt de toetsblokkering weer in als de oproep is beëindigd."</string> + <string name="permlab_disableKeyguard">"toetsvergrendeling uitschakelen"</string> + <string name="permdesc_disableKeyguard">"Hiermee kan een toepassing de toetsvergrendeling en bijbehorende wachtwoordbeveiliging uitschakelen. Een voorbeeld: de telefoon schakelt de toetsvergrendeling uit als er een oproep binnenkomt en schakelt de toetsvergrendeling weer in als de oproep is beëindigd."</string> <string name="permlab_readSyncSettings">"synchronisatie-instellingen lezen"</string> <string name="permdesc_readSyncSettings">"Hiermee kan een toepassing de synchronisatie-instellingen lezen, bijvoorbeeld of de synchronisatie van contacten is ingeschakeld."</string> <string name="permlab_writeSyncSettings">"synchronisatie-instellingen schrijven"</string> @@ -396,7 +391,7 @@ <string name="keyguard_label_text">"Druk op \'Menu\' en vervolgens op 0 om te ontgrendelen."</string> <string name="emergency_call_dialog_number_for_display">"Alarmnummer"</string> <string name="lockscreen_carrier_default">"(Geen service)"</string> - <string name="lockscreen_screen_locked">"Scherm geblokkeerd."</string> + <string name="lockscreen_screen_locked">"Scherm vergrendeld."</string> <string name="lockscreen_instructions_when_pattern_enabled">"Druk op \'Menu\' om te ontgrendelen of noodoproep te plaatsen."</string> <string name="lockscreen_instructions_when_pattern_disabled">"Druk op \'Menu\' om te ontgrendelen."</string> <string name="lockscreen_pattern_instructions">"Patroon tekenen om te ontgrendelen"</string> @@ -408,14 +403,13 @@ <string name="lockscreen_missing_sim_message_short">"Geen SIM-kaart."</string> <string name="lockscreen_missing_sim_message">"Geen SIM-kaart in telefoon."</string> <string name="lockscreen_missing_sim_instructions">"Plaats een SIM-kaart."</string> - <string name="lockscreen_network_locked_message">"Netwerk geblokkeerd"</string> - <string name="lockscreen_sim_puk_locked_message">"SIM-kaart is geblokkeerd met PUK-code."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> - <string name="lockscreen_sim_locked_message">"SIM-kaart is geblokkeerd."</string> + <string name="lockscreen_network_locked_message">"Netwerk vergrendeld"</string> + <string name="lockscreen_sim_puk_locked_message">"SIM-kaart is vergrendeld met PUK-code."</string> + <string name="lockscreen_sim_puk_locked_instructions">"Raadpleeg de gebruikershandleiding of neem contact op met de klantenservice."</string> + <string name="lockscreen_sim_locked_message">"SIM-kaart is vergrendeld."</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"SIM-kaart ontgrendelen..."</string> - <string name="lockscreen_too_many_failed_attempts_dialog_message">"U heeft uw deblokkeringspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string> - <string name="lockscreen_failed_attempts_almost_glogin">"U heeft uw deblokkeringspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. Na nog eens <xliff:g id="NUMBER_1">%d</xliff:g> mislukte pogingen, wordt u gevraagd om uw telefoon te ontgrendelen met uw Google aanmelding."\n\n" Probeer het over <xliff:g id="NUMBER_2">%d</xliff:g> seconden opnieuw."</string> + <string name="lockscreen_too_many_failed_attempts_dialog_message">"U heeft uw ontgrendelingspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string> + <string name="lockscreen_failed_attempts_almost_glogin">"U heeft uw ontgrendelingspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. Na nog eens <xliff:g id="NUMBER_1">%d</xliff:g> mislukte pogingen, wordt u gevraagd om uw telefoon te ontgrendelen met uw Google aanmelding."\n\n" Probeer het over <xliff:g id="NUMBER_2">%d</xliff:g> seconden opnieuw."</string> <string name="lockscreen_too_many_failed_attempts_countdown">"Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string> <string name="lockscreen_forgot_pattern_button_text">"Patroon vergeten?"</string> <string name="lockscreen_glogin_too_many_attempts">"Te veel patroonpogingen!"</string> @@ -560,62 +554,62 @@ <string name="VideoView_error_button">"OK"</string> <string name="am">"am"</string> <string name="pm">"pm"</string> - <string name="numeric_date">"<xliff:g id="MONTH">%m</xliff:g>/<xliff:g id="DAY">%d</xliff:g>/<xliff:g id="YEAR">%Y</xliff:g>"</string> - <string name="wday1_date1_time1_wday2_date2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="DATE1">%2$s</xliff:g>, <xliff:g id="TIME1">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%4$s</xliff:g>, <xliff:g id="DATE2">%5$s</xliff:g>, <xliff:g id="TIME2">%6$s</xliff:g>"</string> - <string name="wday1_date1_wday2_date2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="DATE1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%4$s</xliff:g>, <xliff:g id="DATE2">%5$s</xliff:g>"</string> + <string name="numeric_date">"<xliff:g id="DAY">%d</xliff:g>-<xliff:g id="MONTH">%m</xliff:g>-<xliff:g id="YEAR">%Y</xliff:g>"</string> + <string name="wday1_date1_time1_wday2_date2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DATE1">%2$s</xliff:g>, <xliff:g id="TIME1">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%4$s</xliff:g> <xliff:g id="DATE2">%5$s</xliff:g>, <xliff:g id="TIME2">%6$s</xliff:g>"</string> + <string name="wday1_date1_wday2_date2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DATE1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%4$s</xliff:g> <xliff:g id="DATE2">%5$s</xliff:g>"</string> <string name="date1_time1_date2_time2">"<xliff:g id="DATE1">%2$s</xliff:g>, <xliff:g id="TIME1">%3$s</xliff:g> – <xliff:g id="DATE2">%5$s</xliff:g>, <xliff:g id="TIME2">%6$s</xliff:g>"</string> <string name="date1_date2">"<xliff:g id="DATE1">%2$s</xliff:g> – <xliff:g id="DATE2">%5$s</xliff:g>"</string> <string name="time1_time2">"<xliff:g id="TIME1">%1$s</xliff:g> – <xliff:g id="TIME2">%2$s</xliff:g>"</string> - <string name="time_wday_date">"<xliff:g id="TIME_RANGE">%1$s</xliff:g>, <xliff:g id="WEEKDAY">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>"</string> - <string name="wday_date">"<xliff:g id="WEEKDAY">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>"</string> + <string name="time_wday_date">"<xliff:g id="TIME_RANGE">%1$s</xliff:g>, <xliff:g id="WEEKDAY">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string> + <string name="wday_date">"<xliff:g id="WEEKDAY">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string> <string name="time_date">"<xliff:g id="TIME_RANGE">%1$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>"</string> <string name="date_time">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="relative_time">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="time_wday">"<xliff:g id="TIME_RANGE">%1$s</xliff:g>, <xliff:g id="WEEKDAY">%2$s</xliff:g>"</string> - <string name="full_date_month_first" format="date">"<xliff:g id="MONTH">MMMM</xliff:g>' '<xliff:g id="DAY">d</xliff:g>', '<xliff:g id="YEAR">yyyy</xliff:g>"</string> - <string name="full_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMMM</xliff:g>', '<xliff:g id="YEAR">yyyy</xliff:g>"</string> - <string name="medium_date_month_first" format="date">"<xliff:g id="MONTH">MMM</xliff:g>' '<xliff:g id="DAY">d</xliff:g>', '<xliff:g id="YEAR">yyyy</xliff:g>"</string> - <string name="medium_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMM</xliff:g>', '<xliff:g id="YEAR">yyyy</xliff:g>"</string> + <string name="full_date_month_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMMM</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>"</string> + <string name="full_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMMM</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>"</string> + <string name="medium_date_month_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMM</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>"</string> + <string name="medium_date_day_first" format="date">"<xliff:g id="DAY">d</xliff:g>' '<xliff:g id="MONTH">MMM</xliff:g>' '<xliff:g id="YEAR">yyyy</xliff:g>"</string> <string name="twelve_hour_time_format" format="date">"<xliff:g id="HOUR">h</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>' '<xliff:g id="AMPM">a</xliff:g>"</string> <string name="twenty_four_hour_time_format" format="date">"<xliff:g id="HOUR">HH</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>"</string> <string name="noon">"twaalf uur \'s middags"</string> <string name="Noon">"Twaalf uur \'s middags"</string> <string name="midnight">"middernacht"</string> <string name="Midnight">"Middernacht"</string> - <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string> + <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string> <!-- no translation found for month (7026169712234774086) --> <skip /> - <string name="month_day_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string> + <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> <string name="month_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> <string name="time_of_day">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string> - <string name="date_and_time">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string> - <string name="same_year_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>"</string> - <string name="same_year_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>"</string> - <string name="same_year_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR">%9$s</xliff:g>"</string> - <string name="same_year_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR">%9$s</xliff:g>"</string> - <string name="same_year_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="same_year_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="numeric_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>"</string> - <string name="numeric_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g>"</string> - <string name="numeric_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>/<xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>/<xliff:g id="YEAR2">%9$s</xliff:g>"</string> - <string name="numeric_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g>/<xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g>/<xliff:g id="YEAR2">%9$s</xliff:g>"</string> - <string name="numeric_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="numeric_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1">%3$s</xliff:g>/<xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2">%8$s</xliff:g>/<xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g>/<xliff:g id="DAY1_0">%3$s</xliff:g>/<xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g>/<xliff:g id="DAY2_1">%8$s</xliff:g>/<xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="same_month_md1_md2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>"</string> - <string name="same_month_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>"</string> - <string name="same_month_mdy1_mdy2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>"</string> - <string name="same_month_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>"</string> - <string name="same_month_md1_time1_md2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="same_month_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="abbrev_month_day_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string> + <string name="date_and_time">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g> <xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> + <string name="same_year_md1_md2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>"</string> + <string name="same_year_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>"</string> + <string name="same_year_mdy1_mdy2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR">%9$s</xliff:g>"</string> + <string name="same_year_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR">%9$s</xliff:g>"</string> + <string name="same_year_md1_time1_md2_time2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_year_mdy1_time1_mdy2_time2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="numeric_md1_md2">"<xliff:g id="DAY1">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>"</string> + <string name="numeric_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>"</string> + <string name="numeric_mdy1_mdy2">"<xliff:g id="DAY1">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>-<xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>-<xliff:g id="YEAR2">%9$s</xliff:g>"</string> + <string name="numeric_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>-<xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>-<xliff:g id="YEAR2">%9$s</xliff:g>"</string> + <string name="numeric_md1_time1_md2_time2">"<xliff:g id="DAY1">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="numeric_mdy1_time1_mdy2_time2">"<xliff:g id="DAY1">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>-<xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>-<xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>-<xliff:g id="MONTH1">%2$s</xliff:g>-<xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>-<xliff:g id="MONTH2">%7$s</xliff:g>-<xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_month_md1_md2">"<xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>"</string> + <string name="same_month_wday1_md1_wday2_md2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>"</string> + <string name="same_month_mdy1_mdy2">"<xliff:g id="DAY1">%3$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>"</string> + <string name="same_month_wday1_mdy1_wday2_mdy2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>"</string> + <string name="same_month_md1_time1_md2_time2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_month_mdy1_time1_mdy2_time2">"<xliff:g id="DAY1">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="DAY2">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g> <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g> <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> + <string name="abbrev_month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> <string name="abbrev_month_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> - <string name="abbrev_month_day">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string> + <string name="abbrev_month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%b</xliff:g>"</string> <!-- no translation found for abbrev_month (3131032032850777433) --> <skip /> <string name="day_of_week_long_sunday">"Zondag"</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"Volgende"</string> <string name="ime_action_done">"Gereed"</string> <string name="ime_action_default">"Uitvoeren"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"Nummer bellen"\n"met <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using">"Contact maken"\n"met <xliff:g id="NUMBER">%s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 9ac2795..50d245b 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"Identyfikator dzwoniącego ustawiony jest domyślnie na „nie zastrzeżony”. Następne połączenie: nie zastrzeżony"</string> <string name="serviceNotProvisioned">"Usługa nie jest świadczona."</string> <string name="CLIRPermanent">"Nie można zmienić ustawienia identyfikatora dzwoniącego."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"Zmieniono ograniczenie dostępu"</string> + <string name="RestrictedOnData">"Usługa transmisji danych jest zablokowana."</string> + <string name="RestrictedOnEmergency">"Usługa połączeń alarmowych jest zablokowana."</string> + <string name="RestrictedOnNormal">"Usługa głosowa/SMS jest zablokowana."</string> + <string name="RestrictedOnAll">"Wszystkie usługi głosowe/SMS są zablokowane."</string> <string name="serviceClassVoice">"Głos"</string> <string name="serviceClassData">"Dane"</string> <string name="serviceClassFAX">"FAKS"</string> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"Włóż kartę SIM."</string> <string name="lockscreen_network_locked_message">"Sieć zablokowana"</string> <string name="lockscreen_sim_puk_locked_message">"Karta SIM jest zablokowana kodem PUK."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"Zapoznaj się z instrukcją obsługi lub skontaktuj się z działem obsługi klienta."</string> <string name="lockscreen_sim_locked_message">"Karta SIM jest zablokowana."</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"Odblokowywanie karty SIM..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"Wzór odblokowania został nieprawidłowo narysowany <xliff:g id="NUMBER_0">%d</xliff:g> razy. "\n\n"Spróbuj ponownie za <xliff:g id="NUMBER_1">%d</xliff:g> sekund."</string> @@ -431,7 +425,7 @@ <string name="hour_cap_ampm">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button">"Wyczyść powiadomienia"</string> <string name="status_bar_no_notifications_title">"Brak powiadomień"</string> - <string name="status_bar_ongoing_events_title">"Trwające"</string> + <string name="status_bar_ongoing_events_title">"Bieżące"</string> <string name="status_bar_latest_events_title">"Powiadomienia"</string> <string name="battery_status_text_percent_format">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="battery_status_charging">"Ładowanie..."</string> @@ -582,10 +576,10 @@ <string name="Noon">"Południe"</string> <string name="midnight">"północ"</string> <string name="Midnight">"Północ"</string> - <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string> + <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string> <!-- no translation found for month (7026169712234774086) --> <skip /> - <string name="month_day_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string> + <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> <string name="month_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> <string name="time_of_day">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string> <string name="date_and_time">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string> @@ -613,7 +607,7 @@ <string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> <string name="same_month_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string> - <string name="abbrev_month_day_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string> + <string name="abbrev_month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> <string name="abbrev_month_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string> <string name="abbrev_month_day">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string> <!-- no translation found for abbrev_month (3131032032850777433) --> @@ -721,8 +715,8 @@ <string name="aerr_application">"Aplikacja <xliff:g id="APPLICATION">%1$s</xliff:g> (proces <xliff:g id="PROCESS">%2$s</xliff:g>) została niespodziewanie zatrzymana. Spróbuj ponownie."</string> <string name="aerr_process">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> został niespodziewanie zatrzymany. Spróbuj ponownie."</string> <string name="anr_title">"Przepraszamy!"</string> - <string name="anr_activity_application">"<xliff:g id="ACTIVITY">%1$s</xliff:g> (w aplikacji <xliff:g id="APPLICATION">%2$s</xliff:g>) nie odpowiada."</string> - <string name="anr_activity_process">"<xliff:g id="ACTIVITY">%1$s</xliff:g> (w procesie <xliff:g id="PROCESS">%2$s</xliff:g>) nie odpowiada."</string> + <string name="anr_activity_application">"Działanie <xliff:g id="ACTIVITY">%1$s</xliff:g> (w aplikacji <xliff:g id="APPLICATION">%2$s</xliff:g>) nie odpowiada."</string> + <string name="anr_activity_process">"Działanie <xliff:g id="ACTIVITY">%1$s</xliff:g> (w procesie <xliff:g id="PROCESS">%2$s</xliff:g>) nie odpowiada."</string> <string name="anr_application_process">"Aplikacja <xliff:g id="APPLICATION">%1$s</xliff:g> (w procesie <xliff:g id="PROCESS">%2$s</xliff:g>) nie odpowiada."</string> <string name="anr_process">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> nie odpowiada."</string> <string name="force_close">"Wymuś zamknięcie"</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"Dalej"</string> <string name="ime_action_done">"Gotowe"</string> <string name="ime_action_default">"Wykonaj"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"Połącz"\n"z numerem <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using">"Utwórz kontakt"\n"dla numeru <xliff:g id="NUMBER">%s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 07b58ed..fac6cb7 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -54,16 +54,11 @@ <string name="CLIRDefaultOffNextCallOff">"Идентификатор звонящего по умолчанию не ограничен. Следующий вызов: не ограничен"</string> <string name="serviceNotProvisioned">"Услуга не предоставляется."</string> <string name="CLIRPermanent">"Нельзя изменить настройки идентификатора звонящего."</string> - <!-- no translation found for RestrictedChangedTitle (5592189398956187498) --> - <skip /> - <!-- no translation found for RestrictedOnData (8653794784690065540) --> - <skip /> - <!-- no translation found for RestrictedOnEmergency (6581163779072833665) --> - <skip /> - <!-- no translation found for RestrictedOnNormal (2045364908281990708) --> - <skip /> - <!-- no translation found for RestrictedOnAll (4923139582141626159) --> - <skip /> + <string name="RestrictedChangedTitle">"Ограничения доступа изменены"</string> + <string name="RestrictedOnData">"Служба данных заблокирована."</string> + <string name="RestrictedOnEmergency">"Аварийная служба заблокирована."</string> + <string name="RestrictedOnNormal">"Служба передачи SMS/голосовых сообщений заблокирована."</string> + <string name="RestrictedOnAll">"Все службы передачи SMS/голосовых сообщений заблокированы."</string> <string name="serviceClassVoice">"Голос"</string> <string name="serviceClassData">"Данные"</string> <string name="serviceClassFAX">"ФАКС"</string> @@ -410,8 +405,7 @@ <string name="lockscreen_missing_sim_instructions">"Вставьте SIM-карту."</string> <string name="lockscreen_network_locked_message">"Заблокирована сетью"</string> <string name="lockscreen_sim_puk_locked_message">"SIM-карта заблокирована PUK-кодом."</string> - <!-- no translation found for lockscreen_sim_puk_locked_instructions (635967534992394321) --> - <skip /> + <string name="lockscreen_sim_puk_locked_instructions">"См. руководство пользователя или свяжитесь со службой поддержки."</string> <string name="lockscreen_sim_locked_message">"SIM-карта заблокирована."</string> <string name="lockscreen_sim_unlock_progress_dialog_message">"Разблокировка SIM-карты..."</string> <string name="lockscreen_too_many_failed_attempts_dialog_message">"Вы неправильно воспроизвели комбинацию разблокировки <xliff:g id="NUMBER_0">%d</xliff:g> раз. "\n\n"Повторите попытку через <xliff:g id="NUMBER_1">%d</xliff:g> сек."</string> @@ -806,8 +800,6 @@ <string name="ime_action_next">"Далее"</string> <string name="ime_action_done">"Готово"</string> <string name="ime_action_default">"Выполнить"</string> - <!-- no translation found for dial_number_using (5789176425167573586) --> - <skip /> - <!-- no translation found for create_contact_using (4947405226788104538) --> - <skip /> + <string name="dial_number_using">"Набрать номер"\n"<xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using">"Создать контакт"\n"с номером <xliff:g id="NUMBER">%s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-zh-rCN/arrays.xml b/core/res/res/values-zh-rCN/arrays.xml deleted file mode 100644 index 16da6d9..0000000 --- a/core/res/res/values-zh-rCN/arrays.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2006, Google Inc. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources> - - <!-- Do not translate. --> - <integer-array name="maps_starting_lat_lng"> - <item>39937795</item> - <item>116387224</item> - </integer-array> - <!-- Do not translate. --> - <integer-array name="maps_starting_zoom"> - <item>2</item> - </integer-array> - -</resources> diff --git a/core/res/res/values-zh-rTW/arrays.xml b/core/res/res/values-zh-rTW/arrays.xml deleted file mode 100644 index be0795b..0000000 --- a/core/res/res/values-zh-rTW/arrays.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2006, Google Inc. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources> - - <!-- Do not translate. --> - <integer-array name="maps_starting_lat_lng"> - <item>25022112</item> - <item>121478019</item> - </integer-array> - <!-- Do not translate. --> - <integer-array name="maps_starting_zoom"> - <item>3</item> - </integer-array> - -</resources> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 9b38d0a..4258804 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -850,12 +850,12 @@ <enum name="KEYCODE_MENU" value="82" /> <enum name="KEYCODE_NOTIFICATION" value="83" /> <enum name="KEYCODE_SEARCH" value="84" /> - <enum name="KEYCODE_PLAYPAUSE" value="85" /> - <enum name="KEYCODE_STOP" value="86" /> - <enum name="KEYCODE_NEXTSONG" value="87" /> - <enum name="KEYCODE_PREVIOUSSONG" value="88" /> - <enum name="KEYCODE_REWIND" value="89" /> - <enum name="KEYCODE_FORWARD" value="90" /> + <enum name="KEYCODE_MEDIA_PLAY_PAUSE" value="85" /> + <enum name="KEYCODE_MEDIA_STOP" value="86" /> + <enum name="KEYCODE_MEDIA_NEXT" value="87" /> + <enum name="KEYCODE_MEDIA_PREVIOUS" value="88" /> + <enum name="KEYCODE_MEDIA_REWIND" value="89" /> + <enum name="KEYCODE_MEDIA_FAST_FORWARD" value="90" /> <enum name="KEYCODE_MUTE" value="91" /> </attr> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 2ff0962..093ddd3 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1062,15 +1062,24 @@ <declare-styleable name="AndroidManifestData" parent="AndroidManifestIntentFilter"> <!-- Specify a MIME type that is handled, as per {@link android.content.IntentFilter#addDataType - IntentFilter.addDataType()}. --> + IntentFilter.addDataType()}. + <p><em>Note: MIME type matching in the Android framework is + case-sensitive, unlike formal RFC MIME types. As a result, + MIME types here should always use lower case letters.</em></p> --> <attr name="mimeType" format="string" /> <!-- Specify a URI scheme that is handled, as per {@link android.content.IntentFilter#addDataScheme - IntentFilter.addDataScheme()}. --> + IntentFilter.addDataScheme()}. + <p><em>Note: scheme matching in the Android framework is + case-sensitive, unlike the formal RFC. As a result, + schemes here should always use lower case letters.</em></p> --> <attr name="scheme" format="string" /> <!-- Specify a URI authority host that is handled, as per {@link android.content.IntentFilter#addDataAuthority - IntentFilter.addDataAuthority()}. --> + IntentFilter.addDataAuthority()}. + <p><em>Note: host name matching in the Android framework is + case-sensitive, unlike the formal RFC. As a result, + host names here should always use lower case letters.</em></p> --> <attr name="host" format="string" /> <!-- Specify a URI authority port that is handled, as per {@link android.content.IntentFilter#addDataAuthority @@ -1140,10 +1149,17 @@ {@link android.content.Intent#setAction Intent.setAction()}. --> <attr name="action" format="string" /> <!-- The data URI to assign to the Intent, as per - {@link android.content.Intent#setData Intent.setData()}. --> + {@link android.content.Intent#setData Intent.setData()}. + <p><em>Note: scheme and host name matching in the Android framework is + case-sensitive, unlike the formal RFC. As a result, + Uris here should always be normalized to use lower case letters + for these elements (as well as other proper Uri normalization).</em></p> --> <attr name="data" format="string" /> <!-- The MIME type name to assign to the Intent, as per - {@link android.content.Intent#setType Intent.setType()}. --> + {@link android.content.Intent#setType Intent.setType()}. + <p><em>Note: MIME type matching in the Android framework is + case-sensitive, unlike formal RFC MIME types. As a result, + MIME types here should always use lower case letters.</em></p> --> <attr name="mimeType" /> <!-- The package part of the ComponentName to assign to the Intent, as per {@link android.content.Intent#setComponent Intent.setComponent()}. --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f45d2e4..3282482 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2321,5 +2321,8 @@ <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed. The first line will be in bigger type than the second. --> <string name="create_contact_using">Create contact\nusing <xliff:g id="number" example="555">%s</xliff:g></string> - + + <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale pairs. This is used at startup to set a default locale by checking the system property ro.carrier for the carrier-id and searching through this array --> + <string-array translatable="false" name="carrier_locales"> + </string-array> </resources> diff --git a/data/sounds/AudioPackage2.mk b/data/sounds/AudioPackage2.mk index 5bd301d..f24d05c 100644 --- a/data/sounds/AudioPackage2.mk +++ b/data/sounds/AudioPackage2.mk @@ -88,5 +88,9 @@ PRODUCT_COPY_FILES += \ $(local_path)/newwavelabs/Shes_All_That.ogg:system/media/audio/ringtones/Shes_All_That.ogg \ $(local_path)/newwavelabs/Steppin_Out.ogg:system/media/audio/ringtones/Steppin_Out.ogg \ $(local_path)/newwavelabs/Third_Eye.ogg:system/media/audio/ringtones/Third_Eye.ogg \ - $(local_path)/newwavelabs/Thunderfoot.ogg:system/media/audio/ringtones/Thunderfoot.ogg + $(local_path)/newwavelabs/Thunderfoot.ogg:system/media/audio/ringtones/Thunderfoot.ogg \ + $(local_path)/notifications/moonbeam.ogg:system/media/audio/notifications/moonbeam.ogg \ + $(local_path)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \ + $(local_path)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \ + $(local_path)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg diff --git a/data/sounds/notifications/moonbeam.ogg b/data/sounds/notifications/moonbeam.ogg Binary files differnew file mode 100644 index 0000000..59ac985 --- /dev/null +++ b/data/sounds/notifications/moonbeam.ogg diff --git a/data/sounds/notifications/moonbeam.wav b/data/sounds/notifications/moonbeam.wav Binary files differnew file mode 100644 index 0000000..732ae2c --- /dev/null +++ b/data/sounds/notifications/moonbeam.wav diff --git a/data/sounds/notifications/pixiedust.ogg b/data/sounds/notifications/pixiedust.ogg Binary files differnew file mode 100644 index 0000000..4ed7f52 --- /dev/null +++ b/data/sounds/notifications/pixiedust.ogg diff --git a/data/sounds/notifications/pixiedust.wav b/data/sounds/notifications/pixiedust.wav Binary files differnew file mode 100644 index 0000000..890e855 --- /dev/null +++ b/data/sounds/notifications/pixiedust.wav diff --git a/data/sounds/notifications/pizzicato.ogg b/data/sounds/notifications/pizzicato.ogg Binary files differnew file mode 100644 index 0000000..0a4a328 --- /dev/null +++ b/data/sounds/notifications/pizzicato.ogg diff --git a/data/sounds/notifications/pizzicato.wav b/data/sounds/notifications/pizzicato.wav Binary files differnew file mode 100644 index 0000000..d0f0cef --- /dev/null +++ b/data/sounds/notifications/pizzicato.wav diff --git a/data/sounds/notifications/tweeters.ogg b/data/sounds/notifications/tweeters.ogg Binary files differnew file mode 100644 index 0000000..ecc4c5a --- /dev/null +++ b/data/sounds/notifications/tweeters.ogg diff --git a/data/sounds/notifications/tweeters.wav b/data/sounds/notifications/tweeters.wav Binary files differnew file mode 100644 index 0000000..b633945 --- /dev/null +++ b/data/sounds/notifications/tweeters.wav diff --git a/docs/html/guide/topics/manifest/receiver-element.jd b/docs/html/guide/topics/manifest/receiver-element.jd index 777d016..8df6273 100644 --- a/docs/html/guide/topics/manifest/receiver-element.jd +++ b/docs/html/guide/topics/manifest/receiver-element.jd @@ -17,7 +17,7 @@ page.title=<receiver> <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></dd> <dt>can contain:</dt> -<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filer></a></code> +<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code></dd> <dt>description:</dt> @@ -47,10 +47,16 @@ The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">< <code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all application components, including broadcast receivers. The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> and -{@code <receiver>} attributes must both be "{@code true}" for -the broadcast receiver to be enabled. If either is "{@code false}", it is -disabled; it cannot be instantiated. -</p></dd> +{@code <receiver>} elements must both set {@code android:enabled} equal to +"{@code true}" for the broadcast receiver to be enabled. If either is "{@code false}", +the receiver is disabled and cannot be instantiated. +</p> + +<p> +The default value depends on whether the broadcast receiver contains intent filters. +If any intent filters are specified, the default value is "{@code true}". If no +filters are specified, the default value is "{@code false}". +</dd> <dt><a name="exported"></a>{@code android:exported}</dt> <dd>Whether or not the broadcast receiver can receive messages from sources @@ -117,9 +123,12 @@ it can also be set as a raw string. {@link android.content.BroadcastReceiver}. This should be a fully qualified class name (such as, "{@code com.example.project.ReportReceiver}"). However, as a shorthand, if the first character of the name is a period (for example, -"{@code . ReportReceiver}"), it is appended to the package name specified in +"{@code .ReportReceiver}"), it is appended to the package name specified in the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element. +<p>The {@link android.content.BroadcastReceiver} subclass can be a static inner +class, although it cannot be an ordinary (non-static) inner class. + <p> There is no default. The name must be specified. </p></dd> diff --git a/docs/html/sdk/1.0_r1/upgrading.jd b/docs/html/sdk/1.0_r1/upgrading.jd index 480bff3..d6d5dc4 100644 --- a/docs/html/sdk/1.0_r1/upgrading.jd +++ b/docs/html/sdk/1.0_r1/upgrading.jd @@ -133,11 +133,17 @@ to place 3rd jar files, which are now automatically handled by the Ant script.</ <h2 id="migrate">Migrate your applications</h2> -<p>After updating your SDK, you will likely encounter breakages in your code, due to -framework and API changes. You'll need to update your code to match changes in the Android APIs.</p> +<p>If (and only if) you have written apps in an SDK released previous to +the Android 1.0 SDK, you will need to migrate your applications. After +updating your SDK, you may encounter breakages in your code, due to +framework and API changes. You'll need to update your code to match +changes in the Android APIs.</p> <p>One way to start is to open your project in Eclipse and see where the ADT -identifies errors in your application.</p> +identifies errors in your application. You can also look up +specific changes in the Android APIs in the <em>Overview of Changes</em> and <em> +API Diffs Report</em>, both available in the documentation included with the +Android 1.0 SDK package.</p> <p>If you have additional trouble updating your code, visit the <a href="http://groups.google.com/group/android-developers">Android Developers Group</a> diff --git a/docs/html/sdk/1.0_r2/upgrading.jd b/docs/html/sdk/1.0_r2/upgrading.jd index df9b657..409e30e 100644 --- a/docs/html/sdk/1.0_r2/upgrading.jd +++ b/docs/html/sdk/1.0_r2/upgrading.jd @@ -133,11 +133,17 @@ to place 3rd jar files, which are now automatically handled by the Ant script.</ <h2 id="migrate">Migrate your applications</h2> -<p>After updating your SDK, you will likely encounter breakages in your code, due to -framework and API changes. You'll need to update your code to match changes in the Android APIs.</p> +<p>If (and only if) you have written apps in an SDK released previous to +the Android 1.0 SDK, you will need to migrate your applications. After +updating your SDK, you may encounter breakages in your code, due to +framework and API changes. You'll need to update your code to match +changes in the Android APIs.</p> <p>One way to start is to open your project in Eclipse and see where the ADT -identifies errors in your application.</p> +identifies errors in your application. You can also look up +specific changes in the Android APIs in the <em>Overview of Changes</em> and <em> +API Diffs Report</em>, both available in the documentation included with the +Android 1.0 SDK package.</p> <p>If you have additional trouble updating your code, visit the <a href="http://groups.google.com/group/android-developers">Android Developers Group</a> diff --git a/docs/html/sdk/1.1_r1/upgrading.jd b/docs/html/sdk/1.1_r1/upgrading.jd index 2ad6757..19095c0 100644 --- a/docs/html/sdk/1.1_r1/upgrading.jd +++ b/docs/html/sdk/1.1_r1/upgrading.jd @@ -131,11 +131,11 @@ framework and API changes. You'll need to update your code to match the latest APIs.</p> <p>One way to start is to open your project in Eclipse and see where the ADT -identifies errors in your application. From there, you can lookup -specific API changes in the Android 1.0 APIs in the -<a href="http://code.google.com/android/migrating/changes-overview.html"> -Overview of Changes</a> and <a href="http://code.google.com/android/migrating/changes.html"> -API Diffs Report</a>.</p> +identifies errors in your application. You can also look up +specific changes in the Android APIs in the +<a href="{@docRoot}sdk/android-1.1.html#api-changes">Android 1.1 Version +Notes</a> document.</p> + <p>If you have additional trouble updating your code, visit the <a href="http://groups.google.com/group/android-developers">Android Developers Group</a> diff --git a/docs/html/sdk/1.5_r1/index.jd b/docs/html/sdk/1.5_r1/index.jd index 345489a..412887a 100644 --- a/docs/html/sdk/1.5_r1/index.jd +++ b/docs/html/sdk/1.5_r1/index.jd @@ -1,21 +1,20 @@ -page.title=Android 1.5 SDK, Release 1 - -sdk.version=1.5_r1 +sdk.version=1.5 +sdk.rel.id=1 sdk.date=April 2009 -sdk.win_download=android-sdk-windows-1.5_r1.zip +sdk.win_download= sdk.win_bytes= sdk.win_checksum= -sdk.mac_download=android-sdk-mac_x86-1.5_r1.zip +sdk.mac_download= sdk.mac_bytes= sdk.mac_checksum= -sdk.linux_download=android-sdk-linux_x86-1.5_r1.zip +sdk.linux_download= sdk.linux_bytes= sdk.linux_checksum= - +page.title=Download Android SDK @jd:body <h2>SDK Contents</h2> @@ -25,7 +24,7 @@ sdk.linux_checksum= <p>The SDK includes a variety of tools for developing and debugging application code and designing an application UI. You can read about the tools in the <a href="{@docRoot}guide/developing/tools/index.html">Dev Guide</a> and access them in the <code><sdk>/tools/</code> directory. -<p>The tools package included in this SDK is the same as that included in the Android 1.0, Release 2 SDK. </p> +<p>The tools package included in this SDK includes many updates from that provided in the previous SDK and requires you to migrate your applications to the new development environment. For details, see the <a href="upgrading">Upgrading the SDK</a> document.</p> <h4 id="system_images">System Images</h4> @@ -40,17 +39,23 @@ sdk.linux_checksum= <td width="5%"><nobr>Android 1.5</nobr></td> <td width="5%">3</td> <td width="5%"><nobr><a href="{@docRoot}sdk/android-1.5.html">Version Notes</a></nobr></td> -<td>Includes com.google.android.maps external library and a set of standard development applications. </td> - +<td>Includes a set of standard development applications. </td> </tr> +<tr> +<td width="5%"><nobr>Android 1.1</nobr></td> +<td width="5%">2</td> +<td width="5%"><nobr><a href="{@docRoot}sdk/android-1.1.html">Version Notes</a></nobr></td> +<td>Includes a set of standard development applications. </td> +</tr> </table> <h4>Sample Code and Applications</h4> <p>You can look at a variety of tutorials and samples in the <a href="{@docRoot}guide/samples/index.html">Dev Guide</a> and access the sample code itself -in the <code><sdk>/samples/</code> directory of the SDK package.</p> +in the <code><sdk>/platforms/android-1.5/samples/</code> directory of the SDK package. Note the new location — the SDK now includes multiple platform versions that you can develop against and each has its own sample code directory. </p> +<!-- <h4>Documentation</h4> <p>The SDK package includes a full set of local documentation. To view it, open the <code><sdk>/documentation.html</code> file in a web browser. If you are developing in an IDE such as Eclipse, you can also view the reference documentation directly in the IDE. </p> @@ -58,5 +63,5 @@ in the <code><sdk>/samples/</code> directory of the SDK package.</p> <p>The most current documentation is always available on the Android Developers site:</p> <p style="margin-left:2em;"><a href="http://developer.android.com/index.html">http://developer.android.com/</a></p> - +--> diff --git a/docs/html/sdk/1.5_r1/installing.jd b/docs/html/sdk/1.5_r1/installing.jd index df9ec3a..a1f7cff 100644 --- a/docs/html/sdk/1.5_r1/installing.jd +++ b/docs/html/sdk/1.5_r1/installing.jd @@ -1,312 +1,10 @@ -page.title=Installing the Android SDK -sdk.version=1.5_r1 +sdk.version=1.5 +sdk.rel.id=1 +sdk.date=April 2009 +page.title=Installing the Android SDK @jd:body - -<p>This page describes how to install the Android SDK and set up your -development environment. If you haven't downloaded the SDK, you can -do so from the -<a href="{@docRoot}sdk/1.5_r1/index.html">Download</a> page.</p> - -<p>If you encounter any problems during installation, see the -<a href="#installnotes">Installation Notes</a> at the bottom of -this page.</p> - -<h4 style="margin-top">Upgrading?</h4> -<p>If you have already developed applications using an earlier version -of the SDK, please skip this page and read the -<a href="{@docRoot}sdk/1.5_r1/upgrading.html"><strong>Upgrading the -SDK</strong></a></b> document instead. -</p> - - -<h2 id="setup">Preparing for Installation</h2> - -<p>Before you get started with the Android SDK, take a moment to confirm -that your development machine meets the <a -href="{@docRoot}sdk/1.5_r1/requirements.html">system requirements</a>. -</p> - -<p>If you will be developing on Eclipse with the Android Development -Tools (ADT) Plugin — the recommended path if you are new to -Android — make sure that you have a suitable version of Eclipse -installed on your computer. If you need to install Eclipse, you can -download it from this location: </p> - -<p style="margin-left:2em;"><a href= -"http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a -></p> - -<p>A Java or RCP version of Eclipse is recommended. </p> - -<h2 id="installingsdk">Installing the SDK</h2> - - <p>After downloading the SDK, unpack the .zip archive to a suitable location on your machine. By default, the SDK files are unpacked into a directory named <code>android_sdk_<em><platform</em>>_<em><release></em>_<em><build></em></code>. The directory contains a link to a local copy of the documentation and the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p> - - <p>Make a note of the name and location of the unpacked SDK directory on your system — you will need to refer to the SDK directory later, when setting up the Android plugin or using SDK tools. </p> - - <p>Optionally, you can add the path to the SDK <code>tools</code> directory to your path. As mentioned above, the <code>tools/</code> directory is located in the SDK directory. </p> - <ul> - <li>On Linux, edit your ~/.bash_profile or ~/.bashrc file. Look - for a line that sets the PATH environment variable and add the - full path to the <code>tools/</code> directory to it. If you don't - see a line setting the path, you can add one:</li> - - <ul><code>export PATH=${PATH}:<em><your_sdk_dir></em>/tools</code></ul> - - <li>On a Mac, look in your home directory for .bash_profile and - proceed as for Linux. You can create the .bash_profile, if - you haven't already set one up on your machine. </li> - - <li>On Windows, right click on My Computer, and select Properties. - Under the Advanced tab, hit the Environment Variables button, and in the - dialog that comes up, double-click on Path under System Variables. Add the full path to the <code>tools/</code> directory to the path. </li> - </ul> - - <p>Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> without needing to supply the full path to the tools directory. Note that, if you update your SDK, you should remember to update your PATH settings to point to the new location, if different.</p> - - -<p>If you will be using the Eclipse IDE as your environment for developing Android applications, continue reading the next -section in order to install the Android Development Tools plugin and set up Eclipse. If you choose not to use Eclipse, you can -develop Android applications using other tools — read the guide to developing -<a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a>.</p> - - -<h2 id="installingplugin">Installing the ADT Plugin for Eclipse</h2> - -<p>Android offers a custom plugin for the Eclipse IDE, called Android -Development Tools (ADT), that is designed to give you a powerful, -integrated environment in which to build Android applications. It -extends the capabilites of Eclipse to let you quickly set up new Android -projects, create an application UI, add components based on the Android -Framework API, and debug using the Android SDK tools.</p> - -<p>If you are new to Android or want to develop using the Eclipse IDE, -the ADT plugin will be an essential part of your development -environment. In general, using Eclipse with ADT is a highly recommended -approach and is the fastest way to get started. This section describes -how to install ADT into your Eclipse environment. - -<p>If you prefer to work in a development environment other than Eclipse, -you do not need to install Eclipse or the ADT Plugin. Instead, you can -access the SDK tools directly to build and debug your application. </p> - -<p>Once you have Eclipse installed, as described in <a href="#setup"> -Preparing for Installation</a>, follow the steps below to -download the ADT plugin and install it in your respective Eclipse -environment. </p> - -<table style="font-size:100%"> -<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr> -<tr> -<td width="45%"> -<ol> - <li>Start Eclipse, then select <strong>Help</strong> > <strong>Software Updates</strong> > <strong>Find - and Install...</strong>. </li> - - <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click <strong>Next</strong>. </li> - <li>Click <strong>New Remote Site</strong>. </li> - <li>In the resulting dialog box, enter a name for the remote site (e.g. Android Plugin) and enter this as its URL: - <pre>https://dl-ssl.google.com/android/eclipse/</pre> - <p>Alternatively, you can use http in the Location URL, if you are having - trouble with https (https is preferred for security reasons).</p> - <pre>http://dl-ssl.google.com/android/eclipse/</pre> - <p>Click <strong>OK</strong>.</p> </li> - <li>You should now see the new site added to the search list (and checked). - Click <strong>Finish</strong>. </li> - <li>In the subsequent Search Results dialog box, select the checkbox for - <strong>Android Plugin</strong> > <strong>Developer Tools</strong>. - This will check both features: "Android Developer Tools", and "Android - Editors". The Android Editors feature is optional, but recommended. If - you choose to install it, you need the WST plugin mentioned earlier in this - page. Click <strong>Next</strong>. </li> - <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>. - Click <strong>Next</strong>. </li> - <li>Click <strong>Finish</strong>. </li> - - <li>The ADT plugin is not signed; you can accept the installation anyway - by clicking <strong>Install All</strong>. </li> - <li>Restart Eclipse. </li> -</ol> - -</td> -<td> - -<ol> - <li>Start Eclipse, then select <strong>Help</strong> > <strong>Software Updates...</strong>. - </li> - <li>In the dialog that appears, click the <strong>Available Software</strong> tab. - </li> - <li>Click <strong>Add Site...</strong> - </li> - <li>Enter this as the Location: - <pre>https://dl-ssl.google.com/android/eclipse/</pre> - <p>Alternatively, you can use http in the Location URL, if you are having - trouble with https (https is preferred for security reasons).</p> - <pre>http://dl-ssl.google.com/android/eclipse/</pre> - <p>Click <strong>OK</strong>.</p></li> - <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to - <em>Developer Tools</em> and click <strong>Install...</strong> - </li> - <li>On the subsequent Install window, "Android Developer Tools", and "Android Editors" should both be checked. - The Android Editors feature is optional, but recommended. If - you choose to install it, you need the WST plugin mentioned earlier in this - page. Click <strong>Next</strong>. - </li> - <li>Accept the license agreement and click <strong>Finish</strong>.</li> - <li>Restart Eclipse. </li> -</ol> - -</td> -</tr> -</table> - -<p>Now, you just need to modify your Eclipse preferences to point to the Android SDK directory:</p> -<ol> - <li>Select <strong>Window</strong> > <strong>Preferences...</strong> to open the Preferences - panel. (Mac OS X: <strong>Eclipse</strong> > <strong>Preferences</strong>) </li> - <li>Select <strong>Android</strong> from the left panel. </li> - <li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory. </li> - <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li> -</ol> - -<p>Done! If you haven't encountered any problems, then you're ready to -begin developing Android applications. See the <a href="#next">After -Installation: Next Steps</a> section for suggestions on how to start. </p> - - -<h3 id="troubleshooting">Troubleshooting ADT Installation</h3> -<p> -If you are having trouble downloading the ADT plugin after following the steps above, here are some suggestions: </p> - -<ul> - <li>If Eclipse can not find the remote update site containing the ADT plugin, try changing the remote site URL to use http, rather than https. That is, set the Location for the remote site to: - <pre>http://dl-ssl.google.com/android/eclipse/</pre></li> - <li>If you are behind a firewall (such as a corporate firewall), make - sure that you have properly configured your proxy settings in Eclipse. - In Eclipse 3.3/3.4, you can configure proxy information from the main - Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) > <strong>Preferences</strong> > <strong>General</strong> > <strong>Network Connections</strong>.</li> -</ul> -<p> -If you are still unable to use Eclipse to download the ADT plugin as a remote update site, you can download the ADT files to your local machine using a browser and the install the files in Eclipse from there: -</p> -<ol> -<li><a href="{@docRoot}sdk/adt_download.html">Download the ADT zip file</a> (do not unpack it). -<li>Follow steps 1 and 2 in the default install instructions (above). -<li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/> - In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong> -<li>Browse and select the downloaded the zip file. -<li>Follow the remaining procedures, above, starting from steps 5. -</ol> -<p> -Note that to update your plugin, you will have to follow these steps again instead of the default update instructions.</p> - -<p>Note that the "Android Editors" feature of ADT requires several optional -Eclipse components (for example, WST). If you encounter an error when -installing ADT, your Eclipse installion might not include those components. -For information about how to quickly add the necessary components to your -Eclipse installation, see the troubleshooting topic -<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p> - -<h4>For Linux users</h4> -<p>If you encounter this error when installing the ADT Plugin for Eclipse: -<pre> -An error occurred during provisioning. -Cannot connect to keystore. -JKS</pre> -<p> -...then your development machine lacks a suitable Java VM. Installing Sun -Java 6 will resolve this issue and you can then reinstall the ADT -Plugin.</p> - - -<h2 id="next">After Installation: Next Steps</h2> -<p>Once you have installed the SDK and the ADT Plugin, you are ready to -begin developing applications. Here are a few ways you can get started: </p> - -<p><strong>Learn about Android</strong></p> -<ul> -<li>Take a look at the <a href="{@docRoot}guide/index.html">Dev -Guide</a> and the types of information it provides</li> -<li>Read an introduction to Android as a platform in <a -href="{@docRoot}guide/basics/what-is-android.html">What is -Android?</a></li> -<li>Learn about the Android framework and how applications run on it in -<a href="{@docRoot}guide/topics/fundamentals.html">Application -Fundamentals</a></li> -<li>Take a look at the Android framework API specification in the <a -href="{@docRoot}reference/index.html">Reference</a> tab</li> -</ul> - -<p><strong>Explore the SDK</strong></p> -<ul> -<li>Get an overview of the <a -href="{@docRoot}guide/development/tools/index.html">development -tools</a> that are available to you</li> -<li>Read the overviews of how to develop <a -href="{@docRoot}guide/developing/eclipse-adt.html">in Eclipse/ADT</a> or -<a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a> -</li> -</ul> - -<p><strong>Explore some code</strong></p> -<ul> -<li>Set up a <a href="{@docRoot}guide/tutorials/hello-world.html">Hello -World application</a></li> -<li>Follow the <a href="{@docRoot}guide/tutorials/notepad/index.html"> -Notepad Tutorial</a> to build a full Android application </li> -<li>Create a new project for one of the other sample applications -included in <code><sdk>/samples</code>, then compile and run it in -your development environment</li> -</ul> - -<p><strong>Visit the Android developer groups</strong></p> -<ul> -<li>Take a look at the <a -href="{@docRoot}community/index.html">Community</a> tab to see a list of -Android developers groups. In particular, you might want to look at the -<a href="http://groups.google.com/group/android-developers">Android -Developers</a> group to get a sense for what the Android developer -community is like.</li> -</ul> - - -<h2 id="installnotes">Installation Notes</h2> -<h4>Ubuntu Linux Notes</h4> -<ul> - <li>If you need help installing and configuring Java on your -development machine, you might find these resources helpful: - <ul> - <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/Java </a></li> - <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation </a></li> - </ul> - </li> -<li>Here are the steps to install Java and Eclipse, prior to installing -the Android SDK and ADT Plugin. -<ol> - <li>If you are running a 64-bit distribution on your development -machine, you need to install the <code>ia32-libs</code> package using -<code>apt-get:</code>: - <pre>apt-get install ia32-libs</pre></li> - <li>Next, install Java: - <pre>apt-get install sun-java6-bin</pre></li> - <li>The Ubuntu package manager does not currently offer an Eclipse 3.3 - version for download, so we recommend that you download Eclipse from -eclipse.org (<a -href="http://www.eclipse.org/downloads/">http://www.eclipse.org/ -downloads/</a>). A Java or RCP version of Eclipse is recommended.</li> -<li>Follow the steps given in previous sections to install the SDK -and the ADT plugin. </li> -</ol> -</ul> -<h4>Other Linux Notes</h4> -<ul> - <li>If JDK is already installed on your development computer, please -take a moment to make sure that it meets the version requirements listed -in the <a href="{@docRoot}sdk/1.5_r1/requirements.html">System Requirements</a>. -In particular, note that some Linux distributions may include JDK 1.4 or Gnu -Compiler for Java, both of which are not supported for Android development.</li> -</ul> +<p>See the <a href="{@docRoot}sdk/preview/index.html">Download page</a> for more information.</p> diff --git a/docs/html/sdk/1.5_r1/requirements.jd b/docs/html/sdk/1.5_r1/requirements.jd index 3f0deca..c3ee8f7 100644 --- a/docs/html/sdk/1.5_r1/requirements.jd +++ b/docs/html/sdk/1.5_r1/requirements.jd @@ -1,11 +1,7 @@ page.title=System Requirements - -sdk.version=1.5_r1 -sdk.date=April 2009 - @jd:body -<p>The sections below describe the system and software requirements for developing Android applications using the Android SDK tools included in Android 1.5 SDK, Release 1. </p> +<p>The sections below describe the system and software requirements for developing Android applications using the Android SDK tools included in Android <?cs var:sdk.version ?> SDK, Release <?cs var:sdk.rel.id ?>. </p> <h3>Supported Operating Systems</h3> <ul> diff --git a/docs/html/sdk/1.5_r1/upgrading.jd b/docs/html/sdk/1.5_r1/upgrading.jd index 23cb82c..5323131 100644 --- a/docs/html/sdk/1.5_r1/upgrading.jd +++ b/docs/html/sdk/1.5_r1/upgrading.jd @@ -30,17 +30,42 @@ sdk.version=1.5_r1 </div> --> -<p>This document describes how to move your development environment and existing -Android applications from an Android 1.0 SDK to the Android 1.5, Release 1 SDK. + + <div id="qv-wrapper"> + <div id="qv"> + +<h2>Upgrading quickview</h2> +<ul> +<li>The Android 1.5 SDK uses a new project structure and a new ADT plugin (ADT 0.9). </li> +<li>To move existing projects into the SDK, you must make some minor changes in your development environment.</li> +<li>The new ADT plugin (ADT 0.9) <em>is not compatible</em> with projects created in previous SDKs.</li> +<li>You need to uninstall your existing ADT plugin, before installing ADT 0.9.</li> + +</ul> + +<!--<h2>Related Information</h2> +<ol> +<li><a href="{@docRoot}sdk/api_diff/3/changes.html">Android 1.5 API Differences</a></li> +</ol> +--> +</div> +</div> + +<p>See the <a href="{@docRoot}sdk/preview/index.html">Download page</a> for more information.</p> + +<!-- <p>This document describes how to move your development environment and existing +Android applications from an Android 1.1 or 1.0 SDK to the Android 1.5 SDK. If you are migrating applications from an earlier SDK, please read the upgrading document available in the Android 1.0 SDK package. </p> -<p>To ensure that your applications are compliant with the Android 1.5 system available +<p>To ensure that your existing applications run properly with the Android 1.5 system available on mobile devices, you need to install the Android 1.5 SDK and port your existing Android applications to it. The sections below will guide you through the process.</p> -<h2 id="install-new">Installing the Latest SDK</h2> +</ul> + +<h2 id="install-new">Installing the SDK</h2> <p><a href="{@docRoot}sdk/1.5_r1/index.html">Download the SDK</a> and unpack it into a safe location.</p> @@ -131,11 +156,12 @@ framework and API changes. You'll need to update your code to match the latest APIs.</p> <p>One way to start is to open your project in Eclipse and see where the ADT -identifies errors in your application. From there, you can lookup -specific API changes in the Android 1.0 APIs in the -<a href="http://code.google.com/android/migrating/changes-overview.html"> -Overview of Changes</a> and <a href="http://code.google.com/android/migrating/changes.html"> -API Diffs Report</a>.</p> +identifies errors in your application. You can also look up +specific changes in the Android APIs in the +android-1.5.html#api-changes +Android 1.5 Version Notes + +document.</p> <p>If you have additional trouble updating your code, visit the <a href="http://groups.google.com/group/android-developers">Android Developers Group</a> @@ -147,4 +173,4 @@ preinstalled in the emulator. For more information, or if you encounter an "rein error when running or installing ApiDemos, see the troubleshooting topic <a href="{@docRoot}guide/appendix/faq/troubleshooting.html#apidemosreinstall">I can't install ApiDemos apps in my IDE because of a signing error</a> for information about how to solve the problem.</p> - +-->
\ No newline at end of file diff --git a/docs/html/sdk/android-1.5.jd b/docs/html/sdk/android-1.5.jd index 55fc4ba..fff911e 100644 --- a/docs/html/sdk/android-1.5.jd +++ b/docs/html/sdk/android-1.5.jd @@ -8,238 +8,7 @@ sys.date=April 2009 <em>API Level:</em> <strong>3</strong></p> -<p>This document provides version notes for the Android 1.5 system image included in the SDK. </p> - -<ul> -<li><a href="#overview">Overview</a> -<li><a href="#overview">External Libraries</a> -<li><a href="#comp">Device Compatibility</a> -<li><a href="#apps">Built-in Applications</a> -<li><a href="#locs">UI Localizations</a> -<li><a href="#resolved-issues">Resolved Issues</a> -<li><a href="#features">New Features</a> -<li><a href="#api-changes">API Changes</a> -</ul> - -<h2 id="overview">Overview</h2> - -<p>The Android 1.5 system image delivered in the SDK is the development -counterpart to the Android 1.5 production system image, deployable to -Android-powered handsets starting in February 2009. </p> - -<p>The Android 1.5 system image delivers an updated version of the framework -API. As with previous versions, the Android 1.5 API -is assigned an integer identifier — <strong>3</strong> — that is -stored in the system itself. This identifier, called the "API Level", allows the -system to correctly determine whether an application is compatible with -the system, prior to installing the application.</p> - -<p>Applications can reference a specific API Level value in their -manifest files, to indicate the minimum version of the Android system -required to run the application. To reference a minimum API Level, applications -can add a <code>minSdkVersion</code> attribute in their manifest files. -The value of the attribute is an integer corresponding to an API Level -identifier. Prior to installing an application, the system then checks the value of -<code>minSdkVersion</code> and allows the install only -if the referenced integer is less than or equal to the API Level integer stored -in the system itself. </p> - -<p>If you use the Android 1.5 system image to build an application -compatible with Android-powered devices running the Android 1.5 -platform, please note that you <strong><span -style="color:red;">must</span></strong> set the the -<code>android:minSdkVersion</code> attribute in the application's -manifest to "3", which is the API strictly associated with Android 1.5. -</p> - -<p>Specifically, you define the <code>android:minSdkVersion</code> -attribute in a <code><uses-sdk></code> element as a child of -<code><manifest></code> in the manifest file. When set, the -attribute looks like this: </p> - -<pre><manifest> - ... - <uses-sdk minSdkVersion="3" /> - ... -</manifest></pre> - -<p>By setting <code>android:minSdkVersion</code> in this way, you ensure -that users will only be able to install your application if their -devices are running the Android 1.5 platform. In turn, this ensures that -your application will function properly on their devices, especially if -it uses <a href="#apichange">APIs introduced in Android 1.5</a>. </p> - -<p>If your application uses APIs introduced in Android 1.5 but does not -declare <code><uses-sdk minSdkVersion="3" /></code>, then it will -run properly on Android 1.5 devices but <em>not</em> on Android 1.0 -devices. In the latter case, the application will crash at runtime when -it tries to use the Android 1.5 APIs.</p> - -<p>If your application does not use any new APIs introduced in Android -1.5, you can indicate general Android 1.0 compatibility by removing -<code>minSdkVersion</code> or setting the attribute to "1". However, -before publishing your application, you must make sure to compile your -application against the Android 1.0 system image (available in the -Android SDK), to ensure that it builds and functions properly for -Android 1.0 devices. You should test the application against system -images corresponding to the API Levels that the application is designed -to be compatible with.</p> - -<p>If you are sure your application is not using Android 1.5 APIs and -has no need to use them, you might find it easier to keep working in the -Android 1.1 SDK, rather than migrating to the Android 1.5 SDK and having -to do additional testing. </p> - - -<h2 id="extlibs">External Libraries</h2> - -<p>The system image includes these external libraries, which you can -access from your application by adding a <a -href="{@docRoot}guide/topics/manifest/uses-library-element.html"> -<uses-library></a>.</p> - <ul> - <li>com.google.android.maps — gives your -application access to Google Maps data. Note that, to use Google Maps -data, a Maps API Key is required.</li> - </ul> - -<h2 id="comp">Device Compatibility</h2> - -<p>The Android 1.5 system image was tested for compatability with the -Android-powered devices listed below:</p> - <ul> - <li><a href="http://www.t-mobileg1.com">T-Mobile G1</a></li> - </ul> - -<h2 id="apps">Built-in Applications</h2> - -<p>The system image includes these built-in applications:</p> - <ul> - <li>Alarm Clock</li> - <li>API Demos</li> - <li>Browser</li> - <li>Calculator</li> - <li>Camera</li> - <li>Contacts</li> - <li>Dev Tools</li> - <li>Dialer</li> - <li>Email</li> - <li>Maps (and StreetView)</li> - <li>Messaging</li> - <li>Music</li> - <li>Pictures</li> - <li>Settings</li> - </ul> - -<h2 id="locs">UI Localizations</h2> - -<p>The system image provides localized UI strings for the languages -listed below.</p> - <ul> - <li>English, US (en_US)</li> - <li>German (de) </li> - </ul> - -<p>Localized UI strings match the locales that are displayable in -the emulator, accessible through the device Settings application.</p> - -<h2 id="resolved-issues">Resolved Issues</h2> -<ul> -<li>AlarmClock alert now plays audio/vibe directly, rather than through -AlarmManager. AlarmClock alert starts playing audio/vibe in its -IntentReceiver, rather than on activity start. These changes should -prevent alarms from being blocked by modal dialogs.</li> -<li>Fixes to device sleep. </li> -<li>Single tap no longer opens the in-call dialpad; users now need to -touch and drag it. </li> -<li>Fixes a bug causing approximately 1 in 25 outbound messages to -freeze up the IMAP connection (to a Gmail based server) when transferred -to the Sent folder.</li> -<li>Removes automatic account setup entries that were broken or not -testable. Adds minor fixes to a few of the remaining entries. Makes -improvements to warning dialogs used for a few special cases. </li> -<li>Changes default mail checking interval to every 15 minutes (instead -of defaulting to "never").</li> -<li>Fixes password-quoting bugs in IMAP, so that users can include -special characters in passwords (e.g. spaces).</li> -<li>Fixes various errors in auto and manual account setup </li> -<li>Improves reporting for various connection errors, making it easier -for the user to diagnose failed account setups.</li> -<li>Fixes new-mail notifications for POP3 accounts.</li> -<li>Ensures proper auto-checking of accounts marked as "never -check".</li> -<li>Now displays date and time using user preference (e.g. 24 hr vs. -AM/PM).</li> -<li>Now shows cc: in message view.</li> -<li>Improves recovery from POP3 connection failures.</li> -<li>POP3 parser rules loosened, so the application can work with -non-compliant email servers.</li> -</ul> - -<h2 id="features">New Features</h2> - -<ul> -<li>Maps: Adds details and reviews when a user does a search on Maps and -clicks on a business to view its details.</li> -<li>Dialer: In-call screen timeout default is now longer when using the -speakerphone.</li> -<li>Dialer: Adds a "Show dialpad" / "Hide dialpad" item to the in-call -menu, to make it easier to discover the DTMF dialpad. </li> -<li>Adds support for saving attachments from MMS</li> -<li>Adds support for marquee in layouts.</li> -</ul> - -<h2 id="api-changes">API Changes</h2> - -<h3>Overview</strong></h3> - -<ul> -<li>Adds annotations for test systems, no actual (non-test) API -changes.</li> -<li>Adds a method to allow a process to easily determine its UID. -<li>Adds support for marquee in layouts.</li> -<li>Adds new methods for determining padding in views. Useful if you are -writing your own -subclasses of {@link android.view.View View}.</li> -<li>Adds new permissions that allow an application to broadcast an SMS -or WAP Push message. </li> -<li>API cleanup: removes protected constructor from -SDK-bound system images. </li> -</ul> - -<h3>API Change Details</h3> - -<table> -<tr> -<th>Module or Feature</th><th>Change Description</th> -</tr> -<tr><td rowspan="4">Annotations for test systems</td></tr> - <tr><td>Added {@link android.test.suitebuilder.annotation.LargeTest LargeTest} annotation.</td></tr> - <tr><td>Added {@link android.test.suitebuilder.annotation.MediumTest MediumTest} annotation.</td></tr> - <tr><td>Added {@link android.test.suitebuilder.annotation.SmallTest SmallTest} annotation.</td></tr> - -<tr><td rowspan="2">Allow a process to easily know its UID.</td></tr> - <tr><td>Added public method {@link android.os.Process#myUid} to class {@link android.os.Process android.os.Process}</td></tr> - -<tr><td rowspan="6">Padding in views</td></tr> - <tr><td>Added public method {@link android.view.View#getBottomPaddingOffset} to class {@link android.view.View android.view.View}.</td></tr> - <tr><td>Added public method {@link android.view.View#getLeftPaddingOffset} to class {@link android.view.View android.view.View}.</td></tr> - <tr><td>Added public method {@link android.view.View#getRightPaddingOffset} to class {@link android.view.View android.view.View}.</td></tr> - <tr><td>Added public method {@link android.view.View#getTopPaddingOffset} to class {@link android.view.View android.view.View}.</td></tr> - <tr><td>Added public method {@link android.view.View#isPaddingOffsetRequired} to class {@link android.view.View android.view.View}.</td></tr> - -<tr><td rowspan="3">Marquee support</td></tr> - <tr><td>Added public method {@link android.widget.TextView#setMarqueeRepeatLimit} to class {@link android.widget.TextView}</td></tr> - <tr><td>Added public field {@link android.R.attr#marqueeRepeatLimit android.R.attr.marqueeRepeatLimit}</td></tr> - -<tr><td rowspan="3">New permissions</td></tr> - <tr><td>Added public field {@link android.Manifest.permission#BROADCAST_SMS android.Manifest.permission.BROADCAST_SMS}</td></tr> - <tr><td>Added public field {@link android.Manifest.permission#BROADCAST_WAP_PUSH android.Manifest.permission.BROADCAST_WAP_PUSH}</td></tr> - -<tr><td rowspan="2">API cleanup</td></tr> - <tr><td>Removed protected constructor java.net.ServerSocket.ServerSocket(java.net.SocketImpl).</td></tr> - -</table> +<p>Please see <a href="{@docRoot}sdk/preview/index.html">Download the Android 1.5 Early Look SDK</a> for more information. </p> diff --git a/docs/html/sdk/terms.jd b/docs/html/sdk/terms.jd index 4638850..b3c5ea2 100644 --- a/docs/html/sdk/terms.jd +++ b/docs/html/sdk/terms.jd @@ -8,7 +8,8 @@ hide_license_footer=true 1. Introduction </h2> <p> - 1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files and packaged APIs) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. + 1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google Services add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. + </p> <p> 1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. @@ -41,10 +42,11 @@ hide_license_footer=true 3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform. </p> <p> - 3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. The Android Open Source Project + 3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. + </p> <p> - 3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. + 3.3. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. </p> <p> 3.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. @@ -62,7 +64,7 @@ hide_license_footer=true 4. Use of the SDK by You </h2> <p> - 4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights which subsist in those applications. + 4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. </p> <p> 4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). @@ -110,25 +112,14 @@ hide_license_footer=true 8. Using Android APIs </h2> <p> - 8.1 Android Maps API -</p> -<p> - 8.1.1 If you use the Android Maps API (described in the SDK by the Package names "com.google.android.maps" and "com.android.location.Geocoder"), the terms of your binding legal agreement with Google include this License Agreement, the <a href="http://www.google.com/apis/maps/terms.html">Google Maps API Terms of Service</a> and the <a href="http://www.google.com/intl/en_ALL/help/terms_local.html">Google Maps Terms of Service</a>. You must read and agree to those Terms of Service before you use the Android Maps API. + 8.1 Google Data APIs </p> <p> - 8.1.2 If you use the Android Maps API to retrieve map or satellite image data from Google, you must include the following copyright notice in your application or service in a manner that is reasonably available to users: + 8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. </p> <p> - "Copyright Notice: Data: (c)2007 TeleAtlas, AND, Europa Technologies, Kingway, Map Data Sciences Pty Ltd, PSMA, ZENRIN, Geocentre, MapLink/TeleAtlas; Imagery: (c)2007 DigitalGlobe, EarthSat, Sanborn, NYGIS, Scankort, TerraMetrics, MassGIS Commonwealth of Massachusetts, Digital Earth Technology." -</p> -<p> - 8.2 Google Data APIs -</p> -<p> - 8.2.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by those who provide that data (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless you have been specifically given permission to do so by the owners of that data. -</p> -<p> - 8.2.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + 8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + </p> <h2> 9. Terminating this License Agreement @@ -185,10 +176,7 @@ hide_license_footer=true 13. Changes to the License Agreement </h2> <p> - 13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available and with the SDK downloadable. -</p> -<p> - 13.2 You agree that your use of a specific version of the SDK is governed by the License Agreement included with that version of the SDK. + 13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. </p> <h2> 14. General Legal Terms @@ -215,5 +203,5 @@ hide_license_footer=true 14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. </p> <p> - <em>August 18, 2008</em> + <em>April 10, 2009</em> </p> diff --git a/docs/html/sdk/terms_body.html b/docs/html/sdk/terms_body.html index e8fdc3c..a73801f 100644 --- a/docs/html/sdk/terms_body.html +++ b/docs/html/sdk/terms_body.html @@ -5,7 +5,8 @@ 1. Introduction </h2> <p> - 1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files and packaged APIs) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. + 1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google Services add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. + </p> <p> 1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. @@ -38,10 +39,11 @@ 3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform. </p> <p> - 3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. The Android Open Source Project + 3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. + </p> <p> - 3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. + 3.3. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. </p> <p> 3.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. @@ -59,7 +61,7 @@ 4. Use of the SDK by You </h2> <p> - 4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights which subsist in those applications. + 4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. </p> <p> 4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). @@ -107,25 +109,14 @@ 8. Using Android APIs </h2> <p> - 8.1 Android Maps API -</p> -<p> - 8.1.1 If you use the Android Maps API (described in the SDK by the Package names "com.google.android.maps" and "com.android.location.Geocoder"), the terms of your binding legal agreement with Google include this License Agreement, the <a href="http://www.google.com/apis/maps/terms.html">Google Maps API Terms of Service</a> and the <a href="http://www.google.com/intl/en_ALL/help/terms_local.html">Google Maps Terms of Service</a>. You must read and agree to those Terms of Service before you use the Android Maps API. -</p> -<p> - 8.1.2 If you use the Android Maps API to retrieve map or satellite image data from Google, you must include the following copyright notice in your application or service in a manner that is reasonably available to users: -</p> -<p> - "Copyright Notice: Data: (c)2007 TeleAtlas, AND, Europa Technologies, Kingway, Map Data Sciences Pty Ltd, PSMA, ZENRIN, Geocentre, MapLink/TeleAtlas; Imagery: (c)2007 DigitalGlobe, EarthSat, Sanborn, NYGIS, Scankort, TerraMetrics, MassGIS Commonwealth of Massachusetts, Digital Earth Technology." -</p> -<p> - 8.2 Google Data APIs + 8.1 Google Data APIs </p> <p> - 8.2.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by those who provide that data (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless you have been specifically given permission to do so by the owners of that data. + 8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. </p> <p> - 8.2.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + 8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + </p> <h2> 9. Terminating this License Agreement @@ -182,10 +173,7 @@ 13. Changes to the License Agreement </h2> <p> - 13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available and with the SDK downloadable. -</p> -<p> - 13.2 You agree that your use of a specific version of the SDK is governed by the License Agreement included with that version of the SDK. + 13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. </p> <h2> 14. General Legal Terms @@ -212,5 +200,5 @@ 14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. </p> <p> - <em>August 18, 2008</em> -</p> + <em>April 10, 2009</em> +</p>
\ No newline at end of file diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h index efa6d2b..571e47b 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/libs/audioflinger/A2dpAudioInterface.cpp b/libs/audioflinger/A2dpAudioInterface.cpp index 2974e32..b6d5078 100644 --- a/libs/audioflinger/A2dpAudioInterface.cpp +++ b/libs/audioflinger/A2dpAudioInterface.cpp @@ -92,16 +92,15 @@ status_t A2dpAudioInterface::getMicMute(bool* state) status_t A2dpAudioInterface::setParameter(const char *key, const char *value) { LOGD("setParameter %s,%s\n", key, value); - + if (!key || !value) return -EINVAL; - - if (strcmp(key, "a2dp_sink_address") == 0) { + + if (strcmp(key, "a2dp_sink_address") == 0) { return mOutput->setAddress(value); } - if (strcmp(key, "bluetooth_enabled") == 0 && - strcmp(value, "false") == 0) { - return mOutput->close(); + if (strcmp(key, "bluetooth_enabled") == 0) { + mOutput->setBluetoothEnabled(strcmp(value, "true") == 0); } return 0; @@ -130,7 +129,10 @@ status_t A2dpAudioInterface::dump(int fd, const Vector<String16>& args) // ---------------------------------------------------------------------------- A2dpAudioInterface::A2dpAudioStreamOut::A2dpAudioStreamOut() : - mFd(-1), mStandby(true), mStartCount(0), mRetryCount(0), mData(NULL) + mFd(-1), mStandby(true), mStartCount(0), mRetryCount(0), mData(NULL), + // assume BT enabled to start, this is safe because its only the + // enabled->disabled transition we are worried about + mBluetoothEnabled(true) { // use any address by default strcpy(mA2dpAddress, "00:00:00:00:00:00"); @@ -162,14 +164,21 @@ A2dpAudioInterface::A2dpAudioStreamOut::~A2dpAudioStreamOut() } ssize_t A2dpAudioInterface::A2dpAudioStreamOut::write(const void* buffer, size_t bytes) -{ +{ Mutex::Autolock lock(mLock); size_t remaining = bytes; - status_t status = init(); + status_t status = -1; + + if (!mBluetoothEnabled) { + LOGW("A2dpAudioStreamOut::write(), but bluetooth disabled"); + goto Error; + } + + status = init(); if (status < 0) goto Error; - + while (remaining > 0) { status = a2dp_write(mData, buffer, remaining); if (status <= 0) { @@ -181,7 +190,7 @@ ssize_t A2dpAudioInterface::A2dpAudioStreamOut::write(const void* buffer, size_t } mStandby = false; - + return bytes; Error: @@ -235,8 +244,27 @@ status_t A2dpAudioInterface::A2dpAudioStreamOut::setAddress(const char* address) return NO_ERROR; } +status_t A2dpAudioInterface::A2dpAudioStreamOut::setBluetoothEnabled(bool enabled) +{ + LOGD("setBluetoothEnabled %d", enabled); + + Mutex::Autolock lock(mLock); + + mBluetoothEnabled = enabled; + if (!enabled) { + return close_l(); + } + return NO_ERROR; +} + status_t A2dpAudioInterface::A2dpAudioStreamOut::close() { + Mutex::Autolock lock(mLock); + return close_l(); +} + +status_t A2dpAudioInterface::A2dpAudioStreamOut::close_l() +{ if (mData) { a2dp_cleanup(mData); mData = NULL; diff --git a/libs/audioflinger/A2dpAudioInterface.h b/libs/audioflinger/A2dpAudioInterface.h index 99614dc..7901a8c 100644 --- a/libs/audioflinger/A2dpAudioInterface.h +++ b/libs/audioflinger/A2dpAudioInterface.h @@ -88,7 +88,9 @@ private: friend class A2dpAudioInterface; status_t init(); status_t close(); - status_t setAddress(const char* address); + status_t close_l(); + status_t setAddress(const char* address); + status_t setBluetoothEnabled(bool enabled); private: int mFd; @@ -98,6 +100,7 @@ private: char mA2dpAddress[20]; void* mData; Mutex mLock; + bool mBluetoothEnabled; }; A2dpAudioStreamOut* mOutput; diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp index 1069362..43df7dd 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -958,13 +958,10 @@ status_t AudioFlinger::MixerThread::dumpTracks(int fd, const Vector<String16>& a result.append(buffer); result.append(" Name Clien Typ Fmt Chn Buf S M F SRate LeftV RighV Serv User\n"); for (size_t i = 0; i < mTracks.size(); ++i) { - wp<Track> wTrack = mTracks[i]; - if (wTrack != 0) { - sp<Track> track = wTrack.promote(); - if (track != 0) { - track->dump(buffer, SIZE); - result.append(buffer); - } + sp<Track> track = mTracks[i]; + if (track != 0) { + track->dump(buffer, SIZE); + result.append(buffer); } } @@ -972,7 +969,7 @@ status_t AudioFlinger::MixerThread::dumpTracks(int fd, const Vector<String16>& a result.append(buffer); result.append(" Name Clien Typ Fmt Chn Buf S M F SRate LeftV RighV Serv User\n"); for (size_t i = 0; i < mActiveTracks.size(); ++i) { - wp<Track> wTrack = mTracks[i]; + wp<Track> wTrack = mActiveTracks[i]; if (wTrack != 0) { sp<Track> track = wTrack.promote(); if (track != 0) { diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 2f0007f..8f05cec 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/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 63dfc3b..a21a7a4 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -258,13 +258,12 @@ int AudioSystem::logToLinear(float volume) status_t AudioSystem::getOutputSamplingRate(int* samplingRate, int streamType) { int output = getOutput(streamType); + + if (output == NUM_AUDIO_OUTPUT_TYPES) return PERMISSION_DENIED; - if (gOutSamplingRate[output] == 0) { - const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); - if (af == 0) return PERMISSION_DENIED; - // gOutSamplingRate is updated by get_audio_flinger() - } + // gOutSamplingRate[] is updated by getOutput() which calls get_audio_flinger() LOGV("getOutputSamplingRate() streamType %d, output %d, sampling rate %d", streamType, output, gOutSamplingRate[output]); + *samplingRate = gOutSamplingRate[output]; return NO_ERROR; @@ -274,14 +273,13 @@ status_t AudioSystem::getOutputFrameCount(int* frameCount, int streamType) { int output = getOutput(streamType); - if (gOutFrameCount[output] == 0) { - const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); - if (af == 0) return PERMISSION_DENIED; - // gOutFrameCount is updated by get_audio_flinger() - } + if (output == NUM_AUDIO_OUTPUT_TYPES) return PERMISSION_DENIED; + + // gOutFrameCount[] is updated by getOutput() which calls get_audio_flinger() LOGV("getOutputFrameCount() streamType %d, output %d, frame count %d", streamType, output, gOutFrameCount[output]); *frameCount = gOutFrameCount[output]; + return NO_ERROR; } @@ -289,11 +287,9 @@ status_t AudioSystem::getOutputLatency(uint32_t* latency, int streamType) { int output = getOutput(streamType); - if (gOutLatency[output] == 0) { - const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); - if (af == 0) return PERMISSION_DENIED; - // gOutLatency is updated by get_audio_flinger() - } + if (output == NUM_AUDIO_OUTPUT_TYPES) return PERMISSION_DENIED; + + // gOutLatency[] is updated by getOutput() which calls get_audio_flinger() LOGV("getOutputLatency() streamType %d, output %d, latency %d", streamType, output, gOutLatency[output]); *latency = gOutLatency[output]; @@ -354,7 +350,12 @@ void AudioSystem::setErrorCallback(audio_error_callback cb) { } int AudioSystem::getOutput(int streamType) -{ +{ + // make sure that gA2dpEnabled is valid by calling get_audio_flinger() which in turn + // will call gAudioFlinger->isA2dpEnabled() + const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); + if (af == 0) return NUM_AUDIO_OUTPUT_TYPES; + if (streamType == DEFAULT) { streamType = MUSIC; } diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index 5d1887d..e0d2947 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -30,11 +30,24 @@ #include <utils/MemoryHeapBase.h> #include <utils/MemoryBase.h> #include <media/PVMediaRecorder.h> +#include <utils/String16.h> #include "MediaRecorderClient.h" namespace android { +const char* cameraPermission = "android.permission.CAMERA"; + +static bool checkPermission(const char* permissionString) { +#ifndef HAVE_ANDROID_OS + return true; +#endif + if (getpid() == IPCThreadState::self()->getCallingPid()) return true; + bool ok = checkCallingPermission(String16(permissionString)); + if (!ok) LOGE("Request requires %s", permissionString); + return ok; +} + status_t MediaRecorderClient::setCamera(const sp<ICamera>& camera) { LOGV("setCamera"); @@ -60,6 +73,9 @@ status_t MediaRecorderClient::setPreviewSurface(const sp<ISurface>& surface) status_t MediaRecorderClient::setVideoSource(int vs) { LOGV("setVideoSource(%d)", vs); + if (!checkPermission(cameraPermission)) { + return PERMISSION_DENIED; + } Mutex::Autolock lock(mLock); if (mRecorder == NULL) { LOGE("recorder is not initialized"); diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml index a32f590..d0ff9ce 100644 --- a/media/tests/MediaFrameworkTest/AndroidManifest.xml +++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml @@ -18,6 +18,7 @@ package="com.android.mediaframeworktest"> <uses-permission android:name="android.permission.RECORD_AUDIO" /> + <uses-permission android:name="android.permission.CAMERA" /> <application> <uses-library android:name="android.test.runner" /> <activity android:label="@string/app_name" diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java index c30db38..fa0986a 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java @@ -228,8 +228,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe */ @LargeTest public void testTakePicture() throws Exception { - initializeMessageLooper(); synchronized (lock) { + initializeMessageLooper(); try { lock.wait(WAIT_FOR_COMMAND_TO_COMPLETE); } catch(Exception e) { @@ -250,8 +250,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe */ @LargeTest public void testCheckPreview() throws Exception { - initializeMessageLooper(); synchronized (lock) { + initializeMessageLooper(); try { lock.wait(WAIT_FOR_COMMAND_TO_COMPLETE); } catch(Exception e) { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java index 05ac408..aefedc3 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java @@ -1211,5 +1211,43 @@ public class MediaAudioTrackTest extends ActivityInstrumentationTestCase2<MediaF track.release(); } + //----------------------------------------------------------------- + // Getters + //---------------------------------- + + //Test case 1: getMinBufferSize() return ERROR_BAD_VALUE if SR < 4000 + @LargeTest + public void testGetMinBufferSizeTooLowSR() throws Exception { + // constant for test + final String TEST_NAME = "testGetMinBufferSizeTooLowSR"; + final int TEST_SR = 3999; + final int TEST_CONF = AudioFormat.CHANNEL_CONFIGURATION_MONO; + final int TEST_FORMAT = AudioFormat.ENCODING_PCM_8BIT; + final int TEST_MODE = AudioTrack.MODE_STREAM; + final int TEST_STREAM_TYPE = AudioManager.STREAM_MUSIC; + + //-------- initialization & test -------------- + assertTrue(TEST_NAME, + AudioTrack.getMinBufferSize(TEST_SR, TEST_CONF, TEST_FORMAT) + == AudioTrack.ERROR_BAD_VALUE); + } + + //Test case 2: getMinBufferSize() return ERROR_BAD_VALUE if SR > 48000 + @LargeTest + public void testGetMinBufferSizeTooHighSR() throws Exception { + // constant for testg + final String TEST_NAME = "testGetMinBufferSizeTooHighSR"; + final int TEST_SR = 48001; + final int TEST_CONF = AudioFormat.CHANNEL_CONFIGURATION_MONO; + final int TEST_FORMAT = AudioFormat.ENCODING_PCM_8BIT; + final int TEST_MODE = AudioTrack.MODE_STREAM; + final int TEST_STREAM_TYPE = AudioManager.STREAM_MUSIC; + + //-------- initialization & test -------------- + assertTrue(TEST_NAME, + AudioTrack.getMinBufferSize(TEST_SR, TEST_CONF, TEST_FORMAT) + == AudioTrack.ERROR_BAD_VALUE); + } + } diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 7fb8585..ccb27cc 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -16,7 +16,6 @@ package android.opengl; -import java.io.IOException; import java.io.Writer; import java.util.ArrayList; import java.util.concurrent.Semaphore; @@ -38,32 +37,163 @@ import android.view.SurfaceView; /** * An implementation of SurfaceView that uses the dedicated surface for - * displaying an OpenGL animation. This allows the animation to run in a - * separate thread, without requiring that it be driven by the update mechanism - * of the view hierarchy. + * displaying OpenGL rendering. + * <p> + * A GLSurfaceView provides the following features: + * <p> + * <ul> + * <li>Manages a surface, which is a special piece of memory that can be + * composited into the Android view system. + * <li>Manages an EGL display, which enables OpenGL to render into a surface. + * <li>Accepts a user-provided Renderer object that does the actual rendering. + * <li>Renders on a dedicated thread to decouple rendering performance from the + * UI thread. + * <li>Supports both on-demand and continuous rendering. + * <li>Optionally wraps, traces, and/or error-checks the renderer's OpenGL calls. + * </ul> + * + * <h3>Using GLSurfaceView</h3> + * <p> + * Typically you use GLSurfaceView by subclassing it and overriding one or more of the + * View system input event methods. If your application does not need to override event + * methods then GLSurfaceView can be used as-is. For the most part + * GLSurfaceView behavior is customized by calling "set" methods rather than by subclassing. + * For example, unlike a regular View, drawing is delegated to a separate Renderer object which + * is registered with the GLSurfaceView + * using the {@link #setRenderer(Renderer)} call. + * <p> + * <h3>Initializing GLSurfaceView</h3> + * All you have to do to initialize a GLSurfaceView is call {@link #setRenderer(Renderer)}. + * However, if desired, you can modify the default behavior of GLSurfaceView by calling one or + * more of these methods before calling setRenderer: + * <ul> + * <li>{@link #setDebugFlags(int)} + * <li>{@link #setEGLConfigChooser(boolean)} + * <li>{@link #setEGLConfigChooser(EGLConfigChooser)} + * <li>{@link #setEGLConfigChooser(int, int, int, int, int, int)} + * <li>{@link #setGLWrapper(GLWrapper)} + * </ul> + * <p> + * <h4>Choosing an EGL Configuration</h4> + * A given Android device may support multiple possible types of drawing surfaces. + * The available surfaces may differ in how may channels of data are present, as + * well as how many bits are allocated to each channel. Therefore, the first thing + * GLSurfaceView has to do when starting to render is choose what type of surface to use. + * <p> + * By default GLSurfaceView chooses an available surface that's closest to a 16-bit R5G6B5 surface + * with a 16-bit depth buffer and no stencil. If you would prefer a different surface (for example, + * if you do not need a depth buffer) you can override the default behavior by calling one of the + * setEGLConfigChooser methods. + * <p> + * <h4>Debug Behavior</h4> + * You can optionally modify the behavior of GLSurfaceView by calling + * one or more of the debugging methods {@link #setDebugFlags(int)}, + * and {@link #setGLWrapper}. These methods may be called before and/or after setRenderer, but + * typically they are called before setRenderer so that they take effect immediately. + * <p> + * <h4>Setting a Renderer</h4> + * Finally, you must call {@link #setRenderer} to register a {@link Renderer}. + * The renderer is + * responsible for doing the actual OpenGL rendering. + * <p> + * <h3>Rendering Mode</h3> + * Once the renderer is set, you can control whether the renderer draws + * continuously or on-demand by calling + * {@link #setRenderMode}. The default is continuous rendering. + * <p> + * <h3>Activity Life-cycle</h3> + * A GLSurfaceView must be notified when the activity is paused and resumed. GLSurfaceView clients + * are required to call {@link #onPause()} when the activity pauses and + * {@link #onResume()} when the activity resumes. These calls allow GLSurfaceView to + * pause and resume the rendering thread, and also allow GLSurfaceView to release and recreate + * the OpenGL display. + * <p> + * <h3>Handling events</h3> + * <p> + * To handle an event you will typically subclass GLSurfaceView and override the + * appropriate method, just as you would with any other View. However, when handling + * the event, you may need to communicate with the Renderer object + * that's running in the rendering thread. You can do this using any + * standard Java cross-thread communication mechanism. In addition, + * one relatively easy way to communicate with your renderer is + * to call + * {@link #queueEvent(Runnable)}. For example: + * <pre class="prettyprint"> + * class MyGLSurfaceView extends GLSurfaceView { + * + * private MyRenderer mMyRenderer; + * + * public void start() { + * mMyRenderer = ...; + * setRenderer(mMyRenderer); + * } + * + * public boolean onKeyDown(int keyCode, KeyEvent event) { + * if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) { + * queueEvent(new Runnable() { + * // This method will be called on the rendering + * // thread: + * public void run() { + * mMyRenderer.handleDpadCenter(); + * }}); + * return true; + * } + * return super.onKeyDown(keyCode, event); + * } + * } + * </pre> * - * The application-specific rendering code is delegated to a GLView.Renderer - * instance. */ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback { + /** + * The renderer only renders + * when the surface is created, or when {@link #requestRender} is called. + * + * @see #getRenderMode() + * @see #setRenderMode(int) + */ public final static int RENDERMODE_WHEN_DIRTY = 0; - public final static int RENDERMODE_CONTUOUSLY = 1; + /** + * The renderer is called + * continuously to re-render the scene. + * + * @see #getRenderMode() + * @see #setRenderMode(int) + * @see #requestRender() + */ + public final static int RENDERMODE_CONTINUOUSLY = 1; /** - * Check glError() after every GL call. + * Check glError() after every GL call and throw an exception if glError indicates + * that an error has occurred. This can be used to help track down which OpenGL ES call + * is causing an error. + * + * @see #getDebugFlags + * @see #setDebugFlags */ public final static int DEBUG_CHECK_GL_ERROR = 1; /** * Log GL calls to the system log at "verbose" level with tag "GLSurfaceView". + * + * @see #getDebugFlags + * @see #setDebugFlags */ public final static int DEBUG_LOG_GL_CALLS = 2; + /** + * Standard View constructor. In order to render something, you + * must call {@link #setRenderer} to register a renderer. + */ public GLSurfaceView(Context context) { super(context); init(); } + /** + * Standard View constructor. In order to render something, you + * must call {@link #setRenderer} to register a renderer. + */ public GLSurfaceView(Context context, AttributeSet attrs) { super(context, attrs); init(); @@ -78,8 +208,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * Set the glWrapper to a new value. The current glWrapper is used - * whenever a surface is created. The default value is null. + * Set the glWrapper. If the glWrapper is not null, its + * {@link GLWrapper#wrap(GL)} method is called + * whenever a surface is created. A GLWrapper can be used to wrap + * the GL object that's passed to the renderer. Wrapping a GL + * object enables examining and modifying the behavior of the + * GL calls made by the renderer. + * <p> + * Wrapping is typically used for debugging purposes. + * <p> + * The default value is null. * @param glWrapper the new GLWrapper */ public void setGLWrapper(GLWrapper glWrapper) { @@ -87,7 +225,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * Set the debug flags to a new value. The debug flags take effect + * Set the debug flags to a new value. The value is + * constructed by OR-together zero or more + * of the DEBUG_CHECK_* constants. The debug flags take effect * whenever a surface is created. The default value is zero. * @param debugFlags the new debug flags * @see #DEBUG_CHECK_GL_ERROR @@ -97,13 +237,39 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback mDebugFlags = debugFlags; } + /** + * Get the current value of the debug flags. + * @return the current value of the debug flags. + */ public int getDebugFlags() { return mDebugFlags; } /** - * Set the renderer associated with this view. Can only be called once. - * @param renderer + * Set the renderer associated with this view. Also starts the thread that + * will call the renderer, which in turn causes the rendering to start. + * <p>This method should be called once and only once in the life-cycle of + * a GLSurfaceView. + * <p>The following GLSurfaceView methods can only be called <em>before</em> + * setRenderer is called: + * <ul> + * <li>{@link #setEGLConfigChooser(boolean)} + * <li>{@link #setEGLConfigChooser(EGLConfigChooser)} + * <li>{@link #setEGLConfigChooser(int, int, int, int, int, int)} + * </ul> + * <p> + * The following GLSurfaceView methods can only be called <em>after</em> + * setRenderer is called: + * <ul> + * <li>{@link #getRenderMode()} + * <li>{@link #onPause()} + * <li>{@link #onResume()} + * <li>{@link #queueEvent(Runnable)} + * <li>{@link #requestRender()} + * <li>{@link #setRenderMode(int)} + * </ul> + * + * @param renderer the renderer to use to perform OpenGL drawing. */ public void setRenderer(Renderer renderer) { if (mGLThread != null) { @@ -118,11 +284,14 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * Set the EGLConfigChooser associated with this view. If this method is - * called at all, it must be called before {@link #setRenderer(Renderer)} + * Install a custom EGLConfigChooser. + * <p>If this method is + * called, it must be called before {@link #setRenderer(Renderer)} * is called. * <p> - * The supplied configChooser will be used to choose a configuration. + * If no setEGLConfigChooser method is called, then by default the + * view will choose a config as close to 16-bit RGB as possible, with + * a depth buffer as close to 16 bits as possible. * @param configChooser */ public void setEGLConfigChooser(EGLConfigChooser configChooser) { @@ -134,17 +303,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * Set the EGLConfigChooser associated with this view. If this method is - * called, it must be called before {@link #setRenderer(Renderer)} - * is called. - * <p> - * This method installs a config chooser which will choose a config + * Install a config chooser which will choose a config * as close to 16-bit RGB as possible, with or without an optional depth * buffer as close to 16-bits as possible. + * <p>If this method is + * called, it must be called before {@link #setRenderer(Renderer)} + * is called. * <p> - * If no setEGLConfigChooser method is called, then by default the + * If no setEGLConfigChooser method is called, then by default the * view will choose a config as close to 16-bit RGB as possible, with - * a depth buffer as close to 16-bits as possible. + * a depth buffer as close to 16 bits as possible. * * @param needDepth */ @@ -153,13 +321,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * Set the EGLConfigChooser associated with this view. If this method is + * Install a config chooser which will choose a config + * with at least the specified component sizes, and as close + * to the specified component sizes as possible. + * <p>If this method is * called, it must be called before {@link #setRenderer(Renderer)} * is called. * <p> - * This method installs a config chooser which will choose a config - * with at least the specified component sizes, and as close - * to the specified component sizes as possible. + * If no setEGLConfigChooser method is called, then by default the + * view will choose a config as close to 16-bit RGB as possible, with + * a depth buffer as close to 16 bits as possible. * */ public void setEGLConfigChooser(int redSize, int greenSize, int blueSize, @@ -168,12 +339,20 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback blueSize, alphaSize, depthSize, stencilSize)); } /** - * Set the rendering mode. When the renderMode is + * Set the rendering mode. When renderMode is * RENDERMODE_CONTINUOUSLY, the renderer is called - * repeatedly to re-render the scene. When the rendermode + * repeatedly to re-render the scene. When renderMode * is RENDERMODE_WHEN_DIRTY, the renderer only rendered when the surface - * is created, or when requestRender is called. Defaults to RENDERMODE_CONTINUOUSLY. + * is created, or when {@link #requestRender} is called. Defaults to RENDERMODE_CONTINUOUSLY. + * <p> + * Using RENDERMODE_WHEN_DIRTY can improve battery life and overall system performance + * by allowing the GPU and CPU to idle when the view does not need to be updated. + * <p> + * This method can only be called after {@link #setRenderer(Renderer)} + * * @param renderMode one of the RENDERMODE_X constants + * @see #RENDERMODE_CONTINUOUSLY + * @see #RENDERMODE_WHEN_DIRTY */ public void setRenderMode(int renderMode) { mGLThread.setRenderMode(renderMode); @@ -182,38 +361,55 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback /** * Get the current rendering mode. May be called * from any thread. Must not be called before a renderer has been set. - * @return true if the renderer will render continuously. + * @return the current rendering mode. + * @see #RENDERMODE_CONTINUOUSLY + * @see #RENDERMODE_WHEN_DIRTY */ public int getRenderMode() { return mGLThread.getRenderMode(); } /** - * Request that the renderer render a frame. May be called - * from any thread. Must not be called before a renderer has been set. + * Request that the renderer render a frame. * This method is typically used when the render mode has been set to - * false, so that frames are only rendered on demand. + * {@link #RENDERMODE_WHEN_DIRTY}, so that frames are only rendered on demand. + * May be called + * from any thread. Must not be called before a renderer has been set. */ public void requestRender() { mGLThread.requestRender(); } + /** + * This method is part of the SurfaceHolder.Callback interface, and is + * not normally called or subclassed by clients of GLSurfaceView. + */ public void surfaceCreated(SurfaceHolder holder) { mGLThread.surfaceCreated(); } + /** + * This method is part of the SurfaceHolder.Callback interface, and is + * not normally called or subclassed by clients of GLSurfaceView. + */ public void surfaceDestroyed(SurfaceHolder holder) { // Surface will be destroyed when we return mGLThread.surfaceDestroyed(); } + /** + * This method is part of the SurfaceHolder.Callback interface, and is + * not normally called or subclassed by clients of GLSurfaceView. + */ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { mGLThread.onWindowResize(w, h); } /** * Inform the view that the activity is paused. The owner of this view must - * call this method when the activity is paused. + * call this method when the activity is paused. Calling this method will + * pause the rendering thread. + * Must not be called before a renderer has been set. */ public void onPause() { mGLThread.onPause(); @@ -221,20 +417,30 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback /** * Inform the view that the activity is resumed. The owner of this view must - * call this method when the activity is resumed. + * call this method when the activity is resumed. Calling this method will + * recreate the OpenGL display and resume the rendering + * thread. + * Must not be called before a renderer has been set. */ public void onResume() { mGLThread.onResume(); } /** - * Queue an "event" to be run on the GL rendering thread. + * Queue a runnable to be run on the GL rendering thread. This can be used + * to communicate with the Renderer on the rendering thread. + * Must not be called before a renderer has been set. * @param r the runnable to be run on the GL rendering thread. */ public void queueEvent(Runnable r) { mGLThread.queueEvent(r); } + /** + * This method is used as part of the View class and is not normally + * called or subclassed by clients of GLSurfaceView. + * Must not be called before a renderer has been set. + */ @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); @@ -243,40 +449,129 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback // ---------------------------------------------------------------------- + /** + * An interface used to wrap a GL interface. + * <p>Typically + * used for implementing debugging and tracing on top of the default + * GL interface. You would typically use this by creating your own class + * that implemented all the GL methods by delegating to another GL instance. + * Then you could add your own behavior before or after calling the + * delegate. All the GLWrapper would do was instantiate and return the + * wrapper GL instance: + * <pre class="prettyprint"> + * class MyGLWrapper implements GLWrapper { + * GL wrap(GL gl) { + * return new MyGLImplementation(gl); + * } + * static class MyGLImplementation implements GL,GL10,GL11,... { + * ... + * } + * } + * </pre> + * @see #setGLWrapper(GLWrapper) + */ public interface GLWrapper { - GL wrap(GL gl); + /** + * Wraps a gl interface in another gl interface. + * @param gl a GL interface that is to be wrapped. + * @return either the input argument or another GL object that wraps the input argument. + */ + GL wrap(GL gl); } - // ---------------------------------------------------------------------- - /** * A generic renderer interface. + * <p> + * The renderer is responsible for making OpenGL calls to render a frame. + * <p> + * GLSurfaceView clients typically create their own classes that implement + * this interface, and then call {@link GLSurfaceView#setRenderer} to + * register the renderer with the GLSurfaceView. + * <p> + * <h3>Threading</h3> + * The renderer will be called on a separate thread, so that rendering + * performance is decoupled from the UI thread. Clients typically need to + * communicate with the renderer from the UI thread, because that's where + * input events are received. Clients can communicate using any of the + * standard Java techniques for cross-thread communication, or they can + * use the {@link GLSurfaceView#queueEvent(Runnable)} convenience method. + * <p> + * <h3>EGL Context Lost</h3> + * There are situations where the EGL rendering context will be lost. This + * typically happens when device wakes up after going to sleep. When + * the EGL context is lost, all OpenGL resources (such as textures) that are + * associated with that context will be automatically deleted. In order to + * keep rendering correctly, a renderer must recreate any lost resources + * that it still needs. The {@link #onSurfaceCreated(GL10, EGLConfig)} method + * is a convenient place to do this. + * + * + * @see #setRenderer(Renderer) */ public interface Renderer { /** - * Surface created. - * Called when the surface is created. Called when the application - * starts, and whenever the GPU is reinitialized. This will - * typically happen when the device awakes after going to sleep. - * Set your textures here. + * Called when the surface is created or recreated. + * <p> + * Called when the rendering thread + * starts and whenever the EGL context is lost. The context will typically + * be lost when the Android device awakes after going to sleep. + * <p> + * Since this method is called at the beginning of rendering, as well as + * every time the EGL context is lost, this method is a convenient place to put + * code to create resources that need to be created when the rendering + * starts, and that need to be recreated when the EGL context is lost. + * Textures are an example of a resource that you might want to create + * here. + * <p> + * Note that when the EGL context is lost, all OpenGL resources associated + * with that context will be automatically deleted. You do not need to call + * the corresponding "glDelete" methods such as glDeleteTextures to + * manually delete these lost resources. + * <p> * @param gl the GL interface. Use <code>instanceof</code> to * test if the interface supports GL11 or higher interfaces. * @param config the EGLConfig of the created surface. Can be used * to create matching pbuffers. */ void onSurfaceCreated(GL10 gl, EGLConfig config); + /** - * Surface changed size. + * Called when the surface changed size. + * <p> * Called after the surface is created and whenever - * the OpenGL ES surface size changes. Set your viewport here. + * the OpenGL ES surface size changes. + * <p> + * Typically you will set your viewport here. If your camera + * is fixed then you could also set your projection matrix here: + * <pre class="prettyprint"> + * void onSurfaceChanged(GL10 gl, int width, int height) { + * gl.glViewport(0, 0, width, height); + * // for a fixed camera, set the projection too + * float ratio = (float) width / height; + * gl.glMatrixMode(GL10.GL_PROJECTION); + * gl.glLoadIdentity(); + * gl.glFrustumf(-ratio, ratio, -1, 1, 1, 10); + * } + * </pre> * @param gl the GL interface. Use <code>instanceof</code> to * test if the interface supports GL11 or higher interfaces. * @param width * @param height */ void onSurfaceChanged(GL10 gl, int width, int height); + /** - * Draw the current frame. + * Called to draw the current frame. + * <p> + * This method is responsible for drawing the current frame. + * <p> + * The implementation of this method typically looks like this: + * <pre class="prettyprint"> + * void onDrawFrame(GL10 gl) { + * gl.glClear(GL10.GL_COLOR_BUFFER_BIT | GL10.GL_DEPTH_BUFFER_BIT); + * //... other gl calls to render the scene ... + * } + * </pre> * @param gl the GL interface. Use <code>instanceof</code> to * test if the interface supports GL11 or higher interfaces. */ @@ -284,15 +579,18 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * An interface for choosing a configuration from a list of + * An interface for choosing an EGLConfig configuration from a list of * potential configurations. - * + * <p> + * This interface must be implemented by clients wishing to call + * {@link GLSurfaceView#setEGLConfigChooser(EGLConfigChooser)} */ public interface EGLConfigChooser { /** * Choose a configuration from the list. Implementors typically * implement this method by calling - * {@link EGL10#eglChooseConfig} and iterating through the results. + * {@link EGL10#eglChooseConfig} and iterating through the results. Please consult the + * EGL specification available from The Khronos Group to learn how to call eglChooseConfig. * @param egl the EGL10 for the current display. * @param display the current display. * @return the chosen configuration. @@ -565,7 +863,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback mWidth = 0; mHeight = 0; mRequestRender = true; - mRenderMode = RENDERMODE_CONTUOUSLY; + mRenderMode = RENDERMODE_CONTINUOUSLY; mRenderer = renderer; setName("GLThread"); } @@ -679,7 +977,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback return true; } - if ((mWidth > 0) && (mHeight > 0) && (mRequestRender || (mRenderMode == RENDERMODE_CONTUOUSLY))) { + if ((mWidth > 0) && (mHeight > 0) && (mRequestRender || (mRenderMode == RENDERMODE_CONTINUOUSLY))) { return false; } @@ -687,12 +985,12 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } public void setRenderMode(int renderMode) { - if ( !((RENDERMODE_WHEN_DIRTY <= renderMode) && (renderMode <= RENDERMODE_CONTUOUSLY)) ) { + if ( !((RENDERMODE_WHEN_DIRTY <= renderMode) && (renderMode <= RENDERMODE_CONTINUOUSLY)) ) { throw new IllegalArgumentException("renderMode"); } synchronized(this) { mRenderMode = renderMode; - if (renderMode == RENDERMODE_CONTUOUSLY) { + if (renderMode == RENDERMODE_CONTINUOUSLY) { notify(); } } diff --git a/services/java/com/android/server/HardwareService.java b/services/java/com/android/server/HardwareService.java index 42367ef..5bc9b5f 100755 --- a/services/java/com/android/server/HardwareService.java +++ b/services/java/com/android/server/HardwareService.java @@ -16,6 +16,9 @@ package com.android.server; +import com.android.internal.app.IBatteryStats; +import com.android.server.am.BatteryStatsService; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -63,6 +66,8 @@ public class HardwareService extends IHardwareService.Stub { mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG); mWakeLock.setReferenceCounted(true); + mBatteryStats = BatteryStatsService.getService(); + IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_SCREEN_OFF); context.registerReceiver(mIntentReceiver, filter); @@ -200,6 +205,14 @@ public class HardwareService extends IHardwareService.Stub { setLightBrightness_UNCHECKED(LIGHT_ID_BACKLIGHT, brightness); setLightBrightness_UNCHECKED(LIGHT_ID_KEYBOARD, brightness); setLightBrightness_UNCHECKED(LIGHT_ID_BUTTONS, brightness); + long identity = Binder.clearCallingIdentity(); + try { + mBatteryStats.noteScreenBrightness(brightness); + } catch (RemoteException e) { + Log.w(TAG, "RemoteException calling noteScreenBrightness on BatteryStatsService", e); + } finally { + Binder.restoreCallingIdentity(identity); + } } void setLightOff_UNCHECKED(int light) { @@ -388,9 +401,11 @@ public class HardwareService extends IHardwareService.Stub { private static native void setLight_native(int ptr, int light, int color, int mode, int onMS, int offMS); - private Context mContext; - private PowerManager.WakeLock mWakeLock; + private final Context mContext; + private final PowerManager.WakeLock mWakeLock; + private final IBatteryStats mBatteryStats; + volatile VibrateThread mThread; volatile Death mDeath; volatile IBinder mToken; diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 5abf249..705ddb3 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -2074,6 +2074,8 @@ public class LocationManagerService extends ILocationManager.Stub private void updateWakelockStatusLocked(boolean screenOn) { log("updateWakelockStatus(): " + screenOn); + long callerId = Binder.clearCallingIdentity(); + boolean needsLock = false; long minTime = Integer.MAX_VALUE; @@ -2117,6 +2119,7 @@ public class LocationManagerService extends ILocationManager.Stub mLocationHandler.removeMessages(MESSAGE_RELEASE_WAKE_LOCK); releaseWakeLockLocked(); } + Binder.restoreCallingIdentity(callerId); } private void acquireWakeLockLocked() { diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index bbca401..9c6e9dc 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -1301,6 +1301,8 @@ class PowerManagerService extends IPowerManager.Stub implements LocalPowerManage err = Power.setScreenState(true); long identity = Binder.clearCallingIdentity(); try { + mBatteryStats.noteScreenBrightness( + getPreferredBrightness()); mBatteryStats.noteScreenOn(); } catch (RemoteException e) { Log.w(TAG, "RemoteException calling noteScreenOn on BatteryStatsService", e); @@ -1455,6 +1457,8 @@ class PowerManagerService extends IPowerManager.Stub implements LocalPowerManage break; } } + int brightness = preferredBrightness; + int steps = ANIM_STEPS; if ((newState & SCREEN_BRIGHT_BIT) == 0) { // dim or turn off backlight, depending on if the screen is on // the scale is because the brightness ramp isn't linear and this biases @@ -1463,7 +1467,6 @@ class PowerManagerService extends IPowerManager.Stub implements LocalPowerManage float ratio = (((float)Power.BRIGHTNESS_DIM)/preferredBrightness); if (ratio > 1.0f) ratio = 1.0f; if ((newState & SCREEN_ON_BIT) == 0) { - int steps; if ((oldState & SCREEN_BRIGHT_BIT) != 0) { // was bright steps = ANIM_STEPS; @@ -1471,10 +1474,8 @@ class PowerManagerService extends IPowerManager.Stub implements LocalPowerManage // was dim steps = (int)(ANIM_STEPS*ratio*scale); } - mScreenBrightness.setTargetLocked(Power.BRIGHTNESS_OFF, - steps, INITIAL_SCREEN_BRIGHTNESS, nominalCurrentValue); + brightness = Power.BRIGHTNESS_OFF; } else { - int steps; if ((oldState & SCREEN_ON_BIT) != 0) { // was bright steps = (int)(ANIM_STEPS*(1.0f-ratio)*scale); @@ -1490,13 +1491,19 @@ class PowerManagerService extends IPowerManager.Stub implements LocalPowerManage // will then count going dim as turning off. mScreenOffTime = SystemClock.elapsedRealtime(); } - mScreenBrightness.setTargetLocked(Power.BRIGHTNESS_DIM, - steps, INITIAL_SCREEN_BRIGHTNESS, nominalCurrentValue); + brightness = Power.BRIGHTNESS_DIM; } - } else { - mScreenBrightness.setTargetLocked(preferredBrightness, - ANIM_STEPS, INITIAL_SCREEN_BRIGHTNESS, nominalCurrentValue); } + long identity = Binder.clearCallingIdentity(); + try { + mBatteryStats.noteScreenBrightness(brightness); + } catch (RemoteException e) { + // Nothing interesting to do. + } finally { + Binder.restoreCallingIdentity(identity); + } + mScreenBrightness.setTargetLocked(brightness, + steps, INITIAL_SCREEN_BRIGHTNESS, nominalCurrentValue); startAnimation = true; } else { if ((newState & SCREEN_BRIGHT_BIT) == 0) { @@ -1735,6 +1742,16 @@ class PowerManagerService extends IPowerManager.Stub implements LocalPowerManage mUserState |= SCREEN_BRIGHT; } + int uid = Binder.getCallingUid(); + long ident = Binder.clearCallingIdentity(); + try { + mBatteryStats.noteUserActivity(uid, eventType); + } catch (RemoteException e) { + // Ignore + } finally { + Binder.restoreCallingIdentity(ident); + } + reactivateWakeLocksLocked(); mWakeLockState = mLocks.gatherState(); setPowerState(mUserState | mWakeLockState, noChangeLights, true); @@ -1951,6 +1968,15 @@ class PowerManagerService extends IPowerManager.Stub implements LocalPowerManage synchronized (mLocks) { Log.d(TAG, "system ready!"); mDoneBooting = true; + long identity = Binder.clearCallingIdentity(); + try { + mBatteryStats.noteScreenBrightness(getPreferredBrightness()); + mBatteryStats.noteScreenOn(); + } catch (RemoteException e) { + // Nothing interesting to do. + } finally { + Binder.restoreCallingIdentity(identity); + } userActivity(SystemClock.uptimeMillis(), false, BUTTON_EVENT, true); updateWakeLockLocked(); mLocks.notifyAll(); diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 6323e2f..54e77f0 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -47,6 +47,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.Message; import android.os.PowerManager; +import android.os.Process; import android.os.RemoteException; import android.provider.Settings; import android.util.Log; @@ -89,6 +90,11 @@ public class WifiService extends IWifiManager.Stub { private int mPluggedType; private final LockList mLocks = new LockList(); + // some wifi lock statistics + private int mFullLocksAcquired; + private int mFullLocksReleased; + private int mScanLocksAcquired; + private int mScanLocksReleased; private final IBatteryStats mBatteryStats; @@ -162,6 +168,11 @@ public class WifiService extends IWifiManager.Stub { private char[] mScanResultBuffer; private boolean mNeedReconfig; + /* + * Last UID that asked to enable WIFI. + */ + private int mLastEnableUid = Process.myUid(); + /** * Number of allowed radio frequency channels in various regulatory domains. * This list is sufficient for 802.11b/g networks (2.4GHz range). @@ -234,7 +245,7 @@ public class WifiService extends IWifiManager.Stub { }, new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED)); - setWifiEnabledBlocking(wifiEnabled, false); + setWifiEnabledBlocking(wifiEnabled, false, Process.myUid()); } /** @@ -450,7 +461,8 @@ public class WifiService extends IWifiManager.Stub { synchronized (mWifiHandler) { sWakeLock.acquire(); - sendEnableMessage(enable, true); + mLastEnableUid = Binder.getCallingUid(); + sendEnableMessage(enable, true, Binder.getCallingUid()); } return true; @@ -460,10 +472,11 @@ public class WifiService extends IWifiManager.Stub { * Enables/disables Wi-Fi synchronously. * @param enable {@code true} to turn Wi-Fi on, {@code false} to turn it off. * @param persist {@code true} if the setting should be persisted. + * @param uid The UID of the process making the request. * @return {@code true} if the operation succeeds (or if the existing state * is the same as the requested state) */ - private boolean setWifiEnabledBlocking(boolean enable, boolean persist) { + private boolean setWifiEnabledBlocking(boolean enable, boolean persist, int uid) { final int eventualWifiState = enable ? WIFI_STATE_ENABLED : WIFI_STATE_DISABLED; if (mWifiState == eventualWifiState) { @@ -473,18 +486,18 @@ public class WifiService extends IWifiManager.Stub { return false; } - setWifiEnabledState(enable ? WIFI_STATE_ENABLING : WIFI_STATE_DISABLING); + setWifiEnabledState(enable ? WIFI_STATE_ENABLING : WIFI_STATE_DISABLING, uid); if (enable) { if (!WifiNative.loadDriver()) { Log.e(TAG, "Failed to load Wi-Fi driver."); - setWifiEnabledState(WIFI_STATE_UNKNOWN); + setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); return false; } if (!WifiNative.startSupplicant()) { WifiNative.unloadDriver(); Log.e(TAG, "Failed to start supplicant daemon."); - setWifiEnabledState(WIFI_STATE_UNKNOWN); + setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); return false; } registerForBroadcasts(); @@ -498,7 +511,7 @@ public class WifiService extends IWifiManager.Stub { boolean failedToStopSupplicantOrUnloadDriver = false; if (!WifiNative.stopSupplicant()) { Log.e(TAG, "Failed to stop supplicant daemon."); - setWifiEnabledState(WIFI_STATE_UNKNOWN); + setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); failedToStopSupplicantOrUnloadDriver = true; } @@ -508,7 +521,7 @@ public class WifiService extends IWifiManager.Stub { if (!WifiNative.unloadDriver()) { Log.e(TAG, "Failed to unload Wi-Fi driver."); if (!failedToStopSupplicantOrUnloadDriver) { - setWifiEnabledState(WIFI_STATE_UNKNOWN); + setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); failedToStopSupplicantOrUnloadDriver = true; } } @@ -522,7 +535,7 @@ public class WifiService extends IWifiManager.Stub { if (persist) { persistWifiEnabled(enable); } - setWifiEnabledState(eventualWifiState); + setWifiEnabledState(eventualWifiState, uid); /* * Initialize the hidden networks state and the number of allowed @@ -536,15 +549,15 @@ public class WifiService extends IWifiManager.Stub { return true; } - private void setWifiEnabledState(int wifiState) { + private void setWifiEnabledState(int wifiState, int uid) { final int previousWifiState = mWifiState; long ident = Binder.clearCallingIdentity(); try { if (wifiState == WIFI_STATE_ENABLED) { - mBatteryStats.noteWifiOn(); + mBatteryStats.noteWifiOn(uid); } else if (wifiState == WIFI_STATE_DISABLED) { - mBatteryStats.noteWifiOff(); + mBatteryStats.noteWifiOff(uid); } } catch (RemoteException e) { } finally { @@ -1566,10 +1579,10 @@ public class WifiService extends IWifiManager.Stub { } }; - private void sendEnableMessage(boolean enable, boolean persist) { + private void sendEnableMessage(boolean enable, boolean persist, int uid) { Message msg = Message.obtain(mWifiHandler, (enable ? MESSAGE_ENABLE_WIFI : MESSAGE_DISABLE_WIFI), - (persist ? 1 : 0), 0); + (persist ? 1 : 0), uid); msg.sendToTarget(); } @@ -1597,7 +1610,7 @@ public class WifiService extends IWifiManager.Stub { if (wifiShouldBeEnabled) { if (wifiShouldBeStarted) { sWakeLock.acquire(); - sendEnableMessage(true, false); + sendEnableMessage(true, false, mLastEnableUid); sWakeLock.acquire(); sendStartMessage(strongestLockMode == WifiManager.WIFI_MODE_SCAN_ONLY); } else { @@ -1621,7 +1634,7 @@ public class WifiService extends IWifiManager.Stub { } } else { sWakeLock.acquire(); - sendEnableMessage(false, false); + sendEnableMessage(false, false, mLastEnableUid); } } } @@ -1666,7 +1679,7 @@ public class WifiService extends IWifiManager.Stub { switch (msg.what) { case MESSAGE_ENABLE_WIFI: - setWifiEnabledBlocking(true, msg.arg1 == 1); + setWifiEnabledBlocking(true, msg.arg1 == 1, msg.arg2); sWakeLock.release(); break; @@ -1679,7 +1692,7 @@ public class WifiService extends IWifiManager.Stub { case MESSAGE_DISABLE_WIFI: // a non-zero msg.arg1 value means the "enabled" setting // should be persisted - setWifiEnabledBlocking(false, msg.arg1 == 1); + setWifiEnabledBlocking(false, msg.arg1 == 1, msg.arg2); sWakeLock.release(); break; @@ -1731,6 +1744,11 @@ public class WifiService extends IWifiManager.Stub { } } pw.println(); + pw.println("Locks acquired: " + mFullLocksAcquired + " full, " + + mScanLocksAcquired + " scan"); + pw.println("Locks released: " + mFullLocksReleased + " full, " + + mScanLocksReleased + " scan"); + pw.println(); pw.println("Locks held:"); mLocks.dump(pw); } @@ -1852,8 +1870,14 @@ public class WifiService extends IWifiManager.Stub { long ident = Binder.clearCallingIdentity(); try { switch(wifiLock.mLockMode) { - case (WifiManager.WIFI_MODE_FULL): mBatteryStats.noteFullWifiLockAcquired(uid); - case (WifiManager.WIFI_MODE_SCAN_ONLY): mBatteryStats.noteScanWifiLockAcquired(uid); + case WifiManager.WIFI_MODE_FULL: + ++mFullLocksAcquired; + mBatteryStats.noteFullWifiLockAcquired(uid); + break; + case WifiManager.WIFI_MODE_SCAN_ONLY: + ++mScanLocksAcquired; + mBatteryStats.noteScanWifiLockAcquired(uid); + break; } } catch (RemoteException e) { } finally { @@ -1882,8 +1906,14 @@ public class WifiService extends IWifiManager.Stub { long ident = Binder.clearCallingIdentity(); try { switch(wifiLock.mLockMode) { - case (WifiManager.WIFI_MODE_FULL): mBatteryStats.noteFullWifiLockReleased(uid); - case (WifiManager.WIFI_MODE_SCAN_ONLY): mBatteryStats.noteScanWifiLockReleased(uid); + case WifiManager.WIFI_MODE_FULL: + ++mFullLocksReleased; + mBatteryStats.noteFullWifiLockReleased(uid); + break; + case WifiManager.WIFI_MODE_SCAN_ONLY: + ++mScanLocksReleased; + mBatteryStats.noteScanWifiLockReleased(uid); + break; } } catch (RemoteException e) { } finally { diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 2e16157..0b1ddc8 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -5085,6 +5085,11 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo } else { eventType = LocalPowerManager.OTHER_EVENT; } + try { + mBatteryStats.noteInputEvent(); + } catch (RemoteException e) { + // Ignore + } mPowerManager.userActivity(curTime, false, eventType); switch (ev.classType) { case RawInputEvent.CLASS_KEYBOARD: @@ -7480,11 +7485,12 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo final int dh = mDisplay.getHeight(); final int N = mWindows.size(); + int repeats = 0; int i; // FIRST LOOP: Perform a layout, if needed. - if (mLayoutNeeded) { + while (mLayoutNeeded) { mPolicy.beginLayoutLw(dw, dh); // First perform layout of any root windows (not attached @@ -7492,10 +7498,18 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo int topAttached = -1; for (i = N-1; i >= 0; i--) { WindowState win = (WindowState) mWindows.get(i); - - boolean gone = win.mViewVisibility == View.GONE + + // Don't do layout of a window if it is not visible, or + // soon won't be visible, to avoid wasting time and funky + // changes while a window is animating away. + final AppWindowToken atoken = win.mAppToken; + final boolean gone = win.mViewVisibility == View.GONE || !win.mRelayoutCalled - || win.mRootToken.hidden; + || win.mRootToken.hidden + || (atoken != null && atoken.hiddenRequested) + || !win.mPolicyVisibility + || win.mAttachedHidden + || win.mExiting || win.mDestroying; // If this view is GONE, then skip it -- keep the current // frame, and let the caller know so they can ignore it @@ -7531,8 +7545,14 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo } } - mPolicy.finishLayoutLw(); - mLayoutNeeded = false; + if (!mPolicy.finishLayoutLw()) { + mLayoutNeeded = false; + } else if (repeats > 2) { + Log.w(TAG, "Layout repeat aborted after too many iterations"); + mLayoutNeeded = false; + } else { + repeats++; + } } } diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java index 2192e06..9ad994c 100644 --- a/services/java/com/android/server/am/BatteryStatsService.java +++ b/services/java/com/android/server/am/BatteryStatsService.java @@ -129,6 +129,13 @@ public final class BatteryStatsService extends IBatteryStats.Stub { } } + public void noteScreenBrightness(int brightness) { + enforceCallingPermission(); + synchronized (mStats) { + mStats.noteScreenBrightnessLocked(brightness); + } + } + public void noteScreenOff() { enforceCallingPermission(); synchronized (mStats) { @@ -136,6 +143,20 @@ public final class BatteryStatsService extends IBatteryStats.Stub { } } + public void noteInputEvent() { + enforceCallingPermission(); + synchronized (mStats) { + mStats.noteInputEventLocked(); + } + } + + public void noteUserActivity(int uid, int event) { + enforceCallingPermission(); + synchronized (mStats) { + mStats.noteUserActivityLocked(uid, event); + } + } + public void notePhoneOn() { enforceCallingPermission(); synchronized (mStats) { @@ -164,17 +185,17 @@ public final class BatteryStatsService extends IBatteryStats.Stub { } } - public void noteWifiOn() { + public void noteWifiOn(int uid) { enforceCallingPermission(); synchronized (mStats) { - mStats.noteWifiOnLocked(); + mStats.noteWifiOnLocked(uid); } } - public void noteWifiOff() { + public void noteWifiOff(int uid) { enforceCallingPermission(); synchronized (mStats) { - mStats.noteWifiOffLocked(); + mStats.noteWifiOffLocked(uid); } } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c5b1b73..c7166ce 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -98,8 +98,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 = @@ -116,32 +114,24 @@ public class TelephonyManager { * <p class="note"> * 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(); @@ -153,8 +143,6 @@ public class TelephonyManager { * <p class="note"> * 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/telephony/java/com/android/internal/telephony/PhoneBase.java b/telephony/java/com/android/internal/telephony/PhoneBase.java index 580814f..4fb5f61 100644 --- a/telephony/java/com/android/internal/telephony/PhoneBase.java +++ b/telephony/java/com/android/internal/telephony/PhoneBase.java @@ -16,15 +16,22 @@ package com.android.internal.telephony; +import android.app.ActivityManagerNative; +import android.app.IActivityManager; import android.content.Context; +import android.content.res.Configuration; import android.os.AsyncResult; import android.os.Handler; import android.os.Looper; import android.os.RegistrantList; +import android.os.SystemProperties; import android.telephony.ServiceState; +import android.util.Log; +import com.android.internal.R; import com.android.internal.telephony.test.SimulatedRadioControl; import java.util.List; +import java.util.Locale; /** * (<em>Not for SDK use</em>) @@ -109,6 +116,8 @@ public abstract class PhoneBase implements Phone { this.mContext = context; mLooper = Looper.myLooper(); + setLocaleByCarrier(); + setUnitTestMode(unitTestMode); } @@ -307,4 +316,89 @@ public abstract class PhoneBase implements Phone { } } + /** + * Set the locale by matching the carrier string in + * a string-array resource + */ + private void setLocaleByCarrier() { + String carrier = SystemProperties.get("ro.carrier"); + + if (null == carrier || 0 == carrier.length()) { + return; + } + + CharSequence[] carrierLocales = mContext. + getResources().getTextArray(R.array.carrier_locales); + + for (int i = 0; i < carrierLocales.length-1; i+=2) { + String c = carrierLocales[i].toString(); + String l = carrierLocales[i+1].toString(); + if (carrier.equals(c)) { + String language = l.substring(0, 2); + String country = ""; + if (l.length() >=5) { + country = l.substring(3, 5); + } + setSystemLocale(language, country); + return; + } + } + } + + /** + * Utility code to set the system locale if it's not set already + * @param langauge Two character language code desired + * @param country Two character country code desired + * + * {@hide} + */ + public void setSystemLocale(String language, String country) { + String l = SystemProperties.get("persist.sys.language"); + String c = SystemProperties.get("persist.sys.country"); + + if (null == language) { + return; // no match possible + } + language.toLowerCase(); + if (null != country) { + country = ""; + } + country = country.toUpperCase(); + + if((null == l || 0 == l.length()) && (null == c || 0 == c.length())) { + try { + // try to find a good match + String[] locales = mContext.getAssets().getLocales(); + final int N = locales.length; + String bestMatch = null; + for(int i = 0; i < N; i++) { + if (locales[i]!=null && locales[i].length() >= 2 && + locales[i].substring(0,2).equals(language)) { + if (locales[i].length() >= 5 && + locales[i].substring(3,5).equals(country)) { + bestMatch = locales[i]; + break; + } else if (null == bestMatch) { + bestMatch = locales[i]; + } + } + } + if (null != bestMatch) { + IActivityManager am = ActivityManagerNative.getDefault(); + Configuration config = am.getConfiguration(); + + if (bestMatch.length() >= 5) { + config.locale = new Locale(bestMatch.substring(0,2), + bestMatch.substring(3,5)); + } else { + config.locale = new Locale(bestMatch.substring(0,2)); + } + config.userSetLocale = true; + am.updateConfiguration(config); + } + } catch (Exception e) { + // Intentionally left blank + } + } + } } diff --git a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java index a62f6cf..4467536 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java +++ b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java @@ -27,10 +27,6 @@ import android.os.SystemProperties; import android.telephony.gsm.SmsMessage; import android.util.Log; import java.util.ArrayList; -import android.app.ActivityManagerNative; -import android.app.IActivityManager; -import java.util.Locale; -import android.content.res.Configuration; import static com.android.internal.telephony.TelephonyProperties.*; import com.android.internal.telephony.SimCard; @@ -554,48 +550,10 @@ public final class SIMRecords extends Handler implements SimConstants * @param mcc Mobile Country Code of the SIM */ private void setLocaleFromMccIfNeeded(int mcc) { - String language = SystemProperties.get("persist.sys.language"); - String country = SystemProperties.get("persist.sys.country"); - Log.d(LOG_TAG,"setLocaleFromMcc"); - if((language == null || language.length() == 0) && (country == null || country.length() == 0)) { - try { - language = MccTable.defaultLanguageForMcc(mcc); - country = MccTable.countryCodeForMcc(mcc).toUpperCase(); - // try to find a good match - String[] locales = phone.getContext().getAssets().getLocales(); - final int N = locales.length; - String bestMatch = null; - for(int i = 0; i < N; i++) { - Log.d(LOG_TAG," trying "+locales[i]); - if(locales[i]!=null && locales[i].length() >= 2 && - locales[i].substring(0,2).equals(language)) { - if(locales[i].length() >= 5 && - locales[i].substring(3,5).equals(country)) { - bestMatch = locales[i]; - break; - } else if(bestMatch == null) { - bestMatch = locales[i]; - } - } - } - Log.d(LOG_TAG," got bestmatch = "+bestMatch); - if(bestMatch != null) { - IActivityManager am = ActivityManagerNative.getDefault(); - Configuration config = am.getConfiguration(); - - if(bestMatch.length() >= 5) { - config.locale = new Locale(bestMatch.substring(0,2), - bestMatch.substring(3,5)); - } else { - config.locale = new Locale(bestMatch.substring(0,2)); - } - config.userSetLocale = true; - am.updateConfiguration(config); - } - } catch (Exception e) { - // Intentionally left blank - } - } + String language = MccTable.defaultLanguageForMcc(mcc); + String country = MccTable.countryCodeForMcc(mcc); + + phone.setSystemLocale(language, country); } //***** Overridden from Handler diff --git a/test-runner/android/test/ActivityUnitTestCase.java b/test-runner/android/test/ActivityUnitTestCase.java index dfd8fc2..6bd19a6 100644 --- a/test-runner/android/test/ActivityUnitTestCase.java +++ b/test-runner/android/test/ActivityUnitTestCase.java @@ -136,7 +136,7 @@ public abstract class ActivityUnitTestCase<T extends Activity> ComponentName cn = new ComponentName(mActivityClass.getPackage().getName(), mActivityClass.getName()); intent.setComponent(cn); - ActivityInfo info = null; + ActivityInfo info = new ActivityInfo(); CharSequence title = mActivityClass.getName(); mMockParent = new MockParent(); String id = null; diff --git a/test-runner/android/test/ClassPathPackageInfoSource.java b/test-runner/android/test/ClassPathPackageInfoSource.java index 12bc7f3..877075f 100644 --- a/test-runner/android/test/ClassPathPackageInfoSource.java +++ b/test-runner/android/test/ClassPathPackageInfoSource.java @@ -226,8 +226,11 @@ public class ClassPathPackageInfoSource { String className = apkClassNames.nextElement(); if (className.startsWith(packageName)) { + String subPackageName = packageName; int lastPackageSeparator = className.lastIndexOf('.'); - String subPackageName = className.substring(0, lastPackageSeparator); + if (lastPackageSeparator > 0) { + subPackageName = className.substring(0, lastPackageSeparator); + } if (subPackageName.length() > packageName.length()) { subpackageNames.add(subPackageName); } else if (isToplevelClass(className)) { diff --git a/test-runner/android/test/InstrumentationTestRunner.java b/test-runner/android/test/InstrumentationTestRunner.java index f038612..044f555 100644 --- a/test-runner/android/test/InstrumentationTestRunner.java +++ b/test-runner/android/test/InstrumentationTestRunner.java @@ -300,16 +300,17 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu } if (testClassesArg == null) { - TestSuite testSuite = null; if (mPackageOfTests != null) { testSuiteBuilder.includePackages(mPackageOfTests); } else { - testSuite = getTestSuite(); - testSuiteBuilder.addTestSuite(testSuite); - } - - if (testSuite == null) { - testSuiteBuilder.includePackages(getTargetContext().getPackageName()); + TestSuite testSuite = getTestSuite(); + if (testSuite != null) { + testSuiteBuilder.addTestSuite(testSuite); + } else { + // no package or class bundle arguments were supplied, and no test suite + // provided so add all tests in application + testSuiteBuilder.includePackages(""); + } } } else { parseTestClasses(testClassesArg, testSuiteBuilder); diff --git a/test-runner/android/test/ProviderTestCase2.java b/test-runner/android/test/ProviderTestCase2.java index 714b77b..ac17ebf 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. + * + * <p>This environment is created automatically by {@link #setUp} and {@link + * #tearDown}. */ public abstract class ProviderTestCase2<T extends ContentProvider> extends AndroidTestCase { @@ -79,4 +84,4 @@ public abstract class ProviderTestCase2<T extends ContentProvider> extends Andro return resolver; } -}
\ No newline at end of file +} diff --git a/tests/DumpRenderTree/results/layout_tests_crashed.txt b/tests/DumpRenderTree/assets/results/layout_tests_crashed.txt index 5a38ed8..5a38ed8 100644 --- a/tests/DumpRenderTree/results/layout_tests_crashed.txt +++ b/tests/DumpRenderTree/assets/results/layout_tests_crashed.txt diff --git a/tests/DumpRenderTree/results/layout_tests_failed.txt b/tests/DumpRenderTree/assets/results/layout_tests_failed.txt index 3cec40d..3cec40d 100644 --- a/tests/DumpRenderTree/results/layout_tests_failed.txt +++ b/tests/DumpRenderTree/assets/results/layout_tests_failed.txt diff --git a/tests/DumpRenderTree/results/layout_tests_nontext.txt b/tests/DumpRenderTree/assets/results/layout_tests_nontext.txt index c9e166c..c9e166c 100644 --- a/tests/DumpRenderTree/results/layout_tests_nontext.txt +++ b/tests/DumpRenderTree/assets/results/layout_tests_nontext.txt diff --git a/tests/DumpRenderTree/results/layout_tests_passed.txt b/tests/DumpRenderTree/assets/results/layout_tests_passed.txt index fbceabd..fbceabd 100644 --- a/tests/DumpRenderTree/results/layout_tests_passed.txt +++ b/tests/DumpRenderTree/assets/results/layout_tests_passed.txt diff --git a/tests/DumpRenderTree/run_layout_tests.py b/tests/DumpRenderTree/assets/run_layout_tests.py index 5409a0c..5409a0c 100755 --- a/tests/DumpRenderTree/run_layout_tests.py +++ b/tests/DumpRenderTree/assets/run_layout_tests.py diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java index a857e68..39eae02 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java @@ -42,6 +42,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Vector; //TestRecorder creates two files, one for passing tests @@ -122,6 +124,18 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh static final String ANDROID_EXPECTED_RESULT_DIR = "/sdcard/android/expected_results/"; static final String LAYOUT_TESTS_LIST_FILE = "/sdcard/android/layout_tests_list.txt"; static final String TEST_STATUS_FILE = "/sdcard/android/running_test.txt"; + static final String LAYOUT_TESTS_RESULTS_REFERENCE_FILES[] = { + "results/layout_tests_passed.txt", + "results/layout_tests_failed.txt", + "results/layout_tests_nontext.txt", + "results/layout_tests_crashed.txt", + "run_layout_tests.py" + }; + + static final String LAYOUT_RESULTS_FAILED_RESULT_FILE = "results/layout_tests_failed.txt"; + static final String LAYOUT_RESULTS_NONTEXT_RESULT_FILE = "results/layout_tests_nontext.txt"; + static final String LAYOUT_RESULTS_CRASHED_RESULT_FILE = "results/layout_tests_crashed.txt"; + static final String LAYOUT_TESTS_RUNNER = "run_layout_tests.py"; private MyTestRecorder mResultRecorder; private Vector<String> mTestList; @@ -452,4 +466,28 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh public void resumeLayoutTests() { executeLayoutTests(true); } + + public void copyResultsAndRunnerAssetsToCache() { + try { + String out_dir = getActivity().getApplicationContext().getCacheDir().getPath() + "/"; + + for( int i=0; i< LAYOUT_TESTS_RESULTS_REFERENCE_FILES.length; i++) { + InputStream in = getActivity().getAssets().open(LAYOUT_TESTS_RESULTS_REFERENCE_FILES[i]); + OutputStream out = new FileOutputStream(out_dir + LAYOUT_TESTS_RESULTS_REFERENCE_FILES[i]); + + byte[] buf = new byte[2048]; + int len; + + while ((len = in.read(buf)) > 0 ) { + out.write(buf, 0, len); + } + out.close(); + in.close(); + } + }catch (IOException e) { + e.printStackTrace(); + } + + } + } diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index bff0423..6f3461d 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -190,7 +190,7 @@ int doList(Bundle* bundle) fprintf(stderr, "ERROR: list -a failed because assets could not be loaded\n"); goto bail; } - + const ResTable& res = assets.getResources(false); if (&res == NULL) { printf("\nNo resource table found.\n"); @@ -198,7 +198,7 @@ int doList(Bundle* bundle) printf("\nResource table:\n"); res.print(); } - + Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml", Asset::ACCESS_BUFFER); if (manifestAsset == NULL) { @@ -212,7 +212,7 @@ int doList(Bundle* bundle) } delete manifestAsset; } - + result = 0; bail: @@ -318,8 +318,23 @@ enum { VERSION_NAME_ATTR = 0x0101021c, LABEL_ATTR = 0x01010001, ICON_ATTR = 0x01010002, + MIN_SDK_VERSION_ATTR = 0x0101020c }; +const char *getComponentName(String8 &pkgName, String8 &componentName) { + ssize_t idx = componentName.find("."); + String8 retStr(pkgName); + if (idx == 0) { + retStr += componentName; + } else if (idx < 0) { + retStr += "."; + retStr += componentName; + } else { + return componentName.string(); + } + return retStr.string(); +} + /* * Handle the "dump" command, to extract select data from an archive. */ @@ -327,41 +342,41 @@ int doDump(Bundle* bundle) { status_t result = UNKNOWN_ERROR; Asset* asset = NULL; - + if (bundle->getFileSpecCount() < 1) { fprintf(stderr, "ERROR: no dump option specified\n"); return 1; } - + if (bundle->getFileSpecCount() < 2) { fprintf(stderr, "ERROR: no dump file specified\n"); return 1; } - + const char* option = bundle->getFileSpecEntry(0); const char* filename = bundle->getFileSpecEntry(1); - + AssetManager assets; if (!assets.addAssetPath(String8(filename), NULL)) { fprintf(stderr, "ERROR: dump failed because assets could not be loaded\n"); return 1; } - + const ResTable& res = assets.getResources(false); if (&res == NULL) { fprintf(stderr, "ERROR: dump failed because no resource table was found\n"); goto bail; } - + if (strcmp("resources", option) == 0) { res.print(); - + } else if (strcmp("xmltree", option) == 0) { if (bundle->getFileSpecCount() < 3) { fprintf(stderr, "ERROR: no dump xmltree resource file specified\n"); goto bail; } - + for (int i=2; i<bundle->getFileSpecCount(); i++) { const char* resname = bundle->getFileSpecEntry(i); ResXMLTree tree; @@ -370,7 +385,7 @@ int doDump(Bundle* bundle) fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname); goto bail; } - + if (tree.setTo(asset->getBuffer(true), asset->getLength()) != NO_ERROR) { fprintf(stderr, "ERROR: Resource %s is corrupt\n", resname); @@ -381,13 +396,13 @@ int doDump(Bundle* bundle) delete asset; asset = NULL; } - + } else if (strcmp("xmlstrings", option) == 0) { if (bundle->getFileSpecCount() < 3) { fprintf(stderr, "ERROR: no dump xmltree resource file specified\n"); goto bail; } - + for (int i=2; i<bundle->getFileSpecCount(); i++) { const char* resname = bundle->getFileSpecEntry(i); ResXMLTree tree; @@ -396,7 +411,7 @@ int doDump(Bundle* bundle) fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname); goto bail; } - + if (tree.setTo(asset->getBuffer(true), asset->getLength()) != NO_ERROR) { fprintf(stderr, "ERROR: Resource %s is corrupt\n", resname); @@ -406,7 +421,7 @@ int doDump(Bundle* bundle) delete asset; asset = NULL; } - + } else { ResXMLTree tree; asset = assets.openNonAsset("AndroidManifest.xml", @@ -415,14 +430,14 @@ int doDump(Bundle* bundle) fprintf(stderr, "ERROR: dump failed because no AndroidManifest.xml found\n"); goto bail; } - + if (tree.setTo(asset->getBuffer(true), asset->getLength()) != NO_ERROR) { fprintf(stderr, "ERROR: AndroidManifest.xml is corrupt\n"); goto bail; } tree.restart(); - + if (strcmp("permissions", option) == 0) { size_t len; ResXMLTree::event_code_t code; @@ -471,9 +486,13 @@ int doDump(Bundle* bundle) bool withinActivity = false; bool isMainActivity = false; bool isLauncherActivity = false; + bool withinApplication = false; + bool withinReceiver = false; + String8 pkg; String8 activityName; String8 activityLabel; String8 activityIcon; + String8 receiverName; while ((code=tree.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) { if (code == ResXMLTree::END_TAG) { depth--; @@ -490,7 +509,7 @@ int doDump(Bundle* bundle) fprintf(stderr, "ERROR: manifest does not start with <manifest> tag\n"); goto bail; } - String8 pkg = getAttribute(tree, NULL, "package", NULL); + pkg = getAttribute(tree, NULL, "package", NULL); printf("package: name='%s' ", pkg.string()); int32_t versionCode = getIntegerAttribute(tree, VERSION_CODE_ATTR, &error); if (error != "") { @@ -508,69 +527,118 @@ int doDump(Bundle* bundle) goto bail; } printf("versionName='%s'\n", versionName.string()); - } else if (depth == 2 && tag == "application") { - String8 label = getResolvedAttribute(&res, tree, LABEL_ATTR, &error); - if (error != "") { - fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n", error.string()); - goto bail; - } - printf("application: label='%s' ", label.string()); - - String8 icon = getResolvedAttribute(&res, tree, ICON_ATTR, &error); - if (error != "") { - fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n", error.string()); - goto bail; - } - printf("icon='%s'\n", icon.string()); - } else if (depth == 3 && tag == "activity") { - withinActivity = true; - //printf("LOG: withinActivity==true\n"); - - activityName = getAttribute(tree, NAME_ATTR, &error); - if (error != "") { - fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string()); - goto bail; + } else if (depth == 2) { + withinApplication = false; + if (tag == "application") { + withinApplication = true; + String8 label = getResolvedAttribute(&res, tree, LABEL_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n", error.string()); + goto bail; + } + printf("application: label='%s' ", label.string()); + String8 icon = getResolvedAttribute(&res, tree, ICON_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n", error.string()); + goto bail; + } + printf("icon='%s'\n", icon.string()); + } else if (tag == "uses-sdk") { + int32_t sdkVersion = getIntegerAttribute(tree, MIN_SDK_VERSION_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'android:minSdkVersion' attribute: %s\n", error.string()); + goto bail; + } + if (sdkVersion != -1) { + printf("sdkVersion:'%d'\n", sdkVersion); + } } + } else if (depth == 3 && withinApplication) { + withinActivity = false; + withinReceiver = false; + if(tag == "activity") { + withinActivity = true; + activityName = getAttribute(tree, NAME_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string()); + goto bail; + } - activityLabel = getResolvedAttribute(&res, tree, LABEL_ATTR, &error); - if (error != "") { - fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n", error.string()); - goto bail; - } + activityLabel = getResolvedAttribute(&res, tree, LABEL_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n", error.string()); + goto bail; + } - activityIcon = getResolvedAttribute(&res, tree, ICON_ATTR, &error); - if (error != "") { - fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n", error.string()); - goto bail; - } - } else if (depth == 5 && withinActivity) { - if (tag == "action") { - //printf("LOG: action tag\n"); - String8 action = getAttribute(tree, NAME_ATTR, &error); + activityIcon = getResolvedAttribute(&res, tree, ICON_ATTR, &error); if (error != "") { - fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string()); + fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n", error.string()); goto bail; } - if (action == "android.intent.action.MAIN") { - isMainActivity = true; - //printf("LOG: isMainActivity==true\n"); + } else if (tag == "uses-library") { + String8 libraryName = getAttribute(tree, NAME_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'android:name' attribute for uses-library: %s\n", error.string()); + goto bail; } - } else if (tag == "category") { - String8 category = getAttribute(tree, NAME_ATTR, &error); + printf("uses-library:'%s'\n", libraryName.string()); + } else if (tag == "receiver") { + withinReceiver = true; + receiverName = getAttribute(tree, NAME_ATTR, &error); + if (error != "") { - fprintf(stderr, "ERROR getting 'name' attribute: %s\n", error.string()); + fprintf(stderr, "ERROR getting 'android:name' attribute for receiver: %s\n", error.string()); goto bail; } - if (category == "android.intent.category.LAUNCHER") { - isLauncherActivity = true; - //printf("LOG: isLauncherActivity==true\n"); - } + } + } else if (depth == 5) { + if (withinActivity) { + if (tag == "action") { + //printf("LOG: action tag\n"); + String8 action = getAttribute(tree, NAME_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string()); + goto bail; + } + if (action == "android.intent.action.MAIN") { + isMainActivity = true; + //printf("LOG: isMainActivity==true\n"); + } + } else if (tag == "category") { + String8 category = getAttribute(tree, NAME_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'name' attribute: %s\n", error.string()); + goto bail; + } + if (category == "android.intent.category.LAUNCHER") { + isLauncherActivity = true; + //printf("LOG: isLauncherActivity==true\n"); + } + } + } else if (withinReceiver) { + if (tag == "action") { + String8 action = getAttribute(tree, NAME_ATTR, &error); + if (error != "") { + fprintf(stderr, "ERROR getting 'android:name' attribute for receiver: %s\n", error.string()); + goto bail; + } + if (action == "android.appwidget.action.APPWIDGET_UPDATE") { + const char *rName = getComponentName(pkg, receiverName); + if (rName != NULL) { + printf("gadget-receiver:'%s/%s'\n", pkg.string(), rName); + } + } + } } } + if (depth < 2) { + withinApplication = false; + } if (depth < 3) { //if (withinActivity) printf("LOG: withinActivity==false\n"); withinActivity = false; + withinReceiver = false; } if (depth < 5) { @@ -581,8 +649,13 @@ int doDump(Bundle* bundle) } if (withinActivity && isMainActivity && isLauncherActivity) { - printf("launchable activity: name='%s' label='%s' icon='%s'\n", - activityName.string(), activityLabel.string(), + printf("launchable activity:"); + const char *aName = getComponentName(pkg, activityName); + if (aName != NULL) { + printf(" name='%s'", aName); + } + printf("label='%s' icon='%s'\n", + activityLabel.string(), activityIcon.string()); } } @@ -612,7 +685,7 @@ int doDump(Bundle* bundle) } result = NO_ERROR; - + bail: if (asset) { delete asset; diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 6f71a1e..a09b1a6 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1109,7 +1109,8 @@ status_t compileResourceFile(Bundle* bundle, if (!localHasErrors) { err = outTable->startBag(SourcePos(in->getPrintableSource(), block.getLineNumber()), - myPackage, curType, ident, parentIdent, &curParams); + myPackage, curType, ident, parentIdent, &curParams, + overwrite); if (err != NO_ERROR) { hasErrors = localHasErrors = true; } @@ -1409,6 +1410,8 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos, const ResTable_config* params, bool replace, bool isId) { + status_t result = NO_ERROR; + // Check for adding entries in other packages... for now we do // nothing. We need to do the right thing here to support skinning. uint32_t rid = mAssets->getIncludedResources() @@ -1442,8 +1445,15 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos, } e->setParent(bagParent); } - - return e->makeItABag(sourcePos); + + if ((result = e->makeItABag(sourcePos)) != NO_ERROR) { + return result; + } + + if (replace) { + return e->emptyBag(sourcePos); + } + return result; } status_t ResourceTable::addBag(const SourcePos& sourcePos, @@ -2798,6 +2808,17 @@ status_t ResourceTable::Entry::addToBag(const SourcePos& sourcePos, return NO_ERROR; } +status_t ResourceTable::Entry::emptyBag(const SourcePos& sourcePos) +{ + status_t err = makeItABag(sourcePos); + if (err != NO_ERROR) { + return err; + } + + mBag.clear(); + return NO_ERROR; +} + status_t ResourceTable::Entry::generateAttributes(ResourceTable* table, const String16& package) { diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index e8fbd9b..74ba326 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -254,7 +254,9 @@ public: String16 getParent() const { return mParent; } status_t makeItABag(const SourcePos& sourcePos); - + + status_t emptyBag(const SourcePos& sourcePos); + status_t setItem(const SourcePos& pos, const String16& value, const Vector<StringPool::entry_style_span>* style = NULL, diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index d6277fa..3bee3b6 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) { diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index f7a9677..6ea35f5 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -245,6 +245,13 @@ public class WifiStateTracker extends NetworkStateTracker { private static final int RUN_STATE_RUNNING = 2; private static final int RUN_STATE_STOPPING = 3; private static final int RUN_STATE_STOPPED = 4; + + private static final String mRunStateNames[] = { + "Starting", + "Running", + "Stopping", + "Stopped" + }; private int mRunState; private final IBatteryStats mBatteryStats; @@ -836,7 +843,14 @@ public class WifiStateTracker extends NetworkStateTracker { newDetailedState = DetailedState.FAILED; } handleDisconnectedState(newDetailedState); - if (mRunState == RUN_STATE_RUNNING && !mIsScanOnly) { + /** + * If we were associated with a network (networkId != -1), + * assume we reached this state because of a failed attempt + * to acquire an IP address, and attempt another connection + * and IP address acquisition in RECONNECT_DELAY_MSECS + * milliseconds. + */ + if (mRunState == RUN_STATE_RUNNING && !mIsScanOnly && networkId != -1) { sendEmptyMessageDelayed(EVENT_DEFERRED_RECONNECT, RECONNECT_DELAY_MSECS); } else if (mRunState == RUN_STATE_STOPPING) { synchronized (this) { @@ -1376,13 +1390,24 @@ public class WifiStateTracker extends NetworkStateTracker { } } + /** + * We want to stop the driver, but if we're connected to a network, + * we first want to disconnect, so that the supplicant is always in + * a known state (DISCONNECTED) when the driver is stopped. + * @return {@code true} if the operation succeeds, which means that the + * disconnect or stop command was initiated. + */ public synchronized boolean disconnectAndStop() { if (mRunState != RUN_STATE_STOPPING && mRunState != RUN_STATE_STOPPED) { // Take down any open network notifications setNotificationVisible(false, 0, false, 0); mRunState = RUN_STATE_STOPPING; - return WifiNative.disconnectCommand(); + if (mWifiInfo.getSupplicantState() == SupplicantState.DORMANT) { + return WifiNative.stopDriverCommand(); + } else { + return WifiNative.disconnectCommand(); + } } else { /* * The "driver-stop" wake lock normally is released from the @@ -1574,9 +1599,14 @@ public class WifiStateTracker extends NetworkStateTracker { @Override public String toString() { StringBuffer sb = new StringBuffer(); - sb.append("interface ").append(mInterfaceName). - append(" runState=").append(mRunState).append(LS); - sb.append(mWifiInfo).append(LS); + sb.append("interface ").append(mInterfaceName); + sb.append(" runState="); + if (mRunState >= 1 && mRunState <= mRunStateNames.length) { + sb.append(mRunStateNames[mRunState-1]); + } else { + sb.append(mRunState); + } + sb.append(LS).append(mWifiInfo).append(LS); sb.append(mDhcpInfo).append(LS); sb.append("haveIpAddress=").append(mHaveIPAddress). append(", obtainingIpAddress=").append(mObtainingIPAddress). |
