Baligh Uddin
2da06ce6fc
Merge "Import translations. DO NOT MERGE"
2012-10-23 11:23:09 -07:00
Baligh Uddin
f614632179
am 450fef15: (-s ours) am c730c00a: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '450fef15a2168d37385bd5664fb5dae20e40fdd1':
Import translations. DO NOT MERGE
2012-10-23 11:22:03 -07:00
Baligh Uddin
450fef15a2
am c730c00a: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'c730c00ae5bad37895ab8cef85293a017bf21046':
Import translations. DO NOT MERGE
2012-10-23 11:19:26 -07:00
Baligh Uddin
c730c00ae5
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-23 11:16:25 -07:00
Baligh Uddin
6afac8f980
Merge "Import translations. DO NOT MERGE"
2012-10-23 11:05:34 -07:00
Romain Guy
573f1429a0
am 2635e743: am d04fe3c1: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
...
* commit '2635e7431a74b89c338ea9d56715f94b9c328cc1':
Properly draw the window background on window resize Bug #7385090
2012-10-23 10:58:12 -07:00
Irfan Sheriff
f2e005aa24
am c3b9c76b: am 9998f77a: am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
...
* commit 'c3b9c76b61502ff3e0c0681298f1ed45444b0eac':
Fix driver stop handling
2012-10-23 10:56:33 -07:00
Romain Guy
2635e7431a
am d04fe3c1: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
...
* commit 'd04fe3c1aeaf4ce63f6a6f3def61a8cc5faff705':
Properly draw the window background on window resize Bug #7385090
2012-10-23 10:53:40 -07:00
Irfan Sheriff
c3b9c76b61
am 9998f77a: am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
...
* commit '9998f77a75ec9d56b2bc4510f7b4ff1952f4f900':
Fix driver stop handling
2012-10-23 10:52:04 -07:00
Romain Guy
d04fe3c1ae
am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
...
* commit '04c8d402fa824c548dc5de82c56e63eb5df02371':
Properly draw the window background on window resize Bug #7385090
2012-10-23 10:51:14 -07:00
Irfan Sheriff
9998f77a75
am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
...
* commit 'c48ca657f801b120e88c94287cdeecddc1a46e88':
Fix driver stop handling
2012-10-23 10:49:14 -07:00
Baligh Uddin
5b03da95c5
am 385cf240: (-s ours) am eac76dc0: am 21ce854b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '385cf240ca8dcd99fbcc89a6c8672a0cc0aab7cc':
Import translations. DO NOT MERGE
2012-10-23 10:48:09 -07:00
Romain Guy
04c8d402fa
Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
2012-10-23 10:47:56 -07:00
Irfan Sheriff
c48ca657f8
Merge "Fix driver stop handling" into jb-mr1-dev
2012-10-23 10:45:42 -07:00
Baligh Uddin
db7032a319
am 6eb8a6c5: (-s ours) am 7fcea3ee: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '6eb8a6c597d419d5a755f6c2ea0750fa7b6ed767':
Import translations. DO NOT MERGE
2012-10-23 10:45:16 -07:00
Baligh Uddin
385cf240ca
am eac76dc0: am 21ce854b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'eac76dc09edad9d78075cf5dae1d62f671d3f3bf':
Import translations. DO NOT MERGE
2012-10-23 10:45:14 -07:00
Baligh Uddin
eac76dc09e
am 21ce854b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '21ce854b50667bf675bc36ce0db1a3d6f0a2ab92':
Import translations. DO NOT MERGE
2012-10-23 10:42:19 -07:00
Baligh Uddin
6eb8a6c597
am 7fcea3ee: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '7fcea3eeccccebe5a1dabcbc15c488116b7bde8e':
Import translations. DO NOT MERGE
2012-10-23 10:42:15 -07:00
Daniel Sandler
7d747cdf20
am c43d26d4: am d9a4371d: am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit 'c43d26d412c6e35f0b0afc8e223035a746801d06':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 10:40:46 -07:00
Baligh Uddin
21ce854b50
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-23 10:39:27 -07:00
Daniel Sandler
c43d26d412
am d9a4371d: am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit 'd9a4371d11ba838494e0797bcf3d83e47d061e8d':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 10:38:37 -07:00
Baligh Uddin
7fcea3eecc
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-23 10:37:59 -07:00
Baligh Uddin
8a1ab4adfe
Import translations. DO NOT MERGE
...
Change-Id: I2e52a9350aa7c2b87c7488af16bebef467f1e627
Auto-generated-cl: translation import
2012-10-23 10:37:49 -07:00
Irfan Sheriff
e6464af000
Fix driver stop handling
...
Defer supplicant state change event so we do not miss it
Bug: 7394390
Change-Id: Ibae6cef6be42a6cb45dc20ba4fa5060d8e459217
2012-10-23 10:36:51 -07:00
Daniel Sandler
d9a4371d11
am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit '365ece1dd04df936b51e739ba3dde5fb94b3e527':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 10:35:12 -07:00
Baligh Uddin
b9d2bd6854
Import translations. DO NOT MERGE
...
Change-Id: I540a08d72253a205d6071340c5d7519a08450ef3
Auto-generated-cl: translation import
2012-10-23 10:32:41 -07:00
Daniel Sandler
365ece1dd0
Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
2012-10-23 10:31:23 -07:00
Irfan Sheriff
ab1d4208c8
Fix driver stop handling
...
Defer supplicant state change event so we do not miss it
Bug: 7394390
Change-Id: I5cf1dfb49d955833b8b822d079756c9f9687070f
2012-10-23 10:22:13 -07:00
Baligh Uddin
e88f80d056
Import translations. DO NOT MERGE
...
Change-Id: Ibcd6c4b85ad7eecfa435d0365acec92064697fbc
Auto-generated-cl: translation import
2012-10-23 10:21:59 -07:00
Justin Ho
8ecf1612be
am 23ed51a6: am bab415da: am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
...
* commit '23ed51a630e304924caad5764bc0c5a32245bb60':
Avoid mentioning hidden API in docs.
2012-10-23 10:11:27 -07:00
Justin Ho
23ed51a630
am bab415da: am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
...
* commit 'bab415da35ad3deff7df0cb6d65cc907802ba696':
Avoid mentioning hidden API in docs.
2012-10-23 10:08:25 -07:00
Justin Ho
bab415da35
am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
...
* commit '5d6562d34cb088f3468021b8bbdf8d75b68dca68':
Avoid mentioning hidden API in docs.
2012-10-23 10:05:28 -07:00
Baligh Uddin
1c8e4dc101
Import translations. DO NOT MERGE
...
Change-Id: I6d7f8dec6e1115a4586befbaa302eafe606fb901
Auto-generated-cl: translation import
2012-10-23 10:03:00 -07:00
Baligh Uddin
bf00fc556f
Import translations. DO NOT MERGE
...
Change-Id: I7664310dd790906eb6a66725048f4fd77fa7d798
Auto-generated-cl: translation import
2012-10-23 09:58:07 -07:00
Irfan Sheriff
e4e53c2756
am a8b5ee8e: am 5e7fcf37: am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
...
* commit 'a8b5ee8e5d5ba629402eb6a06b1de2ea319ea90a':
Fix issues shown on CTS tests
2012-10-23 09:44:21 -07:00
Justin Ho
5d6562d34c
Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
2012-10-23 09:41:48 -07:00
Irfan Sheriff
a8b5ee8e5d
am 5e7fcf37: am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
...
* commit '5e7fcf372e3559e4f2cacdf892f268b0e5ee1d6c':
Fix issues shown on CTS tests
2012-10-23 09:41:42 -07:00
Irfan Sheriff
5e7fcf372e
am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
...
* commit 'bf310d1f6ef4ac167f66a4e31724c7766981bd84':
Fix issues shown on CTS tests
2012-10-23 09:39:42 -07:00
Jeff Sharkey
b76a0c40d4
Avoid mentioning hidden API in docs.
...
Change-Id: If83c179ec0d1b038e94a7fdca386c8ddf324e391
2012-10-23 09:37:54 -07:00
Irfan Sheriff
bf310d1f6e
Merge "Fix issues shown on CTS tests" into jb-mr1-dev
2012-10-23 09:36:48 -07:00
Irfan Sheriff
51aec5ed5f
Fix issues shown on CTS tests
...
Reset timeout for single interface architecture
Fix persistence reinvocation handling on the receive side
Bug: 7379336
Change-Id: Iacca0bd6dcbeb42af63bf2078e8cf3126e4e74a7
2012-10-23 09:25:37 -07:00
Jeff Sharkey
252b262f25
am d6d2ac80: am c4715678: am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
...
* commit 'd6d2ac8042350b2949f0d0369cb7bc22bb1c55f0':
Update docs for multi-user storage behavior.
2012-10-23 09:17:18 -07:00
Jeff Sharkey
d6d2ac8042
am c4715678: am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
...
* commit 'c47156781c1b348df7c6b40d0af8d173c08293a2':
Update docs for multi-user storage behavior.
2012-10-23 09:14:00 -07:00
Jeff Sharkey
c47156781c
am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
...
* commit '1c8135adba37ac09fe661180237df446611daa4b':
Update docs for multi-user storage behavior.
2012-10-23 09:10:43 -07:00
Jeff Sharkey
1c8135adba
Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
2012-10-23 09:08:42 -07:00
Daniel Sandler
ae760c46ac
am 6499b21d: am 57e71ebb: am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
...
* commit '6499b21d83314f7a0f9c2e5180fd50726432ea87':
Reset ExpandHelper when the panel is collapsed.
2012-10-23 08:42:21 -07:00
Daniel Sandler
6499b21d83
am 57e71ebb: am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
...
* commit '57e71ebba14068ff7e39b20d9a4f25f40bd57f26':
Reset ExpandHelper when the panel is collapsed.
2012-10-23 08:40:10 -07:00
Daniel Sandler
57e71ebba1
am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
...
* commit '0058f4ed50e5b4bfc8361c18b87115160d7132bb':
Reset ExpandHelper when the panel is collapsed.
2012-10-23 08:37:09 -07:00
Daniel Sandler
0058f4ed50
Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
2012-10-23 08:34:57 -07:00
Daniel Sandler
ac47ff70c3
Reset ExpandHelper when the panel is collapsed.
...
Fixes a rather unpleasant bug in which the ExpandHelper
could get locked in "expanding" mode if the panel was closed
(for example, with the back button) while you were in the
middle of an expand gesture. In this situation ExpandHelper
would hungrily eat all future touch events destined for the
notification panel, making it impossible to click or even
clear any notifications.
Bug: 7330828
Change-Id: I9c493db5e8fd8ef1aca53f77820780d60fa4e5a7
2012-10-23 10:41:44 -04:00