Jim Miller
6a3cceb4d9
Fix problem where PhoneWindowManager waits for keyguard to draw
...
This fixes a problem where PhoneWindowManager times out waiting
for keyguard to draw when it's disabled. Instead, we pass a null
token back which allows PhoneWindowManager to continue.
Fixes bug 11190932
Change-Id: I041ea1d88dca681476d9477a3aab54559976b312
2013-10-11 21:23:32 -07:00
Jim Miller
e657a82ee1
Disable the camera and search buttons while we're in bouncer mode.
...
Fixes 11191334
Change-Id: I035f9e4e3d033fac6e1660b2d357ddac6f36bcbf
2013-10-11 19:49:31 -07:00
Craig Mautner
272b0929a9
am 6b5fc882: am 166434ec: Merge "When removing a task that was on home, put home on top." into klp-dev
...
* commit '6b5fc882d1823c8922860ef284442442b635111b':
When removing a task that was on home, put home on top.
2013-10-11 19:48:12 -07:00
Craig Mautner
6b5fc882d1
am 166434ec: Merge "When removing a task that was on home, put home on top." into klp-dev
...
* commit '166434eca57a09aed9347a3cfff5e80b268f97b0':
When removing a task that was on home, put home on top.
2013-10-11 19:44:31 -07:00
Craig Mautner
166434eca5
Merge "When removing a task that was on home, put home on top." into klp-dev
2013-10-12 02:42:38 +00:00
Jim Miller
c69fa27513
am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev
...
* commit '8eebe3b5bcdbdb1998d17bb7a058bd9ba26234c9':
Enable time format localization in keyguard
2013-10-11 18:11:05 -07:00
Jim Miller
8eebe3b5bc
am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev
...
* commit 'dc70340d48eeddf4aa92a4d199179cde269c5bd4':
Enable time format localization in keyguard
2013-10-11 18:08:00 -07:00
Jim Miller
dc70340d48
Merge "Enable time format localization in keyguard" into klp-dev
2013-10-12 01:00:24 +00:00
Jim Miller
0c48689b08
Enable time format localization in keyguard
...
Fixes bug 11173871
Change-Id: Ife44c93b01770a3349343d034fe6adb1c6d66185
2013-10-11 17:50:35 -07:00
Robert Greenwalt
dcc31551f8
am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev
...
* commit 'e9d997050bdd4cc273205f3451995f0e1e9cc3af':
Make Wifi Scans more heap-efficient
2013-10-11 17:37:56 -07:00
Craig Mautner
8e5695778f
When removing a task that was on home, put home on top.
...
Killing an app that was launched from home was not relaunching home.
Previous situations relaunched the next app (i.e. home) based on the
task flag. However, when an app dies the relaunch is deferred until
the TaskRecord has long been forgotten. This fix rearranges the stacks
immediately upon the TaskRecord being removed from the stack. Then the
next resumeTopActivities() call will start the home task.
Fixes bug 11189555.
Change-Id: I0e09350a7db55ea8b38cce7bf4b69923a6b99494
2013-10-11 17:36:59 -07:00
Baligh Uddin
92756b89c8
am 5a531ff9: (-s ours) am ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '5a531ff96081c20cab087306907c406076a10ddb':
Import translations. DO NOT MERGE
2013-10-11 17:34:14 -07:00
Baligh Uddin
93a1154fbf
am a57076e8: (-s ours) am 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'a57076e820731347236e69aee8abab73f2ab2ad2':
Import translations. DO NOT MERGE
2013-10-11 17:34:11 -07:00
Baligh Uddin
480f83cfc6
am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'db79e4d41d21cf7daf403d680851d78c6c59a2af':
Import translations. DO NOT MERGE
2013-10-11 17:34:07 -07:00
Robert Greenwalt
e9d997050b
am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev
...
* commit '72dc0b439152ad1428d8713abc2b8f16911e2e7e':
Make Wifi Scans more heap-efficient
2013-10-11 17:33:21 -07:00
Baligh Uddin
e6cc525f45
am b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit 'b43e0eadbe144eae189ecf9f26005fd76d9f31d6':
Import translations. DO NOT MERGE
2013-10-11 17:30:31 -07:00
Baligh Uddin
e3e194ae8b
am 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit '8cdfa5cd18ecf552f99c826797951a9a86c2af3c':
Import translations. DO NOT MERGE
2013-10-11 17:30:28 -07:00
Baligh Uddin
9f93c67c6a
am adb1b5b4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit 'adb1b5b43f517751151835e2143d53ad3666ac8e':
Import translations. DO NOT MERGE
2013-10-11 17:30:25 -07:00
Baligh Uddin
b780082cf3
am 4bb81ac8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit '4bb81ac838dd910ea4a8dded676d70d4e399eed9':
Import translations. DO NOT MERGE
2013-10-11 17:30:23 -07:00
Robert Greenwalt
72dc0b4391
Merge "Make Wifi Scans more heap-efficient" into klp-dev
2013-10-12 00:30:22 +00:00
Baligh Uddin
5a531ff960
am ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'ea9aec27cc792027c94fe2d1d60586efb4f85d24':
Import translations. DO NOT MERGE
2013-10-11 17:29:40 -07:00
Baligh Uddin
a57076e820
am 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '3c10347cdb84db55320d964778ff684f059cecad':
Import translations. DO NOT MERGE
2013-10-11 17:29:36 -07:00
Baligh Uddin
db79e4d41d
am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '84f5bf823972b87be1ee0334f96a2ed3216e81a7':
Import translations. DO NOT MERGE
2013-10-11 17:29:33 -07:00
Dirk Dougherty
cd514970cc
Doc change: fix link to widgets design doc.
...
bug: 11184594
Change-Id: I975696d172d0862ac20c46f709e81b01bf78fb0f
2013-10-11 17:29:06 -07:00
Baligh Uddin
b43e0eadbe
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-12 00:27:48 +00:00
Baligh Uddin
849a41a865
Merge "Import translations. DO NOT MERGE"
2013-10-12 00:27:35 +00:00
Baligh Uddin
8cdfa5cd18
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-12 00:27:30 +00:00
Baligh Uddin
ea9aec27cc
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-12 00:27:15 +00:00
Baligh Uddin
1f90779654
Merge "Import translations. DO NOT MERGE"
2013-10-12 00:27:02 +00:00
Baligh Uddin
adb1b5b43f
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-12 00:26:49 +00:00
Baligh Uddin
3c10347cdb
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-12 00:26:44 +00:00
Svetoslav
455e95ebab
am 1f5c1f3e: am 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev
...
* commit '1f5c1f3eee2df06ae42bc9e2bb9b5502316502cc':
Putting the cursor at the end of the copies and range inputs.
2013-10-11 17:26:42 -07:00
Baligh Uddin
4bb81ac838
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-12 00:26:28 +00:00
Baligh Uddin
84f5bf8239
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-12 00:26:24 +00:00
Svetoslav
1f5c1f3eee
am 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev
...
* commit '036f05b8b0dabc72e6ce68372516c3d98da137e4':
Putting the cursor at the end of the copies and range inputs.
2013-10-11 17:22:56 -07:00
Svetoslav
036f05b8b0
Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev
2013-10-12 00:21:12 +00:00
Chris Craik
e0db6fc684
am 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev
...
* commit '8d56f667243292ed002dce81498be0e4d4a3ea59':
Document special case in hasOverlappingRendering
2013-10-11 17:14:12 -07:00
Chris Craik
8d56f66724
am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev
...
* commit '709129ba939f9d09887506540bcbb573086b3f15':
Document special case in hasOverlappingRendering
2013-10-11 17:11:18 -07:00
Chris Craik
709129ba93
Merge "Document special case in hasOverlappingRendering" into klp-dev
2013-10-12 00:08:08 +00:00
Svetoslav
89ed9fcf9b
Putting the cursor at the end of the copies and range inputs.
...
bug:10983508
Change-Id: I767876fada2f28b00283ed9140fca1a40729f38f
2013-10-11 17:04:34 -07:00
Chris Craik
c09127a7c3
Document special case in hasOverlappingRendering
...
bug:11121809
Change-Id: I074ac47aa510bd2362cfda7dffc73930f07e925c
2013-10-11 17:00:16 -07:00
Joe Malin
45edbb701a
DOC CHANGE: FileProvider training class
...
Change-Id: Idad8840dec02150733f23cfefdeaf152a260f63a
2013-10-11 16:48:18 -07:00
Baligh Uddin
f27bbdd594
Import translations. DO NOT MERGE
...
Change-Id: I2b2abc0ab598637d4762135082fc79c7205c332f
Auto-generated-cl: translation import
2013-10-11 16:45:22 -07:00
Baligh Uddin
b48966885e
Import translations. DO NOT MERGE
...
Change-Id: I11e36ca2c03ecbe1a6c99a8cc4f7e4afed3e5427
Auto-generated-cl: translation import
2013-10-11 16:34:38 -07:00
Baligh Uddin
0c679b02b3
Import translations. DO NOT MERGE
...
Change-Id: I68d6709509ea86f19862bb7ea5319d405dcd7c10
Auto-generated-cl: translation import
2013-10-11 16:33:07 -07:00
Baligh Uddin
3532cb4bba
Import translations. DO NOT MERGE
...
Change-Id: I66efc38992968ef463f4d02f1af101053adfb41e
Auto-generated-cl: translation import
2013-10-11 16:31:18 -07:00
Baligh Uddin
e9fe9d729e
Import translations. DO NOT MERGE
...
Change-Id: I82d4f166b346b10babd67f89f3035426e74db7dd
Auto-generated-cl: translation import
2013-10-11 16:28:01 -07:00
Baligh Uddin
40311938ae
Import translations. DO NOT MERGE
...
Change-Id: If2d70b403a7c4ba6b6023b71bf1d66e01575278d
Auto-generated-cl: translation import
2013-10-11 16:27:10 -07:00
Baligh Uddin
9c56db19c5
Import translations. DO NOT MERGE
...
Change-Id: I8d1fd0e44df5ea45d590e675e1f2d0afda54bc69
Auto-generated-cl: translation import
2013-10-11 16:25:46 -07:00
Baligh Uddin
b8087da933
Import translations. DO NOT MERGE
...
Change-Id: I289f527bef7c4274b4161d2e90c8aa82dc9608a9
Auto-generated-cl: translation import
2013-10-11 16:23:01 -07:00