Dianne Hackborn
55fdd58af8
am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
...
* commit 'e0d454d2e86f4170bdab68d45696fb2eb9a87f9f':
Remove extraneous logs.
2012-11-08 15:58:52 -08:00
Jim Miller
08bb2316f1
am 061b4fae: am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '061b4fae3daf40c90b46e16b12e7f22142eb498c':
Add mechanism to kick keyguard to show the assistant
2012-11-08 15:58:03 -08:00
Jim Miller
f93d1e405a
am 23b94022: am 3a191b49: am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
...
* commit '23b94022ba4cdd0b45c2c2835d45921423d916c8':
Attempt to fix NegativeArraySizeException crash in keyguard
2012-11-08 15:57:03 -08:00
Svetoslav Ganov
7d90437bb8
am 09b6f4bb: am 8fa69381: am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
...
* commit '09b6f4bbff67f210aa135d0158985cb3c47f95a4':
Slide unlock cannot get accessibility focus.
2012-11-08 15:56:35 -08:00
Adam Cohen
7a81cffa9b
am 92f828f2: am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
...
* commit '92f828f2a4f873871ddd4b6f81812f94cc0bd227':
Fixing up glowpad scaling issues (issue 7494378)
2012-11-08 15:56:23 -08:00
Satoshi Kataoka
350d4cbec1
am ae41ba15: am 4424951f: am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
...
* commit 'ae41ba156364f5625280c4229169899adea965d5':
Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
2012-11-08 15:55:59 -08:00
Justin Koh
9d0640cfb6
am 3e94c562: am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
...
* commit '3e94c56215fa540ca722ab7b23710b82c08d20a4':
Catch exception of nonfound activities
2012-11-08 15:55:14 -08:00
Daniel Sandler
facda3d1c5
am 7f83ef61: am ccbfd617: am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit '7f83ef619a3ad067c0b010c2f8bb113abf53b6c0':
Fix docs to refer to the correct class.
2012-11-08 15:54:51 -08:00
Dianne Hackborn
e0d454d2e8
am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
...
* commit '72325cdb65a321df7755ba214efd9be42ce828d5':
Remove extraneous logs.
2012-11-08 15:47:46 -08:00
Jim Miller
061b4fae3d
am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
Add mechanism to kick keyguard to show the assistant
2012-11-08 15:47:04 -08:00
Jim Miller
23b94022ba
am 3a191b49: am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
...
* commit '3a191b495c886a654f33fe717467a74975137e58':
Attempt to fix NegativeArraySizeException crash in keyguard
2012-11-08 15:46:07 -08:00
Svetoslav Ganov
09b6f4bbff
am 8fa69381: am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
...
* commit '8fa69381f212b85ec9156e0a95382cd3ff312444':
Slide unlock cannot get accessibility focus.
2012-11-08 15:45:48 -08:00
Adam Cohen
92f828f2a4
am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
...
* commit '24b1764e6c1996926ecba280f236ab05cec68b2c':
Fixing up glowpad scaling issues (issue 7494378)
2012-11-08 15:45:35 -08:00
Satoshi Kataoka
ae41ba1563
am 4424951f: am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
...
* commit '4424951fa566b3bf6e57b08f615facc680059164':
Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
2012-11-08 15:44:26 -08:00
Justin Koh
3e94c56215
am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
...
* commit 'cd38c32d85c13fde87ca7bee501cbe35230078b6':
Catch exception of nonfound activities
2012-11-08 15:43:34 -08:00
Daniel Sandler
7f83ef619a
am ccbfd617: am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit 'ccbfd617e730e5c3660fb3b9edf4f272db4abfd0':
Fix docs to refer to the correct class.
2012-11-08 15:42:51 -08:00
Romain Guy
238c892ece
am 11d43794: am de60dd2d: am fcd7ad4e: am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774 " into jb-mr1-dev
...
* commit '11d43794b92e917bebc527d6e597eb6bd6581bfb':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
2012-11-08 15:38:43 -08:00
Michael Jurka
069d5ee9ac
am 9d15b4cb: am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
...
* commit '9d15b4cb70e0141bb5fe4e266bb505b4f84eb1ec':
Allowing rotation while adding lockscreen widgets
2012-11-08 15:38:07 -08:00
Adam Cohen
df8a020c61
am 0c06c2b3: am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
...
* commit '0c06c2b35c50a8391fb95e8f9b277e0b9899c1c1':
Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-08 15:38:03 -08:00
Michael Jurka
7df23b0c51
am d31bc8ca: am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
...
* commit 'd31bc8ca2ce4c1288f14cf650944c9b65a588b72':
Removing sticky widgets in lockscreen
2012-11-08 15:37:43 -08:00
Jim Miller
7779c83a36
am fcb80423: am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit 'fcb8042316bad141cab189de6dfacd60e8d09848':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-08 15:37:30 -08:00
Jim Miller
d97b09b0f3
am bef82757: am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit 'bef827572ce9644253ea42ab91b11b8107d2300f':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-08 15:37:01 -08:00
Adam Cohen
1c2576ae18
am 1b19b519: am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
...
* commit '1b19b519e659783236661fecf22f4f8897742dc3':
Attempted fix for issue 7469415
2012-11-08 15:36:45 -08:00
Romain Guy
11d43794b9
am de60dd2d: am fcd7ad4e: am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774 " into jb-mr1-dev
...
* commit 'de60dd2d136557ff7dce52c37625c4475ef42e7d':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
2012-11-08 15:34:12 -08:00
Michael Jurka
9d15b4cb70
am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
...
* commit '5dc8ce48d80c339070b626903a57846d4357c2f2':
Allowing rotation while adding lockscreen widgets
2012-11-08 15:33:16 -08:00
Adam Cohen
0c06c2b35c
am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
...
* commit '580657a34851c29f013586578241d2f4d6dc4f5d':
Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-08 15:33:13 -08:00
Michael Jurka
d31bc8ca2c
am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
...
* commit 'f142427244dde3e467b126df4840f496e09cef56':
Removing sticky widgets in lockscreen
2012-11-08 15:32:53 -08:00
Jim Miller
fcb8042316
am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit '8920c259c8f5c63e4fae40f00afb185daa8008fb':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-08 15:32:40 -08:00
Jim Miller
bef827572c
am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit 'c7dc250d5a3dab93ff87e9986a71ae58ff124399':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-08 15:32:09 -08:00
Adam Cohen
1b19b519e6
am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
...
* commit 'd50f206a08663c05dbe6c14918c6eef61df0bc97':
Attempted fix for issue 7469415
2012-11-08 15:31:57 -08:00
Jean-Baptiste Queru
7c8d2b63c0
Merge from jb-mr1-dev-plus-aosp
...
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
2012-11-08 15:19:11 -08:00
Jean-Baptiste Queru
c23cfe57a9
Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD
2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
40a419c2a5
Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD
2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
8d3d0250c4
Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11'
...
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
2012-11-08 14:40:12 -08:00
Jean-Baptiste Queru
ce2a3746b8
merge 19f8aa180a
...
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
2012-11-08 14:13:21 -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
Dianne Hackborn
7ff30113de
Remove extraneous logs.
...
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
2012-11-08 13:13:48 -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
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
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
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
Jim Miller
2c29deaa26
am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '6be441c532688762b735ae2a1276195b40bf33b4':
Add mechanism to kick keyguard to show the assistant
2012-11-08 13:08:41 -08:00
Jim Miller
f3add313dc
am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
...
* commit '3c9297c3cb739b9aec9ccff7e4e3e05006edb836':
Attempt to fix NegativeArraySizeException crash in keyguard
2012-11-08 13:07:46 -08:00
Svetoslav Ganov
0e538548d7
am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
...
* commit 'cd1f3095056bd4148030f6f6c514387d623db800':
Slide unlock cannot get accessibility focus.
2012-11-08 13:07:29 -08:00
Adam Cohen
9477f8dee1
am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
...
* commit '3e66286f7cf33ef13fd9f4f033816b84828c1f2b':
Fixing up glowpad scaling issues (issue 7494378)
2012-11-08 13:07:18 -08:00
Irfan Sheriff
8449bb0378
am 37794c20: am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
...
* commit '37794c200fa24e622d842d420b49a2a2a87a38bb':
Stop supplicant and dhcp before start
2012-11-08 06:18:47 -08:00
Romain Guy
18d9a26941
am a965fc5e: am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935 " into jb-mr1-dev
...
* commit 'a965fc5e8f0c84cbeeaae7006eddbaf3bba64586':
Dismiss error icon on setError(null) [regression] Bug #7442935
2012-11-08 06:18:40 -08:00
Eino-Ville Talvala
f0352e03fd
am f4334f63: am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
...
* commit 'f4334f63c5162035ead3b44131c48015dfc6be58':
Camera: Document new video snapshot picture size behavior.
2012-11-08 06:18:36 -08:00
