summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Trim unnecessary pages when printing.Svetoslav2014-09-0913-49/+701
| | | | | | | | | | | | | | | A user may request a subset of the document's pages to be printed. In this case the expectation is that the resulting document does not include not selected pages. While print serivices can do the trimming themselves or the printer may do so, moving, potantually many, redundant pages is inefficient. The real problem is when saving to a PDF file where the saved file must not have the pages the user did not select. This change adds shredding of undesired pages from the PDF before saving it or passing it to a print service. : bug:17285994 Change-Id: I7deba535af99457bea3c118202314f0f3812e809
* Merge "Build layoutlib create tests as part of sdk build." into lmp-devDeepanshu Gupta2014-09-091-0/+3
|\
| * Build layoutlib create tests as part of sdk build.Deepanshu Gupta2014-09-081-0/+3
| | | | | | | | | | | | LayoutLib Create tests are now built whenever LayoutLib create is built. Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
* | Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-devEric Laurent2014-09-092-4/+2
|\ \
| * | unhide AudioAttributes flag FLAG_HW_AV_SYNCEric Laurent2014-09-082-4/+2
| | | | | | | | | | | | | | | Bug: 17112525. Change-Id: Ia817d8e4b6e517da04f948bcb138fc38faea6caf
* | | Merge "Fix rsMatrix documentation." into lmp-devJean-Luc Brouillet2014-09-092-238/+296
|\ \ \ | |_|/ |/| |
| * | Fix rsMatrix documentation.Jean-Luc Brouillet2014-09-082-238/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | A previous CL changed the source file. As the build system does not build this doc file automatically, this CL updates it. b/17310590 Change-Id: I9536237d0b2cc449f1cf4a35159588f91bcdcad1
* | | Merge "Implement getAvailableChannels" into lmp-devVinit Deshpande2014-09-092-1/+13
|\ \ \ | |/ / |/| |
| * | Implement getAvailableChannelsVinit Deshpande2014-09-052-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | This API allows finding channels by band, so scanning services can find out which channels to use. Bug: 16652660 Change-Id: I690825333988a336efa3fc8886297e5b8baf8e1d
* | | Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-devAndreas Gampe2014-09-095-15/+46
|\ \ \
| * | | Frameworks/base: Add native bridge post-fork initializationAndreas Gampe2014-09-085-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3) Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
* | | | Merge "Update IntelliJ project file for IntelliJ 14" into lmp-devDeepanshu Gupta2014-09-091-1/+1
|\ \ \ \
| * | | | Update IntelliJ project file for IntelliJ 14Deepanshu Gupta2014-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IntelliJ keeps reordering the options this way each time the project is opened. Change-Id: I0e19b5b0a858b3fa9a1134b883ed5180c4ef146e
* | | | | Merge "Add layoutlib tests to DIST_DIR" into lmp-devDeepanshu Gupta2014-09-092-0/+6
|\ \ \ \ \
| * | | | | Add layoutlib tests to DIST_DIRDeepanshu Gupta2014-09-052-0/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the layoutlib and layoutlib-create tests to DIST_DIR for sdk targets. These can be used for continuous testing on the build server. Change-Id: I747dddcddfd8009937668bec4d75cb99bf63235f
* | | | | Merge "Remove warning for null entries in resource array." into lmp-devDeepanshu Gupta2014-09-091-5/+0
|\ \ \ \ \
| * | | | | Remove warning for null entries in resource array.Deepanshu Gupta2014-09-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32e0b8129e29f3e1e5a472b26e16f3fd06d4b91b
* | | | | | am d87e0484: am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use ↵Dirk Dougherty2014-09-097-16/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explicit intent when binding to billing service." into klp-modular-docs * commit 'd87e04843ee6dfdba45f133cde423ba30be60e7a': Doc change: Add note to use explicit intent when binding to billing service.
| * \ \ \ \ \ am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent ↵Dirk Dougherty2014-09-087-16/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when binding to billing service." into klp-modular-docs * commit '604ae4c79e67be6be19724e03f35b9e6cc3fd617': Doc change: Add note to use explicit intent when binding to billing service.
| | * \ \ \ \ \ am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding ↵Dirk Dougherty2014-09-087-16/+22
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to billing service." into klp-modular-docs * commit '552e5ce6bb418b9a8b3b1ba9c102c562d0a4019e': Doc change: Add note to use explicit intent when binding to billing service.
| | | * \ \ \ \ \ Merge "Doc change: Add note to use explicit intent when binding to billing ↵Dirk Dougherty2014-09-087-16/+22
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service." into klp-modular-docs
| | | | * | | | | | Doc change: Add note to use explicit intent when binding to billing service.Dirk Dougherty2014-09-047-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I820d7aa88b5951736224d358a3a9d3f0caac6956
* | | | | | | | | | Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-devMichael Wright2014-09-091-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add FEATURE_GAMEPAD to current.txtMichael Wright2014-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c5a7910983ac3bc5850fba2dfc4d96b11fbd2f0
* | | | | | | | | | | Merge "Change getCurrentPhoneType to SystemApi" into lmp-devWink Saville2014-09-091-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change getCurrentPhoneType to SystemApiWink Saville2014-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17394367 Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
* | | | | | | | | | | | Merge "Assisted dialing support of MO SMS" into lmp-devAmit Mahajan2014-09-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Assisted dialing support of MO SMSXia Ying2014-09-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is special for VZW requirement. Follow the specificaitons of assisted dialing of MO SMS while traveling on VZW CDMA, international CDMA or GSM markets. Change-Id: I34a531b817095f4ce035f3f49a3bf7d6e2e8bc13
* | | | | | | | | | | | | Merge "change the property name about IDP from 'telephony.' to 'gsm.'" into ↵Amit Mahajan2014-09-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | | | | | | change the property name about IDP from 'telephony.' to 'gsm.'Steven Liu2014-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'telphony.' couldn't be set successfully. Change-Id: I8a9ee29461bf764f2b269bb81fafe83d8d5e48d9
* | | | | | | | | | | | | | Merge "Don't track TextureLayer lifecycles in RenderState" into lmp-devChris Craik2014-09-084-17/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't track TextureLayer lifecycles in RenderStateChris Craik2014-09-084-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17208461 They are destroyed via finalizer-enqueued destroy method, so it's not valid to check that they've been destroyed at gl context destruction time. Change-Id: I670f69825547facd5f31d44acb406418881fee00
* | | | | | | | | | | | | | Merge "Reserve NetIds 1..50 for OEM use." into lmp-devSreeram Ramachandran2014-09-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Reserve NetIds 1..50 for OEM use.Sreeram Ramachandran2014-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also reserve 51..100 for our use. Bug: 17303534 Change-Id: Id082368b493dc3c5b5c479e51d273458d80ec6aa
* | | | | | | | | | | | | | | Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-devMichael Wright2014-09-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSISTMichael Wright2014-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to simplify Project Watson requirements and enable USB Audio to easily implement similar functionality to the Watson headsets. Change-Id: Idd0a0cd6c6ba4a977090fb338d9241046f0380e6
* | | | | | | | | | | | | | | | Merge "Add FEATURE_GAMEPAD." into lmp-devMichael Wright2014-09-081-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add FEATURE_GAMEPAD.Michael Wright2014-09-081-0/+9
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows micro-consoles or other devices to signify that there's a game controller in the box, even if the user hasn't connected it. Change-Id: Ie5e2cf69f777ebe84abb83f34c9ed63d9555deff
* | | | | | | | | | | | | | | Merge "Allow wake keys to wake dozing device." into lmp-devMichael Wright2014-09-081-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Allow wake keys to wake dozing device.Michael Wright2014-09-081-6/+9
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new key interception policy removed the wake status from key presses while in the device was dozing. Since we still want to wake from these keys by going from doze -> fully interactive, just don't remove the wake status and allow the device to be woken up as normal. Bug: 17422475 Change-Id: I835e51cc9c557d8ce2e8f8502d84f04aae138e79
* | | | | | | | | | | | | | | Merge "Remove unused variables from UsbHostManager." into lmp-devMichael Wright2014-09-081-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove unused variables from UsbHostManager.Michael Wright2014-09-081-3/+0
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68067b69de077667482633cc6ecd97ee94ecb699
* | | | | | | | | | | | | | | Merge "Enable (@hidden) video connection support for RemoteConnections" into ↵Ihab Awad2014-09-086-23/+397
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | | | | | | | Enable (@hidden) video connection support for RemoteConnectionsIhab Awad2014-09-086-23/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16958934 Change-Id: I2c618743a689303f1bec190da53a1ec42d759370
* | | | | | | | | | | | | | | am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be ↵Robert Ly2014-09-081-51/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" * commit '718803f52e7311af2500c0e4ee9aacc2c43882e2': Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
| * | | | | | | | | | | | | | am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to ↵Robert Ly2014-09-081-51/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" * commit 'aa19f1fccb12eb141af92837aded0478006ab935': Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
| | * | | | | | | | | | | | | am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK ↵Robert Ly2014-09-081-51/+123
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" * commit 'b5a21ad3fba1d8d3b096a0d685d71c148fefa11b': Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
| | | * | | | | | | | | | | | Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: ↵Robert Ly2014-09-081-51/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" This reverts commit 4186379a2a37123d31ce5d1aff1facc8e7dfbfd3. Change-Id: I34a7b8689362053c0ad8124eaa3f40a5c282bc80
* | | | | | | | | | | | | | | am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be ↵David Friedman2014-09-081-123/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" * commit '7eabd92a14d8804092ffdef8235ecfdae72abef9': Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
| * | | | | | | | | | | | | | am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK ↵David Friedman2014-09-081-123/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" * commit '3207948444ed39b867c14cfc314b8caaf60fe571': Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"