117941 Commits

Author SHA1 Message Date
Svetoslav
0785ccc2cc am 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev
* commit '85dbba82dffd68867623ab7e881f8adb55ff0428':
2013-12-05 19:37:27 +00:00
Jeff Sharkey
bb76afa9bc am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev
* commit '87a61b838c5cc411853317663beaa46539fd56ef':
2013-12-05 19:37:20 +00:00
Jonathan Dixon
177b89e911 am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6':
2013-12-05 19:37:12 +00:00
Wink Saville
f3aca5f7ca am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '8418a309a3e228538a2cf921f386326a9afe394b':
2013-12-05 19:36:33 +00:00
Wink Saville
47dc5a34b9 am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '8eec0cbe01064156c52a87592796a4352f31a451':
2013-12-05 19:36:10 +00:00
Wink Saville
1535714401 am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev
* commit '94e9e8f16a7a72d1491694b44006b96212d8076e':
2013-12-05 19:35:35 +00:00
Jeff Brown
cc951f1289 am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev
* commit '1c7799e2f35b707c5f5d6544a6d94cd4892891da':
2013-12-05 19:35:27 +00:00
Wink Saville
027b0651eb am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '1a5c94fc65038c72045a5cf5509f2cf152c6c406':
2013-12-05 19:35:18 +00:00
Joe Malin
ede85d2a9d am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
* commit '6023b8289d030e8bf88be33c5f04d298748bd6f4':
2013-12-05 19:35:10 +00:00
Dianne Hackborn
bfdb10d273 am db7b8e21: am 53b9065a: am 42380b6d: am 9f11f105: am 7f09ec39: Fix issue #10226007: Reset apps restores most of the changed settings...
* commit 'db7b8e210d97548b8ed21b6453e1e4100b23a07f':
2013-12-05 19:35:03 +00:00
destradaa
89424f35f7 am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev
* commit 'b4430c5c265a9456356aca71792d5d113f2454ab':
2013-12-05 19:33:23 +00:00
Dianne Hackborn
542ff71acf am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes.
* commit '30d4de76b1ad224bd41c7581b5beb4ace2020398':
2013-12-05 19:33:14 +00:00
David Christie
7f6e1affc2 am 262f3ff2: am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev
* commit '262f3ff288d7da3be8db4c38200e5501e87a3445':
2013-12-05 19:32:59 +00:00
Vinit Deshapnde
f3eb44f2bd am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev
* commit 'a87a28f392cab40569fb17561539081c65cbff13':
2013-12-05 19:32:41 +00:00
Joe Malin
b17aae4987 am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178
* commit 'a0ef14817600623efcb43fa82f308c5a104f75c4':
2013-12-05 19:32:33 +00:00
The Android Open Source Project
9e70700c61 am 8ce3bb90: (-s ours) am 350b9b9b: am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '8ce3bb90cdcef1bfd73b652001c0bb2cd0b2fe6b':
2013-12-05 19:32:26 +00:00
Marco Nelissen
dfc34c7aa0 am a2790462: am 84135337: am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit 'a279046232fe6ee42396f5f7529ed3127ce995bd':
2013-12-05 19:32:10 +00:00
Marco Nelissen
e3a1f7b661 am 910ebd9e: am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit '910ebd9ed34e5fd2b76db67b2f7e3f2be8ade6ea':
2013-12-05 19:32:03 +00:00
Amith Yamasani
1cb3c2332d am 4458c200: am 672d323b: Merge "Developer option to force RTL layout" into klp-dev
* commit '4458c20040ca41d32f982c1a1c971cc94017930b':
2013-12-05 19:31:51 +00:00
David Christie
a840c3c5a5 am 0a2ad75d: am 4104d329: Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don\'t have to find all the different parts of the code that use it (loca
* commit '0a2ad75d2a75b22753c5543d0a5bcb71a19f2e8a':
2013-12-05 19:31:32 +00:00
John Spurlock
cb0a2ddb71 am d5e9f2c1: am c059dbe9: Merge "Fix recent regression in hideytoast." into klp-dev
* commit 'd5e9f2c1597eb406a7bda7ccfa9b11f6b18daeab':
2013-12-05 19:31:26 +00:00
Daniel Sandler
44f974453d am 4a76922e: am d646882a: Add missing densities for HUN backgrounds.
* commit '4a76922e6c405a9e6f5a98103a88ce4b75b895a5':
2013-12-05 19:31:20 +00:00
Daniel Sandler
c1c5d2dfd5 am 9a81e154: am f6971c80: Merge "OK, now it\'s a release." into klp-dev
* commit '9a81e154cc1c46d67387d01d7bffb2451fdb7e7e':
2013-12-05 19:31:14 +00:00
Craig Mautner
7815c8bd17 am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE
* commit '3282fa984a13640c5e523a4b9fa70e7b469b432a':
2013-12-05 19:30:58 +00:00
John Spurlock
af0ea64596 am d9c51fdc: am 7a605df3: Merge "Don\'t always auto-collapse an empty notification shade."
* commit 'd9c51fdcbe053670c4dc083a0bba72b98469293e':
2013-12-05 19:30:51 +00:00
Chris Wren
090a46b54c am 60708eaf: am e97f90b9: on screen off: convert heads up to full screen intent.
* commit '60708eaf2fcfcde579d24bd22de6744f53e00e7e':
2013-12-05 19:30:38 +00:00
Chris Wren
ebf8af7456 am e7ea9466: am 6ccf0aff: Merge "heads up notifications always take the top spot"
* commit 'e7ea9466a01f1acfbc88cf68a0a81fba4d9e3b7b':
2013-12-05 19:30:31 +00:00
Ben Murdoch
a866f6df5e am cf67ae06: am 137e5a3b: Merge "Fix the build"
* commit 'cf67ae066ff4a4fd8b79f9f2e2be4e5cf7b4d5c9':
2013-12-05 19:30:22 +00:00
Chris Wren
87a4a46604 am 4cbafb6a: am d4db6cbc: don\'t bump an active heads up for a corrupt notification
* commit '4cbafb6a9a91c3ad04982269c7ef635876f6f33f':
2013-12-05 19:30:16 +00:00
Chris Wren
7f5709bbd5 am 10afd0f0: am 464a8ce9: Merge "Animate the heads up notification into the shade."
* commit '10afd0f0950a16a561ed80077dc5ec6636a148e6':
2013-12-05 19:30:10 +00:00
Chris Wren
6241ee27cd am 457d901b: am bb8b602b: Merge "ensure heads up slider is initialized."
* commit '457d901b13aebbf9b99a7724a6ac6894ea31ee19':
2013-12-05 19:30:04 +00:00
Chris Wren
6709285ab9 am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets."
* commit '944e41fe32ea863b61cab0f8002a86f6e5a0412b':
2013-12-05 19:29:57 +00:00
Matt Casey
96756e99e2 am 2c18bc28: am 77ece7b1: Merge "Extend assist context to foreground services"
* commit '2c18bc286ecc8fd9ce0ab6cdfac29198a66d0b18':
2013-12-05 19:29:43 +00:00
Martijn Coenen
b35872f3a7 am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host."
* commit '38cfa9358c0aa2a33b088190ada7cc24859ac6b8':
2013-12-05 19:29:36 +00:00
Ying Wang
3cc887c526 am 265bbb56: am 610247fb: Merge "Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}."
* commit '265bbb5613390cba931956732d7f99b82924494e':
2013-12-05 19:29:29 +00:00
Lorenzo Colitti
2316b2b316 am b9f16399: am a50f4b1d: Merge "Simplify LinkPropertiesTest."
* commit 'b9f163996588b9de994bcff6500b1ca704f2996b':
2013-12-05 19:29:23 +00:00
Svetoslav Ganov
42bf3aaaa4 am c8916c9d: am 1194d3f7: Merge "Print UI polish based on UX feedback."
* commit 'c8916c9d05128bcae6978af4304071a30af11a89':
2013-12-05 19:29:17 +00:00
Satoshi Kataoka
96c5475f61 am acc497e4: am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList
* commit 'acc497e4b7323341f830d3e399a846bc5a1ca763':
2013-12-05 19:29:10 +00:00
Jeff Sharkey
83852c5ff4 am 20d49271: am 26d4adf3: Merge "Better handling of broken storage providers."
* commit '20d49271a5e196ae8b264235ebdba204fd0b254d':
2013-12-05 19:29:04 +00:00
Aravind Akella
6904c5f07a am d262fb60: am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR."
* commit 'd262fb60c987efd838995f213a9099bf6aa811c0':
2013-12-05 19:28:58 +00:00
Jeff Brown
a2e33fbaec am cdd4269d: am 16ae0cf1: Merge "Add more virtual display tests."
* commit 'cdd4269d84e51ef713d8a8154ce89407fc3851c7':
2013-12-05 19:28:52 +00:00
Jeff Brown
30345f64e8 am 89fe7541: am 7a54069a: Merge "Dump information about recent input events."
* commit '89fe75419566668f2d1911bfcaaf8bb4e885600d':
2013-12-05 19:28:46 +00:00
Jeff Brown
8cfbb06466 am 33f8fbd3: am 1dc14aeb: Merge "Fix propagation of display overscan information."
* commit '33f8fbd3de497d336e25068b69daf7645f9d0c38':
2013-12-05 19:28:40 +00:00
Jason Monk
73f61c804c am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration"
* commit '020d429dedc736a08c08b3fa702cf570a151f6fc':
2013-12-05 19:28:34 +00:00
Alan Viverette
2166b9b890 am 6888e50d: am ea55b229: Merge "Fix initial FastScroller enabled state, fix padding during layout"
* commit '6888e50d2616d5ff37f9d5f20275b305dda3649a':
2013-12-05 19:28:28 +00:00
Scott Main
fd1a17f738 am 37d77b19: am 55db1e12: am ef54f611: am bdf85de3: am 7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
* commit '37d77b198d4c3ee542711a96a727248c41ecefa8':
2013-12-05 19:28:21 +00:00
Ben Gruver
8494a6e311 am 1883de04: am 49660c7c: Add support for broadcast intents
* commit '1883de0464d590b1562bc60b648475b5193559d4':
2013-12-05 19:28:15 +00:00
Ben Gruver
4196d956a7 am 7bd12d5d: am f157b48e: Add support for matching explicit intents
* commit '7bd12d5d1119aa564bd4d03042dcd91017e59050':
2013-12-05 19:28:09 +00:00
Ben Gruver
46389b40f1 am 201b12dd: am f5323fee: Pass in the ComponentName of the resolved service for service intents
* commit '201b12dd97312c4e16a72575de6bc92675c520dd':
2013-12-05 19:28:03 +00:00
Ben Gruver
73a3c9afac am 3632f945: am b6223793: Add support for service intents
* commit '3632f94503c0b657b1d02c348e1c006bae5ac6ae':
2013-12-05 19:27:56 +00:00