Michael Jurka
|
4ef80b5db1
|
am 90f7d72e: am 164497d6: am 39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
* commit '90f7d72efd052bf3ea1d762acf9f143d2840b8d3':
|
2012-10-29 09:20:50 -07:00 |
|
Baligh Uddin
|
f6583b0702
|
am 33857887: am 55fb1ab5: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '3385788739f7806bd29aaaceab832c8729dc7e08':
Import translations. DO NOT MERGE
|
2012-10-29 09:20:47 -07:00 |
|
Jeff Brown
|
81a46c4b93
|
am 8304cac5: am 1ab678ba: am d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev
* commit '8304cac585fa6d31f358a6a509d3b127cc8f45d2':
|
2012-10-29 09:20:40 -07:00 |
|
Dianne Hackborn
|
24940b2454
|
am 9157e183: am a582c508: am f584f111: Merge "Fix issue #7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
* commit '9157e183b79d91d95b8e6cefce0b6e46f08a926e':
|
2012-10-29 09:20:34 -07:00 |
|
Baligh Uddin
|
8a619f2a9d
|
am 4dc9e598: am ad0bda19: am e53f5265: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '4dc9e5989868c1ff51eed3edd257f133a2e4ef00':
|
2012-10-29 09:20:30 -07:00 |
|
Baligh Uddin
|
96a10430ca
|
am 203f0fa1: am e570c9c6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '203f0fa1b613c39f7f54749d528a094f7a197cfd':
Import translations. DO NOT MERGE
|
2012-10-29 09:20:26 -07:00 |
|
Michael Jurka
|
90f7d72efd
|
am 164497d6: am 39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
* commit '164497d6712fd6257821f6663a00b5db0e8472d4':
|
2012-10-29 09:15:17 -07:00 |
|
Baligh Uddin
|
3385788739
|
am 55fb1ab5: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '55fb1ab5ffa794d4e183f9281d2f8933b9f3845a':
Import translations. DO NOT MERGE
|
2012-10-29 09:15:13 -07:00 |
|
Jeff Brown
|
8304cac585
|
am 1ab678ba: am d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev
* commit '1ab678ba71ac0b85f4c77542e59c59f7dd07d424':
|
2012-10-29 09:15:09 -07:00 |
|
Dianne Hackborn
|
9157e183b7
|
am a582c508: am f584f111: Merge "Fix issue #7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
* commit 'a582c5081b2775eb0ab59ff9c8332f3f8ccf5361':
|
2012-10-29 09:15:05 -07:00 |
|
Baligh Uddin
|
4dc9e59898
|
am ad0bda19: am e53f5265: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'ad0bda19947e685f7e00bfbfad9128649e6f44dd':
|
2012-10-29 09:15:00 -07:00 |
|
Baligh Uddin
|
203f0fa1b6
|
am e570c9c6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'e570c9c6f47ebfebcfd21194f6362e954b45245d':
Import translations. DO NOT MERGE
|
2012-10-29 09:15:00 -07:00 |
|
Baligh Uddin
|
248dc7602f
|
am 39949bb0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '39949bb0ac2f05fb156d05da49b78202cd9e1c5f':
Import translations. DO NOT MERGE
|
2012-10-28 17:33:33 -07:00 |
|
Baligh Uddin
|
ba4e584da3
|
am 712556f5: (-s ours) Import translations. DO NOT MERGE
* commit '712556f5f243b785a39e16bef1ce1e0243d0191e':
Import translations. DO NOT MERGE
|
2012-10-28 17:33:33 -07:00 |
|
Baligh Uddin
|
39949bb0ac
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
2012-10-28 17:30:51 -07:00 |
|
Baligh Uddin
|
8fb23898a5
|
Import translations. DO NOT MERGE
Change-Id: I252feb4a5dda101a56609fff1d17447375250153
Auto-generated-cl: translation import
|
2012-10-28 10:37:53 -07:00 |
|
Baligh Uddin
|
712556f5f2
|
Import translations. DO NOT MERGE
Change-Id: Ifec8cc64e9047964d26ac167583e81949d7f4826
Auto-generated-cl: translation import
|
2012-10-28 10:14:37 -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 |
|
Eric Laurent
|
2b4a6fcbc5
|
am 63238754: am 49418d7c: am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev
* commit '632387546c410575746bbf9f85fc273c30632846':
|
2012-10-26 18:14:20 -07:00 |
|
Svetoslav Ganov
|
38ae5eda76
|
am 833550f9: am 9fcdd729: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
* commit '833550f9de21bdc77f10e6df85db3b457fcf2ce2':
|
2012-10-26 18:14:17 -07:00 |
|
Christopher Tate
|
178470b537
|
am f834f72d: am 3e96d3d1: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
* commit 'f834f72d0549bb1b9b4300e00b8fd0f4090b409a':
|
2012-10-26 18:14:14 -07:00 |
|
Adam Cohen
|
e5c70caa95
|
am ffa1a511: am c7eebe91: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
* commit 'ffa1a511b4e17ade663d992f06bae22e90372b40':
|
2012-10-26 18:14:10 -07:00 |
|
Irfan Sheriff
|
523abc2296
|
am 6d9c1c26: am 503be131: am 61e42262: Fix group join CTS test
* commit '6d9c1c26760c49a99dd083ca766ce76871ff12ce':
|
2012-10-26 18:14:06 -07:00 |
|
Fabrice Di Meglio
|
92c0c5df65
|
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 '056711898760f9b40dd206a875e285173e952f0f':
|
2012-10-26 18:14:03 -07:00 |
|
Jeff Sharkey
|
cb0a030f97
|
am ab33d668: am 17671ff0: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
* commit 'ab33d668ff5bb4466c58d6ab5457080cfe76ff07':
|
2012-10-26 18:13:59 -07:00 |
|
John Spurlock
|
93fb8ad118
|
am 629e0dcb: am fd88c257: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
* commit '629e0dcb3948f89a9acb02aca9f2de1c31d7e7c6':
|
2012-10-26 18:13:56 -07:00 |
|
Romain Guy
|
6956ffae7d
|
am fa04a22e: am ede74090: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev
* commit 'fa04a22ee53e422bdb2aa079876ac69faa59cbdd':
|
2012-10-26 18:13:50 -07:00 |
|
Craig Mautner
|
bae3463fcd
|
am 7613563c: am 561253f0: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
* commit '7613563c0caa812aed6213b225754db80e5b9b11':
|
2012-10-26 18:13:46 -07:00 |
|
Michael Jurka
|
bdb7f63b41
|
am d3352bc9: am 54030065: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
* commit 'd3352bc9eb44782fbfd807dc6ae3ac434a4c03cd':
|
2012-10-26 18:13:43 -07:00 |
|
Michael Jurka
|
3cba6737a2
|
am 54c7f0b2: am 2275482b: am 80343f64: Fix recents animations for secondary users
* commit '54c7f0b21bffdcb2a0e3b6017ffcda005dac3495':
|
2012-10-26 18:13:39 -07:00 |
|
Geremy Condra
|
c49403e5a2
|
am 76c9f3e0: am b81cedad: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
* commit '76c9f3e0c61c39f44421546b24e6b6bfd5cd48ad':
|
2012-10-26 18:13:36 -07:00 |
|
Jeff Brown
|
15fba04b1d
|
am bdf4c8ce: am c4070bbd: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
* commit 'bdf4c8ce5a2011f3a1ab6c0bf8037a8b60d26834':
|
2012-10-26 18:13:33 -07:00 |
|
Jeff Sharkey
|
148b2dcba7
|
am e2243c89: am 9254d310: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
* commit 'e2243c89cdaaaade144448a03da336b120aeb0e4':
|
2012-10-26 18:13:29 -07:00 |
|
Jeff Brown
|
0612277c15
|
am bd255459: am c6275f58: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
* commit 'bd25545961ea7ac14b92bbf5fe151b09c2e7e12f':
|
2012-10-26 18:13:24 -07:00 |
|
Dave Burke
|
8830eebc26
|
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 '13d462564b0267f4736b2b1fdf01f782f4ebe9a1':
|
2012-10-26 18:13:21 -07:00 |
|
Xavier Ducrohet
|
70dda92a16
|
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 '3a4fa2212fe4eada7bc9b936d1994643a67eee19':
|
2012-10-26 18:13:16 -07:00 |
|
Fabrice Di Meglio
|
e3b31feebe
|
am cd94777f: am afb856f2: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
* commit 'cd94777f4600d395890767531e40ead0a9b041c0':
|
2012-10-26 18:13:11 -07:00 |
|
Fabrice Di Meglio
|
81bed25112
|
am 57cfcfc8: am 7fb1aac6: am 0437302f: Merge "Fix the build" into jb-mr1-dev
* commit '57cfcfc8abad428171b341c0680b977a311409b8':
|
2012-10-26 18:13:08 -07:00 |
|
Xavier Ducrohet
|
16261ba89f
|
am fcfc549e: am ac7806b9: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
* commit 'fcfc549e01b432e1e7d9187c38f4a9e08a0f940e':
|
2012-10-26 18:13:04 -07:00 |
|
Fabrice Di Meglio
|
10a6d6e30f
|
am 0b025ca7: am 78c66c99: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
* commit '0b025ca7929c71786833d34141be7725db59d44f':
|
2012-10-26 18:13:00 -07:00 |
|
Svetoslav Ganov
|
9aafa473ab
|
am 748ab7f2: am 34130c86: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
* commit '748ab7f2fbc947156e08f774a403b422ddf6762f':
|
2012-10-26 18:12:57 -07:00 |
|
Craig Mautner
|
fe9bd87106
|
am 2d9f13cf: am b05e449b: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
* commit '2d9f13cfb5b4c803a08b5d324fad99fb5adf59d8':
|
2012-10-26 18:12:53 -07:00 |
|