drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,671 Commits 1 Branch 0 Tags
Commit Graph

112671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Ray
c333a3f7c6 Merge "consumer_ir: add length to get carrier freqs" into klp-dev 2013-09-12 01:55:27 +00:00
Selim Gurun
1e763fd280 am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit 'e4fdc84794923f9408fc400ed9177178329a08cd':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:05:59 -07:00
Selim Gurun
e4fdc84794 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-12 01:02:45 +00:00
Selim Gurun
41b9ef9c4e Revert "Add permissions for the InCallUI Split." 
This reverts commit 4f7ffa90d117e499786c77bccefdef88c1714668.

Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
 2013-09-12 00:57:34 +00:00
Alex Ray
6d6c5de165 am 03ad7ae1: Merge "consumer ir: clarify @link in documentation" into klp-dev 
* commit '03ad7ae1bc406dbdb452cb5f91f2bde1848fd4cb':
  consumer ir: clarify @link in documentation
 2013-09-11 17:42:53 -07:00
Alex Ray
03ad7ae1bc Merge "consumer ir: clarify @link in documentation" into klp-dev 2013-09-12 00:40:50 +00:00
Jeff Sharkey
de2b22fbc6 Handle pipe thumbnails, acquire unstable refs. 
Support decoding thumbnails delivered over pipes by wrapping in a
buffered stream.  Also switch to using unstable provider references
to avoid crashing DocumentsUI.

Bug: 10516148, 10510851
Change-Id: I85f6eeaca70c97742bf79656d1d0c6da381fdd47
 2013-09-11 17:33:52 -07:00
Xia Wang
6c2ad7ac97 am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 
* commit 'b32a80425db68f67ecafb89093e01e7c1d75770b':
  Use setAirplaneMode() API for Connectivity Manager tests
 2013-09-11 17:26:09 -07:00
Xia Wang
b32a80425d Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 2013-09-12 00:24:31 +00:00
Lajos Molnar
5481e5fe30 am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 
* commit '03cd51cd17989b4167b357b36fe337b75e2cafd6':
  MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT
 2013-09-11 17:21:32 -07:00
Lajos Molnar
03cd51cd17 Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 2013-09-12 00:19:17 +00:00
Eric Laurent
e33b79ef37 am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit '95a181397dad3113b96e3cc7392a5b0f5d742f39':
  Add HOTWORD as an AudioSource
 2013-09-11 17:17:50 -07:00
Eric Laurent
95a181397d Merge "Add HOTWORD as an AudioSource" into klp-dev 2013-09-12 00:15:31 +00:00
Eino-Ville Talvala
fb09a73819 am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* commit 'ede3eeb72c9708df023bdfb369905ededd1ebb06':
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-11 17:10:36 -07:00
Eino-Ville Talvala
ede3eeb72c Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* changes:
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-12 00:08:04 +00:00
Ruben Brunk
fae16ab39f am 91019c9e: Merge "Remove dependency on JNIHelp header side effects." into klp-dev 
* commit '91019c9ef34b2fb00a1c027a57d75ed9e0810df5':
  Remove dependency on JNIHelp header side effects.
 2013-09-11 17:05:48 -07:00
Elliott Hughes
2df0f9ed82 am 442a8753: am c3415a91: Merge "Remove ArpPeer; dead code from Google TV." 
* commit '442a8753a0f312439e2ef233c041d9d584768749':
  Remove ArpPeer; dead code from Google TV.
 2013-09-11 17:02:20 -07:00
Ruben Brunk
91019c9ef3 Merge "Remove dependency on JNIHelp header side effects." into klp-dev 2013-09-12 00:01:28 +00:00
Amith Yamasani
2861921c24 am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit 'bdd06c0a13a7d4c55d6b250ebbe8eeb9d1288b7c':
  Change selection highlight for intent disambig dialog
 2013-09-11 16:58:43 -07:00
Chong Zhang
1c6835a28a am bcb97996: Merge "Pass subtitle track properties to SubtitleController" into klp-dev 
* commit 'bcb97996eb6e5ef257c6f4418ce49ff410002471':
  Pass subtitle track properties to SubtitleController
 2013-09-11 16:58:40 -07:00
Amith Yamasani
bdd06c0a13 Merge "Change selection highlight for intent disambig dialog" into klp-dev 2013-09-11 23:56:44 +00:00
Elliott Hughes
442a8753a0 am c3415a91: Merge "Remove ArpPeer; dead code from Google TV." 
* commit 'c3415a918df78715db756f02d8c55a1e7ab94244':
  Remove ArpPeer; dead code from Google TV.
 2013-09-11 16:52:01 -07:00
Chong Zhang
bcb97996eb Merge "Pass subtitle track properties to SubtitleController" into klp-dev 2013-09-11 23:51:45 +00:00
Elliott Hughes
c3415a918d Merge "Remove ArpPeer; dead code from Google TV." 2013-09-11 23:48:34 +00:00
Mindy Pereira
21497c5f5d am af2d8bbd: Merge "Scale feels too quick in relation to movement" into klp-dev 
* commit 'af2d8bbdbd9fdbcf109949ec18dc2bb2312b5744':
  Scale feels too quick in relation to movement
 2013-09-11 16:35:28 -07:00
Mindy Pereira
af2d8bbdbd Merge "Scale feels too quick in relation to movement" into klp-dev 2013-09-11 23:33:02 +00:00
Alex Ray
5022f275e3 consumer_ir: add length to get carrier freqs 
Change-Id: I2c1ac27e46c0bcfdfadef227a2fa79bdcf7085d4
 2013-09-11 16:21:25 -07:00
Elliott Hughes
62d7bf2ab3 Remove ArpPeer; dead code from Google TV. 
Change-Id: I595a6b6f52ab513a008e0fd861e98bc4488a1999
 2013-09-11 16:21:16 -07:00
Kenny Root
efbfe81d26 am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 
* commit '931f6f8767ee3b234914763262f1580695bcb208':
  Fix another off-by-one error in ZipFileRO
 2013-09-11 15:40:06 -07:00
Alex Ray
1e679441af consumer ir: clarify @link in documentation 
Change-Id: Ifebd0b550f5d9860697539646596a0b1cc782949
 2013-09-11 15:39:05 -07:00
Kenny Root
931f6f8767 Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 2013-09-11 22:37:03 +00:00
Kenny Root
1c7cf90af4 Fix another off-by-one error in ZipFileRO 
Bug: 10424836
Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807
 2013-09-11 15:28:39 -07:00
Chong Zhang
f8ca13b7a0 Pass subtitle track properties to SubtitleController 
Bug: 10326117
Change-Id: I387406adf3e1bd835b031dd5fbd2e1cdeaf2fe87
 2013-09-11 15:02:47 -07:00
Zhijun He
10ccc3266e am e550446d: Merge "ImageReader: Skip size check for BLOB format" into klp-dev 
* commit 'e550446dcfb96e76715e77e044359b2769ca2676':
  ImageReader: Skip size check for BLOB format
 2013-09-11 14:45:49 -07:00
Xia Wang
0076729d38 Use setAirplaneMode() API for Connectivity Manager tests 
Change-Id: I2e35c58e4101b6b5fe9efdb5adad922402d38b6f
 2013-09-11 14:44:30 -07:00
Selim Gurun
a5c86c644b Publish Print Api for Webview 
Bug:10652036

Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64
 2013-09-11 14:42:50 -07:00
Chet Haase
abd3d778e5 Hide translucent activity conversion API 
This API and functionality is not yet completely baked. It's worth
thinking more about this mechanism before exposing it as public API.

Issue #10461415 KLP API Review: Activity convert to translucent

Change-Id: I94d986b62443b3bfa7a9a19807ecebe36bf57e07
 2013-09-11 14:33:05 -07:00
Zhijun He
e550446dcf Merge "ImageReader: Skip size check for BLOB format" into klp-dev 2013-09-11 21:31:54 +00:00
destradaa
55a7077756 am f8a910fb: Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev 
* commit 'f8a910fbd5b72e3350740d224b36db49dc3170e6':
  Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information
 2013-09-11 14:17:52 -07:00
destradaa
f8a910fbd5 Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev 2013-09-11 21:15:34 +00:00
Chet Haase
ff58f92a0a Add exclude() methods to Transition 
It would be useful for a transition to declare not just which
targets it wants to be run on, but also which targets it wants
to avoid. For example, you may not want to animate the items of
a ListView, or some other specific target in the view hierarchy.

This change adds various exclude*() methods which make it
possible to alter a transition to automatically ignore specific
views, ids, or classes in the hierarchy.

Issue #10692794 Transitions: Need API for excluding targets

Change-Id: If38025cdbee537a545e5a4268cbbd763af4622c5
 2013-09-11 13:53:43 -07:00
Adam Powell
18149fcf86 am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '6847447da0b3e2e30e88838ec85244d1a0ee8927':
  Action bar refactoring and transitions
 2013-09-11 13:42:28 -07:00
Adam Powell
6847447da0 Merge "Action bar refactoring and transitions" into klp-dev 2013-09-11 20:38:41 +00:00
Jeff Sharkey
e2d76fa8c6 am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* commit 'ceccceccffbd2668b98e21487f2323f80d2c7b98':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 13:19:12 -07:00
Eino-Ville Talvala
70c2207c34 Camera2: Immutable metadata 
Make all camera metadata immutable once created; requests are
created using CameraRequest.Builder.

- Separate CameraMetadata implementation from interface
- Implement deep copying of metadata
- Requests/results/properties have-a native implementation

Bug: 10360518
Change-Id: Ia6300c237219d39f70c63156fa9ca666d951a36e
 2013-09-11 13:18:10 -07:00
Zhijun He
37682135da ImageReader: Skip size check for BLOB format 
HAL_PIXEL_FORMAT_BLOB is for JPEG capture, the buffer width/height by definition
shouldn't be the same as the image width/height.

Bug: 10360518
Change-Id: I32146a0e8e15439bb8fe199403db4ff37d1ab1af
 2013-09-11 13:18:00 -07:00
Jeff Sharkey
ceccceccff Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 20:16:59 +00:00
Amith Yamasani
ab7cbcef49 Change selection highlight for intent disambig dialog 
Use standard selection/activation highlights

Bug: 10529505
Change-Id: I81bc0a1a799f93dd6595d38c1a42d6d316e0d61a
 2013-09-11 13:06:23 -07:00
Kenny Root
d9141d939e am d292f790: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit 'd292f790be5074998c1adc5feb4fea031d0d3d09':
  Reconcile differences between zip implementations
 2013-09-11 12:49:47 -07:00
Kenny Root
d292f790be Merge "Reconcile differences between zip implementations" into klp-dev 2013-09-11 19:47:13 +00:00