David Christie
8ffe6171c7
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':
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.
2013-08-09 02:37:08 -07:00
Vinit Deshapnde
dbbcc0ae7e
am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev
...
* commit 'a87a28f392cab40569fb17561539081c65cbff13':
Use a single socket to communicate with supplicant
2013-08-09 02:37:06 -07:00
Joe Malin
ed7ab6c304
am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178
...
* commit 'a0ef14817600623efcb43fa82f308c5a104f75c4':
2013-08-09 02:37:03 -07:00
The Android Open Source Project
efde420031
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-08-09 02:37:00 -07:00
Marco Nelissen
b204e46623
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-08-09 02:36:57 -07:00
Marco Nelissen
0b800c9702
am 910ebd9e: am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
...
* commit '910ebd9ed34e5fd2b76db67b2f7e3f2be8ade6ea':
2013-08-09 02:36:53 -07:00
Amith Yamasani
7d441b8f9d
am 4458c200: am 672d323b: Merge "Developer option to force RTL layout" into klp-dev
...
* commit '4458c20040ca41d32f982c1a1c971cc94017930b':
Developer option to force RTL layout
2013-08-09 02:36:51 -07:00
David Christie
b5171e560e
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':
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 (location settings, location quick settings, power widget, etc).
2013-08-09 02:36:48 -07:00
John Spurlock
037b958152
am d5e9f2c1: am c059dbe9: Merge "Fix recent regression in hideytoast." into klp-dev
...
* commit 'd5e9f2c1597eb406a7bda7ccfa9b11f6b18daeab':
Fix recent regression in hideytoast.
2013-08-09 02:36:46 -07:00
Daniel Sandler
9ff38aabf6
am 4a76922e: am d646882a: Add missing densities for HUN backgrounds.
...
* commit '4a76922e6c405a9e6f5a98103a88ce4b75b895a5':
Add missing densities for HUN backgrounds.
2013-08-09 02:36:44 -07:00
Daniel Sandler
e4eaaccea7
am 9a81e154: am f6971c80: Merge "OK, now it\'s a release." into klp-dev
...
* commit '9a81e154cc1c46d67387d01d7bffb2451fdb7e7e':
OK, now it's a release.
2013-08-09 02:36:41 -07:00
Craig Mautner
c49976159a
am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE
...
* commit '3282fa984a13640c5e523a4b9fa70e7b469b432a':
Use package CompatibilityInfo as default. DO NOT MERGE
2013-08-09 02:36:39 -07:00
John Spurlock
55ac2033c4
am d9c51fdc: am 7a605df3: Merge "Don\'t always auto-collapse an empty notification shade."
...
* commit 'd9c51fdcbe053670c4dc083a0bba72b98469293e':
2013-08-09 02:36:37 -07:00
Chris Wren
948311b332
am 60708eaf: am e97f90b9: on screen off: convert heads up to full screen intent.
...
* commit '60708eaf2fcfcde579d24bd22de6744f53e00e7e':
2013-08-09 02:36:34 -07:00
Chris Wren
49f8715620
am e7ea9466: am 6ccf0aff: Merge "heads up notifications always take the top spot"
...
* commit 'e7ea9466a01f1acfbc88cf68a0a81fba4d9e3b7b':
2013-08-09 02:36:32 -07:00
Ben Murdoch
3c073181aa
am cf67ae06: am 137e5a3b: Merge "Fix the build"
...
* commit 'cf67ae066ff4a4fd8b79f9f2e2be4e5cf7b4d5c9':
2013-08-09 02:36:30 -07:00
Chris Wren
83c5fe76c2
am 4cbafb6a: am d4db6cbc: don\'t bump an active heads up for a corrupt notification
...
* commit '4cbafb6a9a91c3ad04982269c7ef635876f6f33f':
2013-08-09 02:36:27 -07:00
Chris Wren
c97df948a1
am 10afd0f0: am 464a8ce9: Merge "Animate the heads up notification into the shade."
...
* commit '10afd0f0950a16a561ed80077dc5ec6636a148e6':
2013-08-09 02:36:25 -07:00
Chris Wren
6c495599a1
am 457d901b: am bb8b602b: Merge "ensure heads up slider is initialized."
...
* commit '457d901b13aebbf9b99a7724a6ac6894ea31ee19':
2013-08-09 02:36:22 -07:00
Chris Wren
bb7fbc37ef
am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets."
...
* commit '944e41fe32ea863b61cab0f8002a86f6e5a0412b':
2013-08-09 02:36:20 -07:00
Matt Casey
d49ccaa2c2
am 2c18bc28: am 77ece7b1: Merge "Extend assist context to foreground services"
...
* commit '2c18bc286ecc8fd9ce0ab6cdfac29198a66d0b18':
2013-08-09 02:36:17 -07:00
Martijn Coenen
7c85bcbda4
am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host."
...
* commit '38cfa9358c0aa2a33b088190ada7cc24859ac6b8':
2013-08-09 02:36:15 -07:00
Ying Wang
8de9170315
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-08-09 02:36:12 -07:00
Lorenzo Colitti
387adc7ad6
am b9f16399: am a50f4b1d: Merge "Simplify LinkPropertiesTest."
...
* commit 'b9f163996588b9de994bcff6500b1ca704f2996b':
2013-08-09 02:36:09 -07:00
Svetoslav Ganov
97c6526c1b
am c8916c9d: am 1194d3f7: Merge "Print UI polish based on UX feedback."
...
* commit 'c8916c9d05128bcae6978af4304071a30af11a89':
2013-08-09 02:36:06 -07:00
Satoshi Kataoka
ec1506e349
am acc497e4: am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList
...
* commit 'acc497e4b7323341f830d3e399a846bc5a1ca763':
2013-08-09 02:36:04 -07:00
Jeff Sharkey
bf8bb4d606
am 20d49271: am 26d4adf3: Merge "Better handling of broken storage providers."
...
* commit '20d49271a5e196ae8b264235ebdba204fd0b254d':
2013-08-09 02:36:01 -07:00
Aravind Akella
009338e062
am d262fb60: am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR."
...
* commit 'd262fb60c987efd838995f213a9099bf6aa811c0':
2013-08-09 02:35:59 -07:00
Jeff Brown
5ba91575b9
am cdd4269d: am 16ae0cf1: Merge "Add more virtual display tests."
...
* commit 'cdd4269d84e51ef713d8a8154ce89407fc3851c7':
2013-08-09 02:35:56 -07:00
Jeff Brown
dc20a91b88
am 89fe7541: am 7a54069a: Merge "Dump information about recent input events."
...
* commit '89fe75419566668f2d1911bfcaaf8bb4e885600d':
2013-08-09 02:35:54 -07:00
Jeff Brown
a4226044fe
am 33f8fbd3: am 1dc14aeb: Merge "Fix propagation of display overscan information."
...
* commit '33f8fbd3de497d336e25068b69daf7645f9d0c38':
2013-08-09 02:35:51 -07:00
Jason Monk
224bc7da9d
am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration"
...
* commit '020d429dedc736a08c08b3fa702cf570a151f6fc':
2013-08-09 02:35:49 -07:00
Alan Viverette
df05a4399b
am 6888e50d: am ea55b229: Merge "Fix initial FastScroller enabled state, fix padding during layout"
...
* commit '6888e50d2616d5ff37f9d5f20275b305dda3649a':
2013-08-09 02:35:46 -07:00
Scott Main
d7d31350df
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-08-09 02:35:43 -07:00
Ben Gruver
5e652af066
am 1883de04: am 49660c7c: Add support for broadcast intents
...
* commit '1883de0464d590b1562bc60b648475b5193559d4':
2013-08-09 02:35:40 -07:00
Ben Gruver
d5d2bb5249
am 7bd12d5d: am f157b48e: Add support for matching explicit intents
...
* commit '7bd12d5d1119aa564bd4d03042dcd91017e59050':
2013-08-09 02:35:38 -07:00
Ben Gruver
3ffe2c2c46
am 201b12dd: am f5323fee: Pass in the ComponentName of the resolved service for service intents
...
* commit '201b12dd97312c4e16a72575de6bc92675c520dd':
2013-08-09 02:35:36 -07:00
Ben Gruver
797458e776
am 3632f945: am b6223793: Add support for service intents
...
* commit '3632f94503c0b657b1d02c348e1c006bae5ac6ae':
2013-08-09 02:35:33 -07:00
Ben Gruver
766e0f9347
am eef10af9: am e64ff1b3: Merge "Improve the logic for determining whether the caller is a system app"
...
* commit 'eef10af98b3e6f4c50e5d211205d1263355a79b3':
2013-08-09 02:35:30 -07:00
Jeff Sharkey
2a7db452cc
am 9a1237b5: am 72bd0620: Merge "Settings, replace files, sorting by size, tweaks."
...
* commit '9a1237b5b982f939243be2c81b7c7a611ae5bd27':
2013-08-09 02:35:28 -07:00
Romain Guy
557f8eb748
am f56bbcc5: am 0b451b3a: Merge "Only destroy remote graphic buffers Bug #9795157 "
...
* commit 'f56bbcc5202daf34d454686691d5b3f6390b9648':
2013-08-09 02:35:25 -07:00
Alan Viverette
714a2e20cf
am df29cde3: am d53e376c: Merge "Fix FastScroller regression for non-UI threads"
...
* commit 'df29cde3dddbe5836a6690a2f91705d931d0e006':
2013-08-09 02:35:23 -07:00
Victoria Lease
c284c4d9a2
am f7a7766e: am 250d3c27: Merge "prototype colour emoji font"
...
* commit 'f7a7766e166d58c04b1e5df9fbda9a3ae77d4770':
2013-08-09 02:35:20 -07:00
David Christie
d2ada10195
am dd28b07c: am eb2e139b: Merge "Unhide Context.APP_OPS_SERVICE"
...
* commit 'dd28b07c1aeddf4de37606a178b0dd381c4e2e3f':
2013-08-09 02:35:18 -07:00
Jeff Brown
05d4ee5a3f
am 96d5cd8f: am 18ec40c4: Merge "Destroy surfaces when display is removed."
...
* commit '96d5cd8f43704f3a664a8ee096069c8252323117':
2013-08-09 02:35:16 -07:00
Mathias Agopian
619e638269
am 6ed79d6e: am 9fb9a1c5: Merge "Fix a bug where window animation could be janky"
...
* commit '6ed79d6e17d4a1442658cd3a866d0807e52b5637':
2013-08-09 02:35:13 -07:00
Alan Viverette
c2e7824b08
am a9b6a30f: am 93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams"
...
* commit 'a9b6a30f53cdb774db7c1a7ab3efb77ab9d3e53b':
2013-08-09 02:35:11 -07:00
Dirk Dougherty
877912017d
am d76ca645: am 6e4cc12a: am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls.
...
* commit 'd76ca645b757ec5684d0ca9a52cfbeb165ac5497':
2013-08-09 02:35:09 -07:00
Alan Viverette
87f929f80a
am 13bcfdca: am 7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount"
...
* commit '13bcfdcabd83b240a1701ff5ea782bef5b9cd492':
2013-08-09 02:35:06 -07:00
Todd Poynor
b911762bde
am d159dc7c: am df89ca33: batteryservice: add battery current now and charge counter data
...
* commit 'd159dc7cb5f6d4f0ef99ed8eb8081392fe187a06':
2013-08-09 02:35:04 -07:00