Dianne Hackborn
|
f650447c07
|
am a4dcf311: am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev
* commit 'a4dcf311c1955108e0b81e9dcd48723acde1acca':
|
2012-10-29 12:45:30 -07:00 |
|
Svetoslav Ganov
|
0223483d14
|
am 40ca868a: am e1655c98: (-s ours) Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev
* commit '40ca868a08e2c764a206a5e32b7e9af46fd168da':
|
2012-10-29 12:45:24 -07:00 |
|
John Spurlock
|
8c480e4b1f
|
am 86b6357e: Manual f/b merge of lockhotness camera integration.
* commit '86b6357e5eb91950eac7de7ffe29e5a4ad32903b':
Manual f/b merge of lockhotness camera integration.
|
2012-10-29 12:45:17 -07:00 |
|
Adam Powell
|
7e83e33953
|
am 848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev
* commit '848a5557dba25defd5f332ebc20b61d0097f27f0':
Fix up GlowPadView attributes
|
2012-10-29 12:45:13 -07:00 |
|
Jim Miller
|
412b6a5ef2
|
am 19a52670: Merge latest prototype changes into keyguard
* commit '19a5267003e7dc70100a4bd4f1f449523b2ff38b':
Merge latest prototype changes into keyguard
|
2012-10-29 12:45:09 -07:00 |
|
Kenny Root
|
f834fb33dc
|
am 356f2f59: am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
* commit '356f2f59410be228cfb60ccc3c1878c8ba99da07':
|
2012-10-29 12:45:06 -07:00 |
|
Craig Mautner
|
ae2a3c776b
|
am ce1696c2: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
* commit 'ce1696c22a2fab8c3df63fd504a844f3fccd6cfc':
|
2012-10-29 12:45:02 -07:00 |
|
Hiroshi Lockheimer
|
50920f5f58
|
am 5c731480: am c63aa962: Merge "Fix NPE." into jb-mr1-dev
* commit '5c731480ca3dec47362023076bc827e535da979d':
|
2012-10-29 12:44:58 -07:00 |
|
Chet Haase
|
cc0696e527
|
am 4a4ae0b7: am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
* commit '4a4ae0b7e2d41cac79a97f1e91ba5ed4c632df1f':
|
2012-10-29 12:44:54 -07:00 |
|
Romain Guy
|
773f299f2c
|
am aae03bb4: am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev
* commit 'aae03bb4e3e0d4c64390dc9ff4eca08a4ca6d0b7':
|
2012-10-29 12:44:49 -07:00 |
|
Danielle Millett
|
5cba537ae1
|
am 7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev
* commit '7c420ec69843c8efc95b4f36aa77f17d970d4eaf':
Handling popups correctly for face unlock
|
2012-10-29 12:44:46 -07:00 |
|
Jamie Gennis
|
1a5ddfdfd4
|
am 0e259dcc: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
* commit '0e259dccfc77a83ce91b0a2770d26e6b88bfd52b':
|
2012-10-29 12:44:42 -07:00 |
|
Andy McFadden
|
c3fdaab20b
|
am 2eb8303b: am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
* commit '2eb8303b9c60104720a0d81040337409dfab4cbe':
|
2012-10-29 12:44:38 -07:00 |
|
Michael Jurka
|
d73f0b1fe9
|
am cd57bdb5: am a665df57: Merge "Use lighter background for Recents" into jb-mr1-dev
* commit 'cd57bdb57a9f7ddf5b394ba1d59024d38d86fb23':
|
2012-10-29 12:44:33 -07:00 |
|
Jason Simmons
|
df304ba0ba
|
resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev
Change-Id: Ic6d9435cf6c86a8048a99488d2e1dab49b4454c6
|
2012-10-29 11:24:11 -07:00 |
|
Jeff Brown
|
46ea054495
|
am f33ff923: am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
* commit 'f33ff923139dd7427b84726deaf919e847aac9f5':
|
2012-10-29 09:25:21 -07:00 |
|
Chris Wren
|
0882fe87d4
|
am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev
* commit '3867ddabbe645749ba3d7db9fc0c0ab9ca84690b':
merge new multiuser avatars in from proto app
|
2012-10-29 09:25:16 -07:00 |
|
Baligh Uddin
|
52b5f97ddb
|
am 1afe7788: am 8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '1afe77883e1ad2f79942a5d14b618a31d4643abc':
|
2012-10-29 09:25:12 -07:00 |
|
Baligh Uddin
|
3adefe7338
|
am 22f91da2: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '22f91da2c2da04d759f329fc69a5f7c0741c0218':
Import translations. DO NOT MERGE
|
2012-10-29 09:25:08 -07:00 |
|
Romain Guy
|
9808258f46
|
am 0472d565: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev
* commit '0472d565f3005a2cae07e18ce83947a5ad300613':
|
2012-10-29 09:25:04 -07:00 |
|
Irfan Sheriff
|
bc685c49db
|
am 086dc1ce: am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
* commit '086dc1ce9ba175c30976e5979395cf0e8c1ca9ae':
|
2012-10-29 09:25:00 -07:00 |
|
Baligh Uddin
|
f501a9cde8
|
am bd28f237: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'bd28f2376f8f6960c1cd7d695a16b90450fa04f2':
Import translations. DO NOT MERGE
|
2012-10-29 09:24:56 -07:00 |
|
Baligh Uddin
|
379c47ec9f
|
am 66e893fb: (-s ours) am 21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '66e893fb9bd0b0e4f6df5e3c58e19930fc57d49b':
|
2012-10-29 09:21:05 -07:00 |
|
Daniel Sandler
|
8fe9a197b2
|
am 79db4800: am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '79db48003b3e9a482cf45764c92bc2100e00df4f':
|
2012-10-29 09:17:07 -07:00 |
|
Justin Ho
|
d8b4f07006
|
am c1c03c42: am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
* commit 'c1c03c429a9d1b5ebe7643bfb95675513e1d25df':
|
2012-10-29 09:17:03 -07:00 |
|
Irfan Sheriff
|
f4f6636313
|
am 5f8e3f2b: am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
* commit '5f8e3f2b36ae0d85bd73778a6287b6fdfa1c7a04':
|
2012-10-29 09:16:59 -07:00 |
|
Jeff Sharkey
|
af8974ddee
|
am 32a1c5f7: am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
* commit '32a1c5f7d6266942930306a5602172e47726c869':
|
2012-10-29 09:16:56 -07:00 |
|
Daniel Sandler
|
7fa5c737cc
|
am cf64067c: am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
* commit 'cf64067c95a83d56381ff62c9222098f314b949a':
|
2012-10-29 09:16:52 -07:00 |
|
John Spurlock
|
19a2f53060
|
am 31821c5b: am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
* commit '31821c5b6170d5f560c7f74b262278399c9ff3e9':
|
2012-10-29 09:16:49 -07:00 |
|
Jim Miller
|
bf83ea6aa3
|
am 5d3f8599: Merge multi-user stuff from prototype into framework.
* commit '5d3f8599590026d6fc275739613fe6ddb180af55':
Merge multi-user stuff from prototype into framework.
|
2012-10-29 09:16:45 -07:00 |
|
Jim Miller
|
8615a071c4
|
am 022554e3: Merge latest prototype changes into keyguard
* commit '022554e3da6e496524387a5d3ecc67ef9749b587':
Merge latest prototype changes into keyguard
|
2012-10-29 09:16:41 -07:00 |
|
Jim Miller
|
17ac77c767
|
am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev
* commit 'c28261d4fabf186cd5af5a563e6bab9023ee3758':
Wire up "add widget" in keyguard
|
2012-10-29 09:16:37 -07:00 |
|
erin rosenthal
|
ea6bfffaa4
|
am 9415aa1c: am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
* commit '9415aa1c1b51f82a73ddc669771d850304cc704c':
|
2012-10-29 09:16:33 -07:00 |
|
Eric Laurent
|
4e03542213
|
am d691056c: am 3ac692f5: Merge "reduce camera sound volume." into jb-mr1-dev
* commit 'd691056ca86b07176b2bf2f9abc3cf996b61f6f1':
|
2012-10-29 09:16:30 -07:00 |
|
Jim Miller
|
ec141cd382
|
am 08697709: Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
* commit '086977094d96ab9352432e0941a05b09cefc92ac':
Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
|
2012-10-29 09:16:26 -07:00 |
|
Amith Yamasani
|
54b84a3f74
|
am 8e6dcb00: am 0b828ee0: Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
* commit '8e6dcb0045a5085cb41beb6f66977ba664847d4b':
|
2012-10-29 09:16:22 -07:00 |
|
Michael Jurka
|
e7c4e24bc5
|
am 5419ae87: am 4ce82df5: Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
* commit '5419ae873db25f83967a6ca65b6e546e7da4afce':
|
2012-10-29 09:16:18 -07:00 |
|
Kenny Root
|
595bd1cbfb
|
am 8af55c66: am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
* commit '8af55c660df4688c73cc0433efac22970434731a':
|
2012-10-29 09:16:14 -07:00 |
|
Raph Levien
|
8b69044e47
|
am 9ed957c2: am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
* commit '9ed957c20f0e491f1fa4624fab6ca8649ac86f28':
|
2012-10-29 09:16:10 -07:00 |
|
Chet Haase
|
343806f107
|
am 8f87ea2d: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
* commit '8f87ea2da6fc57427e30e21be90047a820dc2adf':
|
2012-10-29 09:16:02 -07:00 |
|
Baligh Uddin
|
6586c17b51
|
am acba3808: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'acba3808357d5c4f9660ae7144bd2d0fe836469f':
Import translations. DO NOT MERGE
|
2012-10-29 09:15:58 -07:00 |
|
Baligh Uddin
|
05834a4d99
|
am d046acd7: am 5be59670: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'd046acd735de25142aaef3ccce616073460e2584':
|
2012-10-29 09:15:54 -07:00 |
|
Colin Cross
|
be017a0ed8
|
am 899b3d9a: am 034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
* commit '899b3d9acaab91ba230ba04ddd7560f44886faef':
|
2012-10-29 09:15:51 -07:00 |
|
Jamie Gennis
|
b4ff4d93dc
|
am 167cd3e3: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
* commit '167cd3e36700e772392207ad69e42a868cc94808':
|
2012-10-29 09:15:47 -07:00 |
|
Svetoslav Ganov
|
9b30f7b677
|
am 047ceab5: am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
* commit '047ceab558632aff281c8def25f168f35f1a69f5':
|
2012-10-29 09:15:40 -07:00 |
|
Victoria Lease
|
47b8f46a4e
|
am 2e2f8508: am 92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
* commit '2e2f8508eec6cb08326ce528d939554512db6acd':
|
2012-10-29 09:15:36 -07:00 |
|
Amith Yamasani
|
c71802a291
|
am aad8cd4d: am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
* commit 'aad8cd4daa6cd1d354e0c1de03ce5a65a44a04db':
|
2012-10-29 09:15:32 -07:00 |
|
Adam Powell
|
54b17df580
|
am a6ea59ef: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
* commit 'a6ea59ef4929826757796660340b0be541f1a838':
|
2012-10-29 09:15:29 -07:00 |
|
Daniel Sandler
|
9bbb73bac6
|
am cedb7095: am a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev
* commit 'cedb7095a01552568a5dc63e3d89ea6c9be2a5ee':
|
2012-10-29 09:15:25 -07:00 |
|
Daniel Sandler
|
ac135110a3
|
am c613a062: am 564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev
* commit 'c613a062f17e449743c253e9a6ffc5f3f231d20a':
|
2012-10-29 09:15:21 -07:00 |
|