Craig Mautner
67a3fb6f3b
am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
...
* commit 'c10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5':
Support Wifi display devices that rename themselves.
2012-11-13 10:02:21 -08:00
Craig Mautner
c10914ca5c
Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
2012-11-13 10:00:04 -08:00
Baligh Uddin
9885af0558
am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9508e31dcd41bbdbff255913b72489af95e9bd0c':
Import translations. DO NOT MERGE
2012-11-13 08:53:29 -08:00
Baligh Uddin
bda180a6d5
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-12 16:25:24 -08:00
Justin Koh
446432692a
Merge "Make tap events less sensitive." into jb-mr1-aah-dev
2012-11-12 10:20:43 -08:00
Ben Pietrzak
ffb5bdef63
Make tap events less sensitive.
...
Change-Id: I4d6f70b56373fbc51a414510897854078eeb0c40
2012-11-12 10:11:52 -08:00
John Spurlock
b340fe4f88
am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
...
* commit 'f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
Disable navbar searchlight if search assist not available.
2012-11-12 07:55:24 -08:00
John Spurlock
f6f47e950d
Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
2012-11-12 07:52:08 -08:00
Baligh Uddin
fadf669344
Import translations. DO NOT MERGE
...
Change-Id: Ic0e6487087282230326fbd20063b47ad9205ee53
Auto-generated-cl: translation import
2012-11-12 07:40:52 -08:00
Baligh Uddin
d300d3efa3
Import translations. DO NOT MERGE
...
Change-Id: Ic7c196abf01d9eab7c1d32dba4eb974979b6d38a
Auto-generated-cl: translation import
2012-11-12 07:39:10 -08:00
Andy McFadden
a7113f70c5
am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev
...
* commit '798de53cf454595a3a494d26dfa3f08518c24e55':
Reduce emulator logspam
2012-11-09 22:41:51 -08:00
John Spurlock
43d84518f2
Disable navbar searchlight if search assist not available.
...
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
2012-11-09 10:27:33 -05:00
Andy McFadden
325be8a1ea
Reduce emulator logspam
...
The emulator doesn't support systrace, but we should point that out
at most once per process.
Bug 7436352
Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
2012-11-08 16:40: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
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
Dianne Hackborn
7ff30113de
Remove extraneous logs.
...
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
2012-11-08 13:13:48 -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
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
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
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
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
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
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
Chris Wren
f080dc0c7d
am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
...
* commit '7d59cf9f10c38a020c7104e3bd5b358ab2144ab5':
allow pattern linear layout to manage message_area.
2012-11-08 13:09:08 -08:00
Jim Miller
6c7d2c248c
am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
...
* commit 'e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc':
Don't show ECA in landscape mode on phones.
2012-11-08 13:08:45 -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
Adam Powell
2cfb9373fa
am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
...
* commit '5dd8b00891faff39ecadb1a0322e14528883bfe3':
add bouncer frame to glowpad.
2012-11-08 13:08:38 -08:00
Daniel Sandler
3a54aaed02
am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
...
* commit '838195db8f69968690971977e4b615df39504465':
Compress lockscreen's account login fallback to fit.
2012-11-08 13:08:17 -08:00
Adam Powell
868edfdee6
am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
...
* commit 'e7e210cb4373877785130ff06ad4e6635592eaa8':
Fiddle with keyguard glowpad layouts
2012-11-08 13:08:06 -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
Winson Chung
27ed0c2d00
am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
...
* commit '4181e8a4ac07e118724f7935928d2c3a1bb291f7':
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 13:07:39 -08:00
Adam Cohen
efacf14349
am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
...
* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
Fixing up overscroll asset / sizing
2012-11-08 13:07:36 -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
Jim Miller
b1938777af
am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
...
* commit '40962880225c74d8f776e6ce03f1ec6dde63ef04':
Implement fallback clock in keyguard
2012-11-08 13:07:25 -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
Chris Wren
e1a8eee6d0
allow pattern linear layout to manage message_area.
...
Bug: 7501923
Change-Id: I5126e760d8567380e2041ca01791f14c7b054adb
2012-11-08 12:28:15 -05:00
Jim Miller
e1a473b0d4
Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
2012-11-08 01:00:12 -08:00
Jim Miller
9e0a250600
Don't show ECA in landscape mode on phones.
...
Fixes bug 7490941
Change-Id: I8a65aed0b4efc8676b95ad5fea6a7f4ac7d944d0
2012-11-08 00:57:31 -08:00
Jim Miller
6be441c532
Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
2012-11-08 00:51:26 -08:00
Jim Miller
4eeb4f664a
Add mechanism to kick keyguard to show the assistant
...
Fixes bug 7499778
Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
2012-11-08 00:39:04 -08:00
Chris Wren
efbfa685b6
add bouncer frame to glowpad.
...
Bug: 7497916
Change-Id: I6bddbfc91c89b0855eba0dcec46bc1b88684b8ad
2012-11-07 23:29:17 -08:00
Daniel Sandler
838195db8f
Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev
2012-11-07 21:18:44 -08:00
Daniel Sandler
cf2b7a261d
Compress lockscreen's account login fallback to fit.
...
- ECA will not be shown in this mode
- The login button shares a row with the password field
Nice and tidy.
Bug: 7456674
Change-Id: I38d04dcb7ee32d0b289f03f9e8dcbe38ba23a119
2012-11-08 00:09:37 -05:00
Satoshi Kataoka
4424951fa5
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 '1e29e49cf8b2654f999b2fdb16e8f7f262b73c68':
Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
2012-11-07 20:50:37 -08:00