summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Ensure list scrolling API is in parity with view scrolling API" into ↵Alan Viverette2013-09-032-5/+32
|\ | | | | | | klp-dev
| * Ensure list scrolling API is in parity with view scrolling APIAlan Viverette2013-09-032-5/+32
| | | | | | | | Change-Id: Icaf533c0085b80f3c52cc026e0da7468698724f9
* | Merge "Prevent NPE when cloning gradients Bug #10436856" into klp-devRomain Guy2013-09-033-5/+6
|\ \
| * | Prevent NPE when cloning gradientsRomain Guy2013-09-033-5/+6
| | | | | | | | | | | | | | | | | | Bug #10436856 Change-Id: I98cbce941a06842112b8caa3753a3fa32b227da9
* | | Merge "VideoView: add addSubtitleSource" into klp-devLajos Molnar2013-09-033-2/+81
|\ \ \
| * | | VideoView: add addSubtitleSourceLajos Molnar2013-08-303-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A way to add external subtitle file to VideoView. Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | | | Merge "Block ble adv api based on resource config" into klp-devMatthew Xie2013-09-033-0/+12
|\ \ \ \
| * | | | Block ble adv api based on resource configMatthew Xie2013-08-283-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 10516911 Change-Id: I7a62103a1116ffbf7c3c934c1794384c0e6fbdd3
* | | | | Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" ↵Dianne Hackborn2013-09-031-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into klp-dev
| * | | | | Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLYDianne Hackborn2013-09-031-2/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Maybe adding more words will make it more clear. :) Change-Id: Ie729eaba1df542d4ffcd0502ccba3807d641fd72
* | | | | Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-devRomain Guy2013-09-033-7/+5
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Update Bitmap.Config.ARGB_4444 documentationRomain Guy2013-09-033-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #10510122 ARGB_4444 is deprecated and always replaced with ARGB_8888. Change-Id: I0da96216af701a7df00ad35913066fbfa997d790
* | | | Merge "Insert home task into history when sending to back." into klp-devCraig Mautner2013-09-032-16/+45
|\ \ \ \
| * | | | Insert home task into history when sending to back.Craig Mautner2013-09-032-16/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There is an assumption that moving a task to the back moves it behind the home activity. This fix ensures that the home activity will be launched by some activity before the task that has been moved to the back. - Convert "private final" declarations to private only. - Convert container tests for size()==0 to isEmpty(). - Remove unused variable. Fixes bug 10228536. Change-Id: I51741ee7a09652e27afffcc50c14953bf0aa27ea
* | | | | Merge "Dim status icons / battery / clock on opaque bars." into klp-devJohn Spurlock2013-09-034-66/+38
|\ \ \ \ \
| * | | | | Dim status icons / battery / clock on opaque bars.John Spurlock2013-09-034-66/+38
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply consistent alpha to the other status bar elements now that they are intrinsically brighter than before. Bug:10602822 Change-Id: I8ca6ddc844f9c58ddf2a1df8d1a5bd7fb71932d1
* | | | | Merge "Improve constant names for settings injection API" into klp-devTom O'Neill2013-09-033-46/+65
|\ \ \ \ \
| * | | | | Improve constant names for settings injection APITom O'Neill2013-08-303-46/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add timing for getStatus() call to encourage implementors to be fast - Affects b/10461474 Change-Id: I503cbae5cf27008c587a39ab4e60d8e09daedecc
* | | | | | Merge "Don't call setLastChosen if it's a chooser activity instance" into ↵Amith Yamasani2013-09-031-83/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | klp-dev
| * | | | | | Don't call setLastChosen if it's a chooser activity instanceAmith Yamasani2013-09-031-83/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10605359 Change-Id: If76f5cf2f45442dc25f9bfbd20a4d671b9caa358
* | | | | | | Merge "Remove deprecated ACCESS_DRM permission." into klp-devJeff Sharkey2013-09-031-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove deprecated ACCESS_DRM permission.Jeff Sharkey2013-09-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The permission no longer exists, so don't assign it to media. Bug: 9967611 Change-Id: I5e11fcfc265310cbc3c2a8812a13e68b717fa476
* | | | | | | | Merge "Add drawable for Apdu Services, fix build." into klp-devMartijn Coenen2013-09-034-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Add drawable for Apdu Services, fix build.Martijn Coenen2013-09-034-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
* | | | | | | | | Merge "Don't ever disable the status/nav bar." into klp-devJohn Spurlock2013-09-031-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't ever disable the status/nav bar.John Spurlock2013-09-031-3/+3
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert part of the fix for b/8682123 until we figure out why the window state does not flip to SHOWING in BarController. Bug:10488453 Change-Id: Ic5d60a6d945b470fd519dc01de30690e61c62e01
* | | | | | | | | Merge "Skip packages with missing metadata." into klp-devJeff Sharkey2013-09-031-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Skip packages with missing metadata.Jeff Sharkey2013-09-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise this would result in NPE, and packages.list would never be updated. Bug: 10577538 Change-Id: I35a4407dbc283ab20a4c45a2ea1a14b04044c98c
* | | | | | | | | Merge "Add tracing to WebView API methods and callbacks" into klp-devKristian Monsen2013-09-036-9/+119
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add tracing to WebView API methods and callbacksJonathan Dixon2013-08-306-9/+119
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10488419 This is useful for debugging numerous SxS issues. Change-Id: I5d0d2e253499741c5f9454582988c99e42dc0a81
* | | | | | | | | am 7081684f: am c236f992: am 5e52ee6e: Doc change: small refinement of brand ↵Dirk Dougherty2013-09-031-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usage guidelines. * commit '7081684f17a3ec768b6048434f47578631249de6': Doc change: small refinement of brand usage guidelines.
| * | | | | | | | am c236f992: am 5e52ee6e: Doc change: small refinement of brand usage ↵Dirk Dougherty2013-09-031-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidelines. * commit 'c236f99234bbcc9b1ced14777b179adb59922b0f': Doc change: small refinement of brand usage guidelines.
| | * \ \ \ \ \ \ \ am 5e52ee6e: Doc change: small refinement of brand usage guidelines.Dirk Dougherty2013-09-031-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e52ee6ecf08b299b433104798e736e2bc3904d5': Doc change: small refinement of brand usage guidelines.
| | | * | | | | | | | Doc change: small refinement of brand usage guidelines.Dirk Dougherty2013-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e7513ee6b5cc0dd0204ca5b78c9fd13e4c8cf4a
* | | | | | | | | | | NFC: @hide and remove abstract from processCommandApdu().Martijn Coenen2013-09-032-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced by new version with Bundle extras. Bug: 10550349 Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b6e7ef36ce79852acd6cefe03fc94143641ff0e
* | | | | | | | | | | | Merge "Bug fixes in the printer dialog activity and fused printer loader." ↵Svetoslav Ganov2013-09-039-65/+120
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev
| * | | | | | | | | | | | Bug fixes in the printer dialog activity and fused printer loader.Svetoslav Ganov2013-09-039-65/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fused printers loader was not using the discovered printers to update the historical ones. Now if a historical printer is discovered we update its state with the discovered, i.e. most recent, information. 2. Fixed a bug in the destination adapter of the print job config dialog that was leading to a crash if all printers item is selected when there are no discovered printers. 3. Updated the add printers asset in the all printers screen. 4. Historical printers were not persisted by the print dialog activity. 5. Reduced the number of printers we send per transation to avoid the binder transaction size limit. Added sending of printers in chunks in a place this was missing. Change-Id: I88b54888360bc0e53b06bd260c2b832d0d6454b6
* | | | | | | | | | | | | Merge "Crashes in TouchExplorer on two finger swipe." into klp-devSvetoslav Ganov2013-09-031-15/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Crashes in TouchExplorer on two finger swipe.Svetoslav Ganov2013-09-031-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The logic for finding the active pointer was incorrect. The code was iterating over all pointer ids and taking the minimum, i.e. the pointer that first went down. The problem was that the down time for pointers that are not down was also considered (set to zero), thus sometimes we would consider the first pointer that went down to be a pointer that is not down at all. Now we are iterating only over the pointers that are down. 2. The batched events while waiting to see if the user is exploring or gesturing were added even if we were in touch exploration state at which point we do not have to batch. As a result we ended up having lefovers from a previous gesture when handling the delayed events and crash. bug:10312546 Change-Id: I4728541ac12e4da4577d22e4314101dd169a52fb
* | | | | | | | | | | | | | Merge "Revert "Add permissions for the InCallUI Split."" into klp-devSantos Cordon2013-09-031-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "Add permissions for the InCallUI Split."Santos Cordon2013-09-031-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bf84eb5ed579d13b74c97b995299ca61cafedea6. Change-Id: I40e311174898a741f5053501290833420355ad03
* | | | | | | | | | | | | | | Merge "Add doubletap swipe to scalegesturedetector" into klp-devMindy Pereira2013-09-032-13/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add doubletap swipe to scalegesturedetectorMindy Pereira2013-08-292-13/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I070b09ed7295e0c3e07c6dffcdaba20226f7c2a3
* | | | | | | | | | | | | | | | Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-devLeon Scroggins III2013-09-034-20/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Change name back to CreateJavaInputStreamAdaptor.Leon Scroggins III2013-09-034-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to fix open source builds, change WrapJavaInputStream's name back to CreateJavaInputStreamAdaptor. Remove FIXME in CopyJavaInputStream, and return a more generic type, since the more specific type was only needed by a change in external/webkit, which is being reverted since it depends on unreleased code. Change-Id: I89b0431e357b509a2a0c17a624b31bd49d29070f
* | | | | | | | | | | | | | | | | Merge "Revert "Enhancement for OnInfo callback on DRM Framework"" into klp-devJeff Tinker2013-09-032-70/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Revert "Enhancement for OnInfo callback on DRM Framework"Jeff Tinker2013-09-032-70/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6fd97b7d93c5eeaefb2695786b35d1672c88b0cf. Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video bug: 10542864 Change-Id: I85b84d6b602079571be1a7237c907716db9cdf54
* | | | | | | | | | | | | | | | | | Merge changes Ic710807d,I88dfcc8c into klp-devKenny Root2013-09-039-198/+1464
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Unhide functions to allow ECDSA support Add support for DSA and ECDSA key types
generated by cgit v1.1 at 2025-02-11 05:12:01 +0000