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

113490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Primiano Tucci
14a2d2fbe6 Merge "Adding freeMemoryForTests static method to WebView." 2013-09-12 11:04:07 +00:00
Primiano Tucci
2442675002 Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
 2013-09-12 10:58:29 +01:00
Dirk Dougherty
a6c02679e1 Pass whitelist of sample groups to doclava. 
Change-Id: I36f3e3426115cc296531cf41d20ab07a4d429b19
 2013-09-12 00:37:50 -07:00
Daniel Sandler
0594b192cd Remove spurious density-specific default wallpaper. 
Bug: 10671611
Change-Id: I719bfb09cfd1cbc56f577cdcbf0a9945739355e2
 2013-09-12 01:18:55 -04:00
Igor Murashkin
9ea4ae67fb camera_metadata: add android.lens.state MOVING enum value 
Bug: 10621609
Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2
 2013-09-11 21:43: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
6304f68dfd Merge "Import translations. DO NOT MERGE" 2013-09-12 02:47:14 +00:00
Baligh Uddin
541db90bf7 Merge "Import translations. DO NOT MERGE" 2013-09-12 02:46:19 +00:00
Baligh Uddin
4dff98689d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:46:12 +00:00
Baligh Uddin
1d7d66fe9d Merge "Import translations. DO NOT MERGE" 2013-09-12 02:46:08 +00:00
Baligh Uddin
629b37fb0e Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:58 +00:00
Baligh Uddin
c57bd8b996 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:52 +00:00
Baligh Uddin
1d6c7990ba Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:24 +00:00
Baligh Uddin
0792054f6b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:12 +00:00
Baligh Uddin
7b476f598e Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:08 +00:00
Robert Greenwalt
126755cf41 Fix Wifi Batch Scanning 
Some parsing bugs, more debug logs, etc.

bug:9301872
Change-Id: I245ab00955e245be81a019750be0f8491aa505fd
 2013-09-11 19:31:20 -07:00
Adam Powell
5fcf5b9fd3 Show alternate menu panel on devices with menu key 
Provide a softer transition to the overflow-everywhere world for
devices with menu keys. The panel menu will still be used on these
devices in response to a menu key press even in the presence of an
action bar with overflow.

Fix a few lingering bugs around dispatching the open-overflow
transition that caused problems with this along the way.

Change-Id: I9d77c70f6d15c47160ac06292984101d619c44e6
 2013-09-11 19:17:38 -07: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
dde1f8b01b am 1e763fd2: am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '1e763fd280b3dc555e6a0a3a6458fbdb9a43e096':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:08:56 -07: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
2cfb6826c3 am 6d6c5de1: am 03ad7ae1: Merge "consumer ir: clarify @link in documentation" into klp-dev 
* commit '6d6c5de165ab99b1c8e131425f51c2ac749312e0':
  consumer ir: clarify @link in documentation
 2013-09-11 17:46:42 -07: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
486ad2a7ba am 6c2ad7ac: am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 
* commit '6c2ad7ac97ecc23525ff5ad499edaa9316c230e9':
  Use setAirplaneMode() API for Connectivity Manager tests
 2013-09-11 17:31:04 -07:00
Lajos Molnar
c4eae8ec47 am 5481e5fe: am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 
* commit '5481e5fe30e3708f8a7a9ea8a1dabfa4ae050370':
  MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT
 2013-09-11 17:31:00 -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
Eric Laurent
835b5f344b am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit 'e33b79ef373fd3db9de035b5ecf2137a0684a441':
  Add HOTWORD as an AudioSource
 2013-09-11 17:25:05 -07:00
Eino-Ville Talvala
1663033d96 am fb09a738: am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* commit 'fb09a7381992c6ca88b35d3d0103b38051174928':
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-11 17:24:56 -07:00
Ruben Brunk
b78b4af70d am fae16ab3: am 91019c9e: Merge "Remove dependency on JNIHelp header side effects." into klp-dev 
* commit 'fae16ab39fe651f97bf86e6f5fe07f95342450aa':
  Remove dependency on JNIHelp header side effects.
 2013-09-11 17:24:49 -07:00
Elliott Hughes
16a584096a am 2df0f9ed: am 442a8753: am c3415a91: Merge "Remove ArpPeer; dead code from Google TV." 
* commit '2df0f9ed82f9dab253d2359df12b119ed36af522':
  Remove ArpPeer; dead code from Google TV.
 2013-09-11 17:24:43 -07:00
Amith Yamasani
05a1278ea4 am 2861921c: am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit '2861921c2433867679bd7bd1bb674239eb0afa50':
  Change selection highlight for intent disambig dialog
 2013-09-11 17:24:39 -07:00
Chong Zhang
0b8dd03313 am 1c6835a2: am bcb97996: Merge "Pass subtitle track properties to SubtitleController" into klp-dev 
* commit '1c6835a28a03409eb6f3368b2466993fb993c7a6':
  Pass subtitle track properties to SubtitleController
 2013-09-11 17:24:35 -07:00
Xia Wang
b32a80425d Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev 2013-09-12 00:24:31 +00:00
Mindy Pereira
3878b78631 am 21497c5f: am af2d8bbd: Merge "Scale feels too quick in relation to movement" into klp-dev 
* commit '21497c5f5d6ed3ddf90cf48c5a21b7f7de1f91b5':
  Scale feels too quick in relation to movement
 2013-09-11 17:24:30 -07:00
Kenny Root
b203dc138e am efbfe81d: am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 
* commit 'efbfe81d2607221170a7fcb1d22a82c198e789f4':
  Fix another off-by-one error in ZipFileRO
 2013-09-11 17:24:17 -07:00
Zhijun He
ed3544a695 am 10ccc326: am e550446d: Merge "ImageReader: Skip size check for BLOB format" into klp-dev 
* commit '10ccc3266e5e66a49a0c64678936fb0402b93c4a':
  ImageReader: Skip size check for BLOB format
 2013-09-11 17:24:00 -07:00
destradaa
9d820c5832 am 55a70777: 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 '55a707775681e3a51d98f4c8aaf15be074c52ce8':
  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 17:23:49 -07:00
Adam Powell
a395e70109 am 18149fcf: am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '18149fcf86eee3335b28b2c2373b585c4e18745a':
  Action bar refactoring and transitions
 2013-09-11 17:23:37 -07:00
Jeff Sharkey
123eeea6d6 am e2d76fa8: am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* commit 'e2d76fa8c6d0f5c3d1a73a3ec9756c4bc545806d':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 17:23:29 -07:00
Kenny Root
317c602f0e am d9141d93: am d292f790: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit 'd9141d939eff2e53c95f92a6a2c34116fd7a868b':
  Reconcile differences between zip implementations
 2013-09-11 17:23:15 -07:00
Tom O'Neill
67ecfe7b48 am 0494832f: am 706113fa: Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev 
* commit '0494832fc633b72951fd6faeff342ce23d2ecae4':
  Improve some javadoc related to isProviderEnabled() apis
 2013-09-11 17:23:09 -07:00
Santos Cordon
e7f6bfbc51 am 07d545e0: am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit '07d545e08d615865860a0f73b7eabfd149754893':
  Add permissions for the InCallUI Split.
 2013-09-11 17:23:04 -07:00