Baligh Uddin
|
b989651008
|
am 83fc0be8: am 1b9a1418: am c3984879: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '83fc0be8e7dfe1038da2d9852be75a2418e47783':
|
2012-10-26 15:28:52 -07:00 |
|
Baligh Uddin
|
056aed68a3
|
am a625e8a3: (-s ours) am 19b304e7: am 779a19fe: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'a625e8a3449d43092cf2ed741c5825cde9d7c54f':
|
2012-10-26 15:28:51 -07:00 |
|
Jeff Hamilton
|
3be4c86c51
|
am d76ba621: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
* commit 'd76ba62101ed3650a4e2edc640f8f311045eb82f':
|
2012-10-26 15:22:10 -07:00 |
|
Scott Main
|
d5bef5ddcb
|
am 4e2e6dfd: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
* commit '4e2e6dfdacf530c063303ae496ecc459c84acadd':
|
2012-10-26 15:22:06 -07:00 |
|
Xavier Ducrohet
|
aa3770fbae
|
am e8c9ce73: am 5e42147a: (-s ours) am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
* commit 'e8c9ce73e3191949f4d05409a6c7aa7fc515c64d':
|
2012-10-26 15:22:02 -07:00 |
|
Christopher Tate
|
9de3919738
|
am 32202893: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
* commit '3220289383a116b77d3c567462acff3d96c86426':
|
2012-10-26 15:21:58 -07:00 |
|
Scott Main
|
b2f81b8c98
|
am c88e9184: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
* commit 'c88e918482e40cff77af65bb9c56615bee32bb9a':
|
2012-10-26 15:21:54 -07:00 |
|
Chet Haase
|
89824595b6
|
am 4bcf8740: am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
* commit '4bcf874003fca2d27da1b4cd027edc607ef59b2b':
|
2012-10-26 15:21:51 -07:00 |
|
Victoria Lease
|
ff33a01091
|
am 645a16fb: am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
* commit '645a16fbe15e31d0d4f80d5a8e1fa4ae386b4192':
|
2012-10-26 15:21:47 -07:00 |
|
Amith Yamasani
|
061bcd2703
|
am 868f82ae: am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
* commit '868f82ae97c7147e0d72e6558ffb76507a0feb13':
|
2012-10-26 15:21:43 -07:00 |
|
Daniel Sandler
|
40fae0bbc0
|
am f400513d: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
* commit 'f400513d50fccdd38165ad13742ebabd9f1af3a3':
|
2012-10-26 15:21:39 -07:00 |
|
Michael Jurka
|
7fa48e695b
|
am faa82590: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
* commit 'faa825909b1bd6a229b2ded406cb37c4a16c8b82':
|
2012-10-26 15:21:35 -07:00 |
|
Daniel Sandler
|
4db77891e5
|
am 3f846089: am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
* commit '3f8460893fc9198824fa5e27fde9103a0160af6d':
|
2012-10-26 15:21:31 -07:00 |
|
Jeff Brown
|
335b606c34
|
am 0ad3bb8b: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
* commit '0ad3bb8b36d4a2532af74f80a6988bbcb5d1f663':
|
2012-10-26 15:21:27 -07:00 |
|
Jeff Brown
|
61c3629c8d
|
am 80ffd26f: am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
* commit '80ffd26f873ecd7d2827f331eda11064647e44e9':
|
2012-10-26 15:21:20 -07:00 |
|
Jeff Sharkey
|
a57f443ae7
|
am e21a2e72: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
* commit 'e21a2e72a79aa6d0d028e91470254d2c1e024a26':
|
2012-10-26 15:21:16 -07:00 |
|
Baligh Uddin
|
45a4aff0cc
|
am 2fa64ac6: am 3e336bd6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '2fa64ac65689a325fdf05ee32608300efa4c05c2':
|
2012-10-26 15:21:12 -07:00 |
|
Craig Mautner
|
85b33eae07
|
am 6109075b: am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev
* commit '6109075bd0e9a92d127dba6990171937ca6cb9f2':
|
2012-10-26 15:21:08 -07:00 |
|
Daniel Sandler
|
e3032024c2
|
am 47a8b59a: am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev
* commit '47a8b59af1d454e40a82d3b57a6fe78feb7162ed':
|
2012-10-26 15:21:04 -07:00 |
|
Romain Guy
|
763be7385e
|
am 650c47a1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev
* commit '650c47a190d2b785db37f4043f1c5834ff6461b8':
|
2012-10-26 15:21:00 -07:00 |
|
Jeff Brown
|
60880773f9
|
am d488b231: am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev
* commit 'd488b231431d95873f1b1acf8cf532c1033685c6':
|
2012-10-26 15:20:56 -07:00 |
|
Xavier Ducrohet
|
070292d935
|
am 6f05ae33: am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-dev
* commit '6f05ae330e16238367957021a38108eb24221ac0':
|
2012-10-26 15:20:52 -07:00 |
|
Justin Ho
|
f570098a48
|
am 54a956ca: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
* commit '54a956ca42827fcf3a8d007dc99f4f10902460f1':
|
2012-10-26 15:20:48 -07:00 |
|
Justin Ho
|
ac96ea1f14
|
am 195eb1ab: am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev
* commit '195eb1abc83f4d8a0dfba3587efc0c22ac518e52':
|
2012-10-26 15:20:44 -07:00 |
|
Yu Shan Emily Lau
|
1f672b572c
|
am bd8a2758: am 0f2d0147: Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev
* commit 'bd8a275865752308335acc7ffbb4c8509cd8cc89':
|
2012-10-26 15:20:39 -07:00 |
|
Chet Haase
|
95f44af0a0
|
am 285d0932: am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev
* commit '285d09320eef3cd965dc48770afbeac1427c5cdf':
|
2012-10-26 15:20:34 -07:00 |
|
Romain Guy
|
e13a90f27d
|
am 6763bfe4: am 3301654a: Merge "Fix javadoc" into jb-mr1-dev
* commit '6763bfe4cef083cadeefb9cc84be8204a9e1d32d':
|
2012-10-26 15:20:29 -07:00 |
|
Raph Levien
|
c4ce4c7867
|
am 0d7c0ab9: am 1720e073: Merge "Update Arabic fonts to remove Rial ligature" into jb-mr1-dev
* commit '0d7c0ab9746c86f077b39033e7701502bafc153e':
|
2012-10-26 15:20:26 -07:00 |
|
Mike Cleron
|
a1af802395
|
am 37419507: am e663925f: Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev
* commit '3741950789c8ae4d2b95e12b5a26a742900a0098':
|
2012-10-26 15:20:22 -07:00 |
|
Irfan Sheriff
|
33f78b9e63
|
am c389ca61: am 90a80bb8: Merge "Handle null BSSID" into jb-mr1-dev
* commit 'c389ca6178f5beefe2e349654442d193cf5914dc':
|
2012-10-26 15:20:18 -07:00 |
|
Xia Wang
|
1f5107854e
|
am 474c56d3: am 64e5aa73: Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev
* commit '474c56d38a1a164bc135be2f9a4729ee122cda91':
|
2012-10-26 15:20:12 -07:00 |
|
Svetoslav Ganov
|
6f43a7ae26
|
am c6fd9865: am 966496f5: Merge "More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf" into jb-mr1-dev
* commit 'c6fd98659ee4bb42d7216be7235a0d64872ff58a':
|
2012-10-26 15:20:07 -07:00 |
|
Chet Haase
|
0cdb7d4d78
|
am d348ec20: am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev
* commit 'd348ec204b500fc511c26602573e9b3f806d7608':
|
2012-10-26 15:20:01 -07:00 |
|
Romain Guy
|
ea12fb2e52
|
am f223282b: am 16627347: Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev
* commit 'f223282b06fc3b1baf57887fe715df2891648bbd':
|
2012-10-26 15:19:48 -07:00 |
|
Daniel Sandler
|
0353847d89
|
am b838ba69: am 26f544ae: Merge "For Matias." into jb-mr1-dev
* commit 'b838ba69345a1ad4be8000da4c3580f4ace7c576':
|
2012-10-26 15:19:42 -07:00 |
|
Irfan Sheriff
|
3755de281e
|
am f5d46fd0: am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev
* commit 'f5d46fd0ca626ab82c06a082aeb799193927eec6':
|
2012-10-26 15:19:36 -07:00 |
|
Yu Shan Emily Lau
|
84bad8be27
|
am ee974a46: am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev
* commit 'ee974a469ba297c2fbfd7c8395c0e94b94f844e7':
|
2012-10-26 15:19:30 -07:00 |
|
Fabrice Di Meglio
|
1eb0b69a0a
|
am 52d84585: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev
* commit '52d84585620f29e57157f0a62c998ca229a43e13':
|
2012-10-26 15:19:23 -07:00 |
|
Fabrice Di Meglio
|
917cc6a699
|
am 19f5b3e2: am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev
* commit '19f5b3e2ab3e0beb4c9c5576b056b2de908f75ac':
|
2012-10-26 15:19:18 -07:00 |
|
Daniel Sandler
|
4c259e326a
|
am cdd2e3d6: am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev
* commit 'cdd2e3d673af3cb5c70f1bb06dcba1d0bbb0832e':
|
2012-10-26 15:19:13 -07:00 |
|
Daniel Sandler
|
64f19e468e
|
am 9d1177d4: am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev
* commit '9d1177d4aad1c83245562bdc61f7407be5b741d6':
|
2012-10-26 15:19:09 -07:00 |
|
Daniel Sandler
|
1b2ee26701
|
am badf7651: am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev
* commit 'badf7651c124adfbaeaba452cbd576042bea19f8':
|
2012-10-26 15:19:05 -07:00 |
|
Justin Ho
|
29681b7b52
|
am abaf7731: am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
* commit 'abaf7731f91eed99120cbacebbc63c44660fe8d8':
|
2012-10-26 15:19:01 -07:00 |
|
Dianne Hackborn
|
8fa2b4b487
|
am ab61e562: am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev
* commit 'ab61e562c8f95f5eb474a1c9c53009c543fb669b':
|
2012-10-26 15:18:57 -07:00 |
|
Bart Sears
|
63a828f113
|
am 0cb8a638: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev
* commit '0cb8a638b7080f2d9f721241bb15bb63c2830e77':
|
2012-10-26 15:18:53 -07:00 |
|
Chet Haase
|
b97f93296e
|
am b6b52483: am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev
* commit 'b6b52483a252a272be7ea8bf752a40b169cbc1ed':
|
2012-10-26 15:18:49 -07:00 |
|
Daniel Sandler
|
f2ef0f9f3b
|
am 595703cd: am 91ffeddb: Hide settings button from tablet notification panel.
* commit '595703cd3962898b1925ae34bcf41a70092ce0a6':
|
2012-10-26 15:18:45 -07:00 |
|
Amith Yamasani
|
6b76374f56
|
am 3727bef8: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev
* commit '3727bef8698965c0b1502b61db91e41bae317fa3':
|
2012-10-26 15:18:41 -07:00 |
|
Romain Guy
|
348cdc4793
|
am f094d963: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev
* commit 'f094d9639497e88ab9e544ed61e3d42b14eb7fc2':
|
2012-10-26 15:18:37 -07:00 |
|
Daniel Sandler
|
41d4fde196
|
am 783bd686: am b6454adb: Merge "Quickening." into jb-mr1-dev
* commit '783bd686d5ae7baf75a6505c2cf8dfb38d093103':
|
2012-10-26 15:18:31 -07:00 |
|