Eric Laurent
|
766376c4c1
|
am 2b4a6fcb: am 63238754: am 49418d7c: am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev
* commit '2b4a6fcbc50b3f89ca85dbb7ec21fd09ddc5e5bf':
|
2012-10-26 18:19:40 -07:00 |
|
Svetoslav Ganov
|
e841ea62ac
|
am 38ae5eda: am 833550f9: am 9fcdd729: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
* commit '38ae5eda76c48423379c724fe9fa063b2ee090b0':
|
2012-10-26 18:19:36 -07:00 |
|
Christopher Tate
|
ab42855038
|
am 178470b5: am f834f72d: am 3e96d3d1: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
* commit '178470b53793d5c74929ef52b47c14be7a30710b':
|
2012-10-26 18:19:33 -07:00 |
|
Adam Cohen
|
e23f1bbc5a
|
am e5c70caa: am ffa1a511: am c7eebe91: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
* commit 'e5c70caa95bda9e24fff8f3b2ffcb865f2d17359':
|
2012-10-26 18:19:29 -07:00 |
|
Irfan Sheriff
|
91b50e2de7
|
am 523abc22: am 6d9c1c26: am 503be131: am 61e42262: Fix group join CTS test
* commit '523abc22964285b91e1bbd99eb71eb261fdc8402':
|
2012-10-26 18:19:26 -07:00 |
|
Fabrice Di Meglio
|
bcefac5bb2
|
am 92c0c5df: am 05671189: am 68a9e6d2: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
* commit '92c0c5df6549b2330a8693cd008787630b1b1d2e':
|
2012-10-26 18:19:22 -07:00 |
|
Jeff Sharkey
|
7a8c19fa31
|
am cb0a030f: am ab33d668: am 17671ff0: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
* commit 'cb0a030f97f3e6972ea2e6a895dfe95b07fe3261':
|
2012-10-26 18:19:18 -07:00 |
|
John Spurlock
|
34391e7cce
|
am 93fb8ad1: am 629e0dcb: am fd88c257: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
* commit '93fb8ad1182d959aaf1023911f59a3a6b6509889':
|
2012-10-26 18:19:14 -07:00 |
|
Romain Guy
|
e41836ff3d
|
am 6956ffae: am fa04a22e: am ede74090: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev
* commit '6956ffae7d16af7ac0b39dc0a361d6aeecad47ac':
|
2012-10-26 18:19:11 -07:00 |
|
Craig Mautner
|
7014024839
|
am bae3463f: am 7613563c: am 561253f0: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
* commit 'bae3463fcd9de0c36287eae7b1d8948351515dac':
|
2012-10-26 18:19:07 -07:00 |
|
Michael Jurka
|
85d56e91ef
|
am bdb7f63b: am d3352bc9: am 54030065: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
* commit 'bdb7f63b4152bbc807666cd8b81166463e869f44':
|
2012-10-26 18:19:04 -07:00 |
|
Michael Jurka
|
dd7a9d94dd
|
am 3cba6737: am 54c7f0b2: am 2275482b: am 80343f64: Fix recents animations for secondary users
* commit '3cba6737a2dba135aad661e3e8556c4c3388b141':
|
2012-10-26 18:19:00 -07:00 |
|
Geremy Condra
|
e55cd0de59
|
am c49403e5: am 76c9f3e0: am b81cedad: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
* commit 'c49403e5a21b9bb368cb0c4b1e6575f72fbc50fe':
|
2012-10-26 18:18:56 -07:00 |
|
Jeff Brown
|
a8871150b8
|
am 15fba04b: am bdf4c8ce: am c4070bbd: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
* commit '15fba04b1d08f396b9eddcb019a5b734f73b52c0':
|
2012-10-26 18:18:53 -07:00 |
|
Jeff Sharkey
|
00c067aa87
|
am 148b2dcb: am e2243c89: am 9254d310: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
* commit '148b2dcba7b8f3bc55aa238cb12232706ee3c18b':
|
2012-10-26 18:18:49 -07:00 |
|
Jeff Brown
|
364bc58b37
|
am 0612277c: am bd255459: am c6275f58: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
* commit '0612277c15f4ed9937c842913a830eb000717858':
|
2012-10-26 18:18:45 -07:00 |
|
Dave Burke
|
f68bdc2233
|
am 8830eebc: am 13d46256: am 2a808f97: am 09a5321c: Merge "Revert "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 '8830eebc26c6a0279b1927013f8a0350fc497690':
|
2012-10-26 18:18:42 -07:00 |
|
Xavier Ducrohet
|
23a8ab4de4
|
am 70dda92a: (-s ours) am 3a4fa221: am 8855ba62: am ed5387be: (-s ours) am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
* commit '70dda92a16a630471a8269867b26777d0d7854c3':
|
2012-10-26 18:18:38 -07:00 |
|
Fabrice Di Meglio
|
25eb6733d5
|
am e3b31fee: am cd94777f: am afb856f2: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
* commit 'e3b31feebe955471064f4659311726c333f0de2c':
|
2012-10-26 18:18:34 -07:00 |
|
Fabrice Di Meglio
|
4486e4dc3b
|
am 81bed251: am 57cfcfc8: am 7fb1aac6: am 0437302f: Merge "Fix the build" into jb-mr1-dev
* commit '81bed251124cf0ea1f0d331a45a875abe379e012':
|
2012-10-26 18:18:29 -07:00 |
|
Xavier Ducrohet
|
77d1a12306
|
am 16261ba8: am fcfc549e: am ac7806b9: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
* commit '16261ba89f9f8729647955cd3c44e5d1e6d217cb':
|
2012-10-26 18:18:25 -07:00 |
|
Fabrice Di Meglio
|
5f39ef02a5
|
am 10a6d6e3: am 0b025ca7: am 78c66c99: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
* commit '10a6d6e30fa966d9b9c204e4b9af13ac68c466ec':
|
2012-10-26 18:18:20 -07:00 |
|
Svetoslav Ganov
|
210f2f7dc2
|
am 9aafa473: am 748ab7f2: am 34130c86: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
* commit '9aafa473ab4583b4bb479c65556735270a7e3a9e':
|
2012-10-26 18:18:16 -07:00 |
|
Craig Mautner
|
7373f45cbf
|
am fe9bd871: am 2d9f13cf: am b05e449b: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
* commit 'fe9bd87106a7974e068f02486d3525667e4763e8':
|
2012-10-26 18:18:12 -07:00 |
|
Irfan Sheriff
|
6c90b0e372
|
am 66be661c: am f1aabd93: am d895caf7: am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev
* commit '66be661c459e3bc24215fe14c613eb98c24cd6e1':
|
2012-10-26 18:18:09 -07:00 |
|
Chet Haase
|
6d1d37ac24
|
am 74a41fb5: am e7564bd6: am e114fcc7: am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
* commit '74a41fb5242998beacf8fe13c733ab35615853ce':
|
2012-10-26 18:18:05 -07:00 |
|
Jeff Hamilton
|
50a508bb92
|
am 5f397461: am 3be4c86c: am d76ba621: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
* commit '5f397461ab519ff012937b0079e5bb70b5d2ff53':
|
2012-10-26 18:18:01 -07:00 |
|
Scott Main
|
2b3379b504
|
am 4018b220: am d5bef5dd: am 4e2e6dfd: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
* commit '4018b220f1c3f530603937b9ba75afd35ef938ed':
|
2012-10-26 18:17:57 -07:00 |
|
Xavier Ducrohet
|
cd0549fac4
|
am 38cb7725: (-s ours) am aa3770fb: am e8c9ce73: am 5e42147a: (-s ours) am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
* commit '38cb77254ac6f81a36b4f72dcae1db37a2762644':
|
2012-10-26 18:17:53 -07:00 |
|
Christopher Tate
|
86fb11b889
|
am fd8c61b4: am 9de39197: am 32202893: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
* commit 'fd8c61b46ef7b73af42a082b51909b59535e95bd':
|
2012-10-26 18:17:50 -07:00 |
|
Scott Main
|
a9b200a2a9
|
am 4d7df836: am b2f81b8c: am c88e9184: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
* commit '4d7df836d2db486f0991c2e40d3271b7a12263ed':
|
2012-10-26 18:17:46 -07:00 |
|
Chet Haase
|
266e23a827
|
am 81514647: am 89824595: am 4bcf8740: am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
* commit '8151464782b2e87aa279679b4eb6355374732960':
|
2012-10-26 18:17:42 -07:00 |
|
Victoria Lease
|
598d55dcd0
|
am 8ff3586c: am ff33a010: am 645a16fb: am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
* commit '8ff3586c5bf5c6bd924002e0d315dbf55e65ddea':
|
2012-10-26 18:17:39 -07:00 |
|
Amith Yamasani
|
5160492ad2
|
am a42bcce8: am 061bcd27: am 868f82ae: am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
* commit 'a42bcce8ac47b7208951c89bbbc136ba70213be7':
|
2012-10-26 18:17:35 -07:00 |
|
Daniel Sandler
|
470e109bd7
|
am e3002155: am 40fae0bb: am f400513d: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
* commit 'e300215503b9166af8305f15fcd5ed78d4b2ae5b':
|
2012-10-26 18:17:31 -07:00 |
|
Michael Jurka
|
48149e869b
|
am 27f80826: am 7fa48e69: am faa82590: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
* commit '27f8082651defa70551a56b328d18ac7a24dfe47':
|
2012-10-26 18:17:27 -07:00 |
|
Daniel Sandler
|
6ee5021223
|
am b15ff37f: am 4db77891: am 3f846089: am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
* commit 'b15ff37fbbda7676d95147279a59ba5d25aa23bb':
|
2012-10-26 18:17:23 -07:00 |
|
Jeff Brown
|
1a8f64563b
|
am 6664a94b: am 335b606c: am 0ad3bb8b: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
* commit '6664a94b9922903bc102934d3e4e8956e22d3654':
|
2012-10-26 18:17:19 -07:00 |
|
Jeff Brown
|
ef283e9c15
|
am 6d6463c9: am 61c3629c: am 80ffd26f: am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
* commit '6d6463c92e1e6ee3f9acb19057df25712fa7f89c':
|
2012-10-26 18:17:16 -07:00 |
|
Jeff Sharkey
|
8ddfae5d4b
|
am f8d6a0bf: am a57f443a: am e21a2e72: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
* commit 'f8d6a0bf8601a6457bbb5af541e3c763fba2d418':
|
2012-10-26 18:17:12 -07:00 |
|
Baligh Uddin
|
83d7426799
|
am 9ce37a5e: (-s ours) am 45a4aff0: (-s ours) am 2fa64ac6: am 3e336bd6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '9ce37a5ec0ccde58ab73b05a60213657d0bb1d4d':
|
2012-10-26 18:17:08 -07:00 |
|
Daniel Sandler
|
0750903ecc
|
am 9eec7bb6: am 17d237e1: am cc0106cd: Merge "Properly show emoji in the notification ticker." into jb-mr1-dev
* commit '9eec7bb6e3074d125ef7f167e2e89107936b8bd2':
|
2012-10-26 18:14:53 -07:00 |
|
Daniel Sandler
|
0454749c2d
|
am 302e5a90: am a33079c7: am 3c84c9bc: Merge "Show brightness dialog for all users." into jb-mr1-dev
* commit '302e5a901805c757806449301446e3467e5e2824':
|
2012-10-26 18:14:49 -07:00 |
|
Daniel Sandler
|
477ee3625a
|
am eba1447a: am 363a119c: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
* commit 'eba1447a6eee0fc6f1037140e423cfc93242ad49':
|
2012-10-26 18:14:46 -07:00 |
|
Jim Miller
|
0f261b7ea8
|
am 52c55cd0: am d6523da1: Merge latest prototype changes into the framework
* commit '52c55cd0d0ae24745dd683bfa72d5f3ed525846f':
Merge latest prototype changes into the framework
|
2012-10-26 18:14:42 -07:00 |
|
Amith Yamasani
|
3447089522
|
am 781f0c7e: am 596f143f: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
* commit '781f0c7ec285ca9beb87fa26d9404301fe8a4d86':
|
2012-10-26 18:14:39 -07:00 |
|
Dirk Dougherty
|
9fe3735147
|
am 2acc3b87: am 9bd62847: am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
* commit '2acc3b87ac23293c681c454bc416c03dc14e9667':
|
2012-10-26 18:14:35 -07:00 |
|
Jim Miller
|
bd5c198dd5
|
am 13056c98: am 28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev
* commit '13056c982a9e499ec564b668fa93cda7bfc7c13f':
Get basic keyguard working in new branch
|
2012-10-26 18:14:31 -07:00 |
|
Fabrice Di Meglio
|
0a8f2c58f4
|
am 91aae8b6: am 3f8794df: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
* commit '91aae8b62545b3efcf690c23f59d14b2f008d76f':
|
2012-10-26 18:14:27 -07:00 |
|
Kenny Root
|
21f8e1496a
|
am 890ca67c: am a063bc51: am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
* commit '890ca67c0ae84be9416491980d0e98a71790e47a':
|
2012-10-26 18:14:24 -07:00 |
|