Jean-Baptiste Queru
|
de8717c5f2
|
Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD
|
2012-11-08 14:44:44 -08:00 |
|
Jean-Baptiste Queru
|
40a419c2a5
|
Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD
|
2012-11-08 14:44:35 -08:00 |
|
Jean-Baptiste Queru
|
4fb3c16cad
|
Merge commit 'ecf372213db4a1e12f07b4684f3357a838b90daa' into HEAD
|
2012-11-08 14:40:42 -08:00 |
|
Jean-Baptiste Queru
|
d35f576ea0
|
Merge commit 'eead92749924e47ba6758bbded560b6aab0d7485' into HEAD
|
2012-11-08 14:40:34 -08:00 |
|
Jean-Baptiste Queru
|
8d3d0250c4
|
Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11'
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
|
2012-11-08 14:40:12 -08:00 |
|
Jean-Baptiste Queru
|
432c71d77e
|
Merge commit '063de3b93e543d9073e14542eb0a60385fd74fa5'
Change-Id: I9ba212785fdb7c3ac92fad33d8a5ff6eefc3c7bc
|
2012-11-08 14:29:45 -08:00 |
|
Geremy Condra
|
8b73fc1ad3
|
am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
DO NOT MERGE Control access to tts objects
|
2012-11-08 14:26:39 -08:00 |
|
Geremy Condra
|
2b4bc305a2
|
Merge "DO NOT MERGE Control access to tts objects" into jb-dev
|
2012-11-08 14:22:48 -08:00 |
|
The Android Open Source Project
|
5c0da20cbe
|
am 71a408b9: Reconcile with jb-mr1-release - do not merge
* commit '71a408b9c5f2c071df8cd26f5c8c991cb50bbd96':
|
2012-11-08 14:22:27 -08:00 |
|
The Android Open Source Project
|
71a408b9c5
|
Reconcile with jb-mr1-release - do not merge
Change-Id: I3613cb7a8d96bd334e213ca318b5e121cbefbd48
|
2012-11-08 14:19:02 -08:00 |
|
Jean-Baptiste Queru
|
ce2a3746b8
|
merge 19f8aa180a7ccb29b11a322378002e37517abfc9
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
|
2012-11-08 14:13:21 -08:00 |
|
The Android Automerger
|
b61fba5cf7
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-11-08 13:54:05 -08:00 |
|
Winson Chung
|
40f8211e68
|
Preventing more than five widgets from being added in the carousel (issue 7502935)
Change-Id: I26e6e154992e56b128d541578ffd3891776a3f7a
|
2012-11-08 13:24:04 -08:00 |
|
Dianne Hackborn
|
72325cdb65
|
am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
* commit '63bc6c122d628ab24e332f58d3d7a59ea2627f85':
Remove extraneous logs.
|
2012-11-08 13:21:11 -08:00 |
|
Dianne Hackborn
|
63bc6c122d
|
am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
* commit 'a46a74fcd61d2b4e72b6027625a471f10b21b1c9':
Remove extraneous logs.
|
2012-11-08 13:18:29 -08:00 |
|
Dianne Hackborn
|
a46a74fcd6
|
Merge "Remove extraneous logs." into jb-mr1-dev
|
2012-11-08 13:16:10 -08:00 |
|
Daniel Sandler
|
9b15f2e575
|
am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
* commit '82b18e8d5c4ceac56c4f5d6ca96f69e37a21eeb3':
Don't crash if no ECA.
|
2012-11-08 13:13:56 -08:00 |
|
Chris Wren
|
b1d094ba10
|
am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
* commit 'f080dc0c7d8d502046cb5274999279b3447e9585':
allow pattern linear layout to manage message_area.
|
2012-11-08 13:13:52 -08:00 |
|
Daniel Sandler
|
c4639949d2
|
am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
* commit '38883bdd0088277771efca72c80e33773408d72e':
Only show the bouncer for the assistant if secure.
|
2012-11-08 13:13:49 -08:00 |
|
Dianne Hackborn
|
7ff30113de
|
Remove extraneous logs.
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
|
2012-11-08 13:13:48 -08:00 |
|
John Spurlock
|
180484115f
|
am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..."
* commit 'f6b6462f277689b7bb6b1f66cb5b57f30d1e194c':
Address comments from merged "Fix remaining jank in sec..."
|
2012-11-08 13:13:45 -08:00 |
|
John Spurlock
|
cc60b7dc3c
|
am baee9ed5: am 7a73344b: Minimal fix for stuck google now.
* commit 'baee9ed5643f45d6cf53f6360cc2b30fe59f55f0':
Minimal fix for stuck google now.
|
2012-11-08 13:13:41 -08:00 |
|
Jim Miller
|
bfd17051bc
|
am 271add4e: am 899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev
* commit '271add4e09af034406188e13c3289e967108c84f':
Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
|
2012-11-08 13:13:38 -08:00 |
|
Michael Jurka
|
1470297c4d
|
am 47674796: am eb963f04: Enforce max number of 5 lockscreen widgets
* commit '47674796bc1ca3c2d0d154a107e8e29b51389bc5':
Enforce max number of 5 lockscreen widgets
|
2012-11-08 13:13:34 -08:00 |
|
Adam Cohen
|
06b29549fb
|
am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
* commit '38515e9a4c4c5db5045b873842df594f50b12421':
Adding user activity when the challenge is slid down
|
2012-11-08 13:13:30 -08:00 |
|
Jim Miller
|
2b49dd1c6e
|
am 6c7d2c24: am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
* commit '6c7d2c248c53a50b2c7a8a4c1800a595755f3fc5':
Don't show ECA in landscape mode on phones.
|
2012-11-08 13:13:26 -08:00 |
|
Jim Miller
|
a2bf6181df
|
am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
* commit '2c29deaa2650091d9206b8fa93f8a447ee247d52':
Add mechanism to kick keyguard to show the assistant
|
2012-11-08 13:13:23 -08:00 |
|
Adam Powell
|
79b08a499f
|
am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
* commit '2cfb9373fa1e1f1be107a310c49ef68722544aa3':
add bouncer frame to glowpad.
|
2012-11-08 13:13:19 -08:00 |
|
Adam Powell
|
d7aaf3af31
|
am f3eaabb9: am a9fa92e8: Keyguard - force showing the status bar
* commit 'f3eaabb9321a202e79e30b7d7ceb828d4ece45b7':
Keyguard - force showing the status bar
|
2012-11-08 13:13:16 -08:00 |
|
Jim Miller
|
670f5a52b0
|
am e0dd7c46: am 2cacda5f: Disable interactive mode for full-screen security views in keyguard.
* commit 'e0dd7c463b6b62582c3f07c07f2f81da93e6412e':
Disable interactive mode for full-screen security views in keyguard.
|
2012-11-08 13:13:12 -08:00 |
|
Adam Cohen
|
230719c7b5
|
am 640cf0ab: am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev
* commit '640cf0ab0a38888717febed818b015a8767a7010':
Clean up some flashy jank (issue 7454766)
|
2012-11-08 13:13:09 -08:00 |
|
Winson Chung
|
10bcc7d958
|
am 18825966: am 70c2f873: Synchronizing bouncer duration with page scaling duration.
* commit '1882596608062169b0155ccdfd634f6832c1b499':
Synchronizing bouncer duration with page scaling duration.
|
2012-11-08 13:13:02 -08:00 |
|
Daniel Sandler
|
e7689b82fa
|
am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
* commit '3a54aaed02a79e589892389f1004ebcf3f8325be':
Compress lockscreen's account login fallback to fit.
|
2012-11-08 13:12:53 -08:00 |
|
Amith Yamasani
|
fda5c8524d
|
am 318d87fb: am 9eacab8a: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
* commit '318d87fb045ee6cce9e53d9bc13691b236b555c7':
|
2012-11-08 13:12:46 -08:00 |
|
Adam Powell
|
ef79efdc47
|
am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
* commit '868edfdee6df34a0275c76e11ba3ca44e0327942':
Fiddle with keyguard glowpad layouts
|
2012-11-08 13:12:42 -08:00 |
|
Winson Chung
|
8c5ebad003
|
am 062e01c5: am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot.
* commit '062e01c5f664bbbbff5d351eb4af0b56af3fa32d':
Adding workaround to fix issue where the bouncer animation had the wrong pivot.
|
2012-11-08 13:12:39 -08:00 |
|
Jim Miller
|
426348ae81
|
am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
* commit 'e9c881c66d7845dabb936e93939179ff87f72699':
Don't handle click events on the emergency button in bouncer mode
|
2012-11-08 13:12:35 -08:00 |
|
Daniel Sandler
|
e8d02b315b
|
am 1323fe3e: am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev
* commit '1323fe3ed4768237992f0f48a7259e0801d5b4d6':
New asset for assist affordance on lockscreen.
|
2012-11-08 13:12:32 -08:00 |
|
Adam Powell
|
b4c8cf6ac4
|
am 75298e33: am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
* commit '75298e337a2c3655c6ff91572e56e575de766506':
Use stable layouts for keyguard/SlidingChallengeLayout
|
2012-11-08 13:12:28 -08:00 |
|
Jim Miller
|
3a191b495c
|
am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
* commit 'f3add313dcbcda6711b441022fe340b412b7d1a0':
Attempt to fix NegativeArraySizeException crash in keyguard
|
2012-11-08 13:12:25 -08:00 |
|
Daniel Sandler
|
98a53594ae
|
am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
* commit '0e767b2958a2dc47f062687a29e1be8f3c17a131':
Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
|
2012-11-08 13:12:21 -08:00 |
|
Winson Chung
|
29f161781c
|
am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
* commit '27ed0c2d002587010456c87321902c276ae6e11a':
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
|
2012-11-08 13:12:17 -08:00 |
|
Adam Cohen
|
79d4bf6e2f
|
am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
* commit 'efacf14349286916d7dfd904617cda659f93cf91':
Fixing up overscroll asset / sizing
|
2012-11-08 13:12:13 -08:00 |
|
Jim Miller
|
e7bb1f690e
|
am 4bd4b78f: am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
* commit '4bd4b78f33f1cc564128f55ebfb3e27c1398b550':
Add one more check for detecting crashes while inflating multiuser widget
|
2012-11-08 13:12:09 -08:00 |
|
Svetoslav Ganov
|
8fa69381f2
|
am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
* commit '0e538548d75b97cfb3f29cce9c39e0ba65bbaa46':
Slide unlock cannot get accessibility focus.
|
2012-11-08 13:12:06 -08:00 |
|
Jim Miller
|
bb01e9b82f
|
am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
* commit 'b1938777afd8d7888779102ea2f3b5c0077c8f88':
Implement fallback clock in keyguard
|
2012-11-08 13:12:02 -08:00 |
|
Michael Jurka
|
b40f9408f5
|
am 090c790c: am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev
* commit '090c790c1cf2036653b1725d130e220da0432d45':
Fix bug where newly added widget wasn't always shown
|
2012-11-08 13:11:58 -08:00 |
|
Adam Cohen
|
24b1764e6c
|
am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
* commit '9477f8dee1068f7b07713a33b18fd4aea6b5c039':
Fixing up glowpad scaling issues (issue 7494378)
|
2012-11-08 13:11:54 -08:00 |
|
Adam Powell
|
d921f60440
|
am 0fcb5cda: am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
* commit '0fcb5cda5fcfc10af2dba032414c6ab9727b48f2':
Fix keyguard measurement bugs
|
2012-11-08 13:11:50 -08:00 |
|
Daniel Sandler
|
82b18e8d5c
|
am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
* commit '9de5901bb37ad2a42d334405f41e629fa29dfd46':
Don't crash if no ECA.
|
2012-11-08 13:09:11 -08:00 |
|