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

112536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
bf142e6b84 am 16dae599: am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '16dae5997bb0ff7f03d5a0ccfdc4be94aa35ba51':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:33:35 -07:00
Dirk Dougherty
16dae5997b am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '834ba47485a5fb55c89d8f22b826bdb26049f6d6':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:28:18 -07:00
Dirk Dougherty
834ba47485 am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '4c6cde545c5d2e76d9ba8ef926399463369da7e7':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:22:20 -07:00
John Spurlock
932c1251e4 am 43c70b0c: Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 
* commit '43c70b0ccface3e7e0730d9bc0a46b90f16c4b17':
  Status bar interaction veto revoked on ups/cancels.
 2013-09-12 09:17:05 -07:00
Jeff Sharkey
c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:17:02 -07:00
Flavio Lerda
3f36b33dca am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit 'b25cfdf1ece9163292e2b4c86910fe07b14c0afa':
  Document the order of values returned by keyAt().
 2013-09-12 09:17:00 -07:00
Jeff Brown
a090866557 am 737d2c0b: Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 
* commit '737d2c0b92b69d9069de6fe0e2785676b9a10d78':
  Ignore ON_AFTER_RELEASE for partial wake locks.
 2013-09-12 09:16:57 -07:00
Baligh Uddin
0b5fa44b24 am 4dff9868: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4dff98689d4c5f98159206730074aaa6463ada23':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:55 -07:00
Baligh Uddin
d55c00c93c am c57bd8b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c57bd8b9962a87282aef4bf367c33238f1d7c46e':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:52 -07:00
Baligh Uddin
8432e5f05c am 0792054f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '0792054f6b94986ed72df4f7fb8e775d8b916946':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:49 -07:00
Alex Ray
0417baa536 am c333a3f7: Merge "consumer_ir: add length to get carrier freqs" into klp-dev 
* commit 'c333a3f7c6bf838aad2a2419ea65167e344f0cab':
  consumer_ir: add length to get carrier freqs
 2013-09-12 09:16:46 -07:00
Dirk Dougherty
4c6cde545c am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '89579294ce0fbe728738fa09fb45cc53fd79bfb5':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:15:25 -07:00
John Spurlock
43c70b0ccf Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 2013-09-12 16:05:56 +00:00
Dirk Dougherty
89579294ce Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 2013-09-12 16:01:52 +00:00
Jeff Sharkey
357f9e34ca Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 2013-09-12 16:00:40 +00:00
John Spurlock
5fee8360f8 Status bar interaction veto revoked on ups/cancels. 
If we get an ACTION_UP or ACTION_CANCEL and the shade is not
expanded, treat this as a signal of !interacting, revoking
the interaction veto.

Bug:10711758
Change-Id: Ia69ff24880193fa8d99ece79053eeb95dfa9ba71
 2013-09-12 11:35:08 -04:00
Flavio Lerda
b25cfdf1ec Merge "Document the order of values returned by keyAt()." into klp-dev 2013-09-12 11:49:29 +00:00
Dirk Dougherty
a6c02679e1 Pass whitelist of sample groups to doclava. 
Change-Id: I36f3e3426115cc296531cf41d20ab07a4d429b19
 2013-09-12 00:37:50 -07:00
Jeff Brown
737d2c0b92 Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 2013-09-12 04:03:31 +00:00
Baligh Uddin
4dff98689d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:46:12 +00:00
Baligh Uddin
c57bd8b996 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:52 +00:00
Baligh Uddin
0792054f6b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:12 +00:00
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