summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Hiding some unneeded APIs,Svetoslav2013-09-051-2/+0
* | | | | | | | am a3fa5138: am cef05c28: Incorporate new API council commentsTom O'Neill2013-09-051-7/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Incorporate new API council commentsTom O'Neill2013-09-051-7/+6
| | |/ / / / / | |/| | | | |
* | | | | | | am 4965dbc3: am d2676f9b: Merge "Add YUV element convenience function." into ...Tim Murray2013-09-051-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add YUV element convenience function." into klp-devTim Murray2013-09-051-0/+1
| |\ \ \ \ \ \
| | * | | | | | Add YUV element convenience function.Tim Murray2013-09-041-0/+1
* | | | | | | | am b966605a: am c5c203d6: Merge "Print API updated." into klp-devSvetoslav2013-09-041-89/+48
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Print API updated." into klp-devSvetoslav2013-09-051-89/+48
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Print API updated.Svetoslav2013-09-041-89/+49
* | | | | | | | am 25d81a4c: am eebf6895: Merge "Revert "Re-@hide activity-level FLAG_IMMERSI...John Spurlock2013-09-041-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp...John Spurlock2013-09-051-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."John Spurlock2013-09-051-0/+3
* | | | | | | | | am e82f1ce5: am 631228b0: Merge "Re-@hide activity-level FLAG_IMMERSIVE and h...John Spurlock2013-09-041-3/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-devJohn Spurlock2013-09-051-3/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Re-@hide activity-level FLAG_IMMERSIVE and helpers.John Spurlock2013-09-041-3/+0
* | | | | | | | am a7a8cdfa: am 7f71206d: Merge "Fix issue #10461600: KLP API Review: UndoMan...Dianne Hackborn2013-09-041-55/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-devDianne Hackborn2013-09-051-55/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Fix issue #10461600: KLP API Review: UndoManagerDianne Hackborn2013-09-041-55/+0
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | resolved conflicts for merge of 09ed0720 to masterChet Haase2013-09-041-165/+130
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Transition API changes from API council recommendationsChet Haase2013-09-041-165/+130
| |/ / / / / /
* | | | | | | am 70c2dd93: am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broa...Tom O'Neill2013-09-041-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-devTom O'Neill2013-09-041-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add LocationManager.MODE_CHANGED_ACTION broadcastTom O'Neill2013-09-031-0/+1
* | | | | | | am 1b6d0891: am 11254ade: Merge "Add provideAssistData attr to public.xml" in...Adam Skory2013-09-041-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add provideAssistData attr to public.xmlAdam Skory2013-09-041-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | am a5259f62: am f48416de: Merge "Reader mode NFC API: move to callback model....Martijn Coenen2013-09-031-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Reader mode NFC API: move to callback model." into klp-devMartijn Coenen2013-09-041-1/+7
| |\ \ \ \ \
| | * | | | | Reader mode NFC API: move to callback model.Martijn Coenen2013-09-021-1/+7
* | | | | | | am b29cb9ec: am de59baab: Merge "Ensure list scrolling API is in parity with ...Alan Viverette2013-09-031-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Ensure list scrolling API is in parity with view scrolling API" into k...Alan Viverette2013-09-031-1/+2
| |\ \ \ \ \ \
| | * | | | | | Ensure list scrolling API is in parity with view scrolling APIAlan Viverette2013-09-031-1/+2
| | | |/ / / / | | |/| | | |
* | | | | | | am a7cd8835: am a861245f: Merge "VideoView: add addSubtitleSource" into klp-devLajos Molnar2013-09-031-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "VideoView: add addSubtitleSource" into klp-devLajos Molnar2013-09-031-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | VideoView: add addSubtitleSourceLajos Molnar2013-08-301-0/+3
* | | | | | | am 24bd1740: am d0e2a2e7: Merge "Improve constant names for settings injectio...Tom O'Neill2013-09-031-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Improve constant names for settings injection API" into klp-devTom O'Neill2013-09-031-3/+4
| |\ \ \ \ \ \
| | * | | | | | Improve constant names for settings injection APITom O'Neill2013-08-301-3/+4
* | | | | | | | am e22cb840: am b143c669: Merge "Add drawable for Apdu Services, fix build." ...Martijn Coenen2013-09-031-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add drawable for Apdu Services, fix build.Martijn Coenen2013-09-031-0/+1
* | | | | | | | am a3c92d65: am fb2f8337: NFC: @hide and remove abstract from processCommandA...Martijn Coenen2013-09-031-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | NFC: @hide and remove abstract from processCommandApdu().Martijn Coenen2013-09-031-1/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | am 47fd3257: am 5c2dfa8a: Merge "Fix build; add new ScaleGestureDetector cons...Mindy Pereira2013-09-031-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix build; add new ScaleGestureDetector constructor" into klp-devMindy Pereira2013-09-031-0/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix build; add new ScaleGestureDetector constructorMindy Pereira2013-09-031-0/+1
* | | | | | | am 197602de: am 510caf30: Merge "Add doubletap swipe to scalegesturedetector"...Mindy Pereira2013-09-031-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add doubletap swipe to scalegesturedetector" into klp-devMindy Pereira2013-09-031-0/+1
| |\ \ \ \ \ \
| | * | | | | | Add doubletap swipe to scalegesturedetectorMindy Pereira2013-08-291-0/+1
* | | | | | | | am 627f28c0: resolved conflicts for merge of 7e0609eb to klp-dev-plus-aospKenny Root2013-09-031-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge changes Ic710807d,I88dfcc8c into klp-devKenny Root2013-09-031-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Unhide functions to allow ECDSA supportKenny Root2013-09-031-0/+6
| | | |_|_|_|_|/ | | |/| | | | |