Justin Ho
34dc17f3d4
am 4cfcfd53: am 0fcc2977: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
...
* commit '4cfcfd53fbe1764dd284c308b9f15373d1d1cd30':
Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
2012-10-16 09:17:15 -07:00
Baligh Uddin
d1a04cb567
am c8e2b336: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'c8e2b336cf90cbd29c4348f539ff4af8e23af1e5':
Import translations. DO NOT MERGE
2012-10-16 09:17:11 -07:00
Justin Ho
4cfcfd53fb
am 0fcc2977: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
...
* commit '0fcc2977d08065eec0cd5c716718741dd1ecdfa0':
Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
2012-10-16 09:15:40 -07:00
Justin Ho
fd4ef4b159
am d2c9dcf7: am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev
...
* commit 'd2c9dcf75e14dc4eb18507ccfd956f2dc9312f25':
Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
2012-10-16 09:14:23 -07:00
Baligh Uddin
b6b1f62a42
am 10a77aa5: am 75e861b6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '10a77aa56ffa0257ddd19b0094e67be724db4c83':
Import translations. DO NOT MERGE
2012-10-16 09:14:20 -07:00
Baligh Uddin
a6966d56a8
am e485dc7e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'e485dc7e5f687dc97e2b53bf9a4a40737423ce7d':
Import translations. DO NOT MERGE
2012-10-16 09:14:19 -07:00
Baligh Uddin
c8e2b336cf
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 09:14:05 -07:00
Justin Ho
0fcc2977d0
Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
2012-10-16 09:13:48 -07:00
Justin Ho
5d7c089cab
Update alarm sounds and tune some ringtones
...
Bug: 7351672
Bug: 5502770
Bug: 7312457
Change-Id: Iea0d674431b0fabbf7e9c4b30d9f08a6235cdc64
2012-10-16 09:12:19 -07:00
Justin Ho
d2c9dcf75e
am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev
...
* commit '4add743111cfd558c7b1c95b0b58b90a53e7556a':
Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
2012-10-16 09:11:57 -07:00
Baligh Uddin
10a77aa56f
am 75e861b6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '75e861b689ef8d099250f4dd558cdc1dfc3a7c1f':
Import translations. DO NOT MERGE
2012-10-16 09:11:53 -07:00
Justin Ho
4add743111
Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev
2012-10-16 09:08:22 -07:00
Baligh Uddin
75e861b689
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 09:08:22 -07:00
Justin Ho
c1188696b6
Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
...
This reverts commit 04fe8723e48644bf5e1afc098f2117cbec6ba68d
Change-Id: I28ed23ad75ced96b66cc4dcce0faaf667c2d5d08
2012-10-16 09:07:39 -07:00
Baligh Uddin
e485dc7e5f
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 09:06:20 -07:00
Justin Ho
0d5bd80451
am aa1805de: am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
...
* commit 'aa1805deeae6df16796d44d318bde8c612e56d13':
Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
2012-10-16 08:58:22 -07:00
Justin Ho
aa1805deea
am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
...
* commit '08876d19923e04f1a654264a075f87ff73334469':
Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
2012-10-16 08:55:22 -07:00
Justin Ho
08876d1992
Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
2012-10-16 08:51:40 -07:00
Daniel Sandler
1097addfd4
am 6d8b8e06: am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev
...
* commit '6d8b8e06cd7f55483525727e156bed1fb7060478':
Flipping quick settings!
2012-10-16 07:48:06 -07:00
Daniel Sandler
6d8b8e06cd
am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev
...
* commit '18ea8f29909e7e80a8c5dc63b86678d89b7e5664':
Flipping quick settings!
2012-10-16 07:45:39 -07:00
Daniel Sandler
18ea8f2990
Merge "Flipping quick settings!" into jb-mr1-dev
2012-10-16 07:42:48 -07:00
Daniel Sandler
101784e560
Flipping quick settings!
...
Bug: 7348917 ╰(°□°╰)
Change-Id: I16923d6d920913a4bd0d78666587ac579ac18da5
2012-10-16 02:34:09 -04:00
Daniel Sandler
d0dee22255
am 36074eec: am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev
...
* commit '36074eecccaaa52e535513829b9de13ac3930347':
Allow any user to clear a notification targeted at USER_ALL.
2012-10-15 22:28:24 -07:00
Daniel Sandler
36074eeccc
am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev
...
* commit '1f0752993ffd4339cdf0e7d69b96093503bd2e24':
Allow any user to clear a notification targeted at USER_ALL.
2012-10-15 22:25:20 -07:00
Daniel Sandler
1f0752993f
Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev
2012-10-15 22:23:29 -07:00
Craig Mautner
6404f11bd6
am 9018c0a9: am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev
...
* commit '9018c0a96fa9d3e422fdef630be481d8ba96298a':
Always layout Keyguard on config change.
2012-10-15 22:11:12 -07:00
Craig Mautner
9018c0a96f
am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev
...
* commit 'f6dbd61b108e586c1db3e61cbfc07d4d750027c0':
Always layout Keyguard on config change.
2012-10-15 22:09:05 -07:00
Craig Mautner
f6dbd61b10
Merge "Always layout Keyguard on config change." into jb-mr1-dev
2012-10-15 22:05:55 -07:00
Mathias Agopian
1167b7b9e4
am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753.""
...
* commit 'dcfe6ceef05c1566a8fc80b758b830c39df01bbd':
Revert "Revert "Fix for bug 6050753.""
2012-10-15 20:51:00 -07:00
Mathias Agopian
dcfe6ceef0
am 6868d6f3: Revert "Revert "Fix for bug 6050753.""
...
* commit '6868d6f349610c15256471cc3d5fa708cbfd5f1d':
Revert "Revert "Fix for bug 6050753.""
2012-10-15 20:47:56 -07:00
Mathias Agopian
6868d6f349
Revert "Revert "Fix for bug 6050753.""
...
Emergency revert -- fix reboot loop.
This reverts commit 8e63bcc63fd002231f8391af8982eeb235d096c8.
Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
2012-10-15 20:45:01 -07:00
Jamie Gennis
b312f1155c
am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev
...
* commit '38041d6b3c3d838d99f70f9b1195d69487edf689':
Flag window animation transactions as animations.
2012-10-15 20:19:40 -07:00
Romain Guy
3e6c9ba677
am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev
...
* commit 'cb09dba0b80ff51e0a481959c5f0056f7a292ea7':
Revert "Fix for bug 6050753."
2012-10-15 20:19:28 -07:00
Romain Guy
e9d0c9920b
am 8ab33df5: am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev
...
* commit '8ab33df56b1c22b7557f7dbe2d0b1f07d8ee1e47':
Ensure we always request conformant OpenGL ES 2.0 contexts
2012-10-15 20:19:24 -07:00
Romain Guy
da7da3fb85
am 4feddb27: am dec26f20: Merge "Add missing layout_width/height Bug #7334849 " into jb-mr1-dev
...
* commit '4feddb27ef51201c35a20d12d8bf0a7cbb50636e':
Add missing layout_width/height Bug #7334849
2012-10-15 20:19:21 -07:00
Jeff Brown
19e2d23cf4
am d56d6702: am 0e082155: Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev
...
* commit 'd56d67020b149558a9dc4ec9db1278f5c60bc946':
Stop dreaming if the battery not charging effectively.
2012-10-15 20:19:17 -07:00
Jeff Brown
09b37314b6
am 6593105c: am 322de606: Merge "Cleanup some internal documentation." into jb-mr1-dev
...
* commit '6593105cbcfeb1aa8379861ad35e2e7ff96b29f8':
Cleanup some internal documentation.
2012-10-15 20:19:12 -07:00
Jim Miller
a2afdfaecc
am bb2a0201: am 33987528: Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev
...
* commit 'bb2a020181d60e4ee6ecfc6169a6ad0320e3287c':
Fix inoperative "Forgot pattern" button when face unlock enabled
2012-10-15 20:19:09 -07:00
Jeff Sharkey
a1fda2e388
am 77ce60a5: am 7789c9bb: Merge "Support pm clear as --user." into jb-mr1-dev
...
* commit '77ce60a59330d6059011d737142bd210db845d85':
Support pm clear as --user.
2012-10-15 20:19:04 -07:00
Raph Levien
244f5125ab
am b9e224cc: am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
...
* commit 'b9e224ccb5604032ee6a11789b4e03c747a15838':
Fix for bug 7344916 text view flickers when you hit enter
2012-10-15 20:18:59 -07:00
Jeff Brown
006f6dfc4c
am 4eaba60f: am df409231: Merge "Update wifi display device name when renamed." into jb-mr1-dev
...
* commit '4eaba60fff4a91cc883b27cfcfb9b241ddee218f':
Update wifi display device name when renamed.
2012-10-15 20:18:47 -07:00
Svetoslav Ganov
0b450a749b
am 4a533efa: am 25160a6f: Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev
...
* commit '4a533efae304644f989058c6a4083ec41438f078':
Announce changes to the keyguard security message for accessibility.
2012-10-15 20:18:42 -07:00
Jean-Michel Trivi
1c9a33c178
am 6bf84616: am 256ab9e9: Merge "Use device availability to start WFD audio routing" into jb-mr1-dev
...
* commit '6bf846160c7123208a41130cdf89869a7d17c837':
Use device availability to start WFD audio routing
2012-10-15 20:18:02 -07:00
Chris Craik
4bc446dae2
am 779ba3ad: am 2aa50b6b: Merge "HW Acceleration support for stroked arcs with BUTT caps" into jb-mr1-dev
...
* commit '779ba3ad84db57b99bfb742517e3ba157f3f8c4c':
HW Acceleration support for stroked arcs with BUTT caps
2012-10-15 20:17:53 -07:00
Jamie Gennis
38041d6b3c
am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev
...
* commit '809bb404da66498f1723279542d2a7d1f4512052':
Flag window animation transactions as animations.
2012-10-15 19:54:18 -07:00
Jamie Gennis
809bb404da
Merge "Flag window animation transactions as animations." into jb-mr1-dev
2012-10-15 19:52:05 -07:00
Jamie Gennis
b6ce6e42cc
Flag window animation transactions as animations.
...
This change makes WindowManager use the new eAnimation flag when animating
windows. This prevents some of the window updates from being combined with
updates from prior animation frames.
Bug: 7353840
Change-Id: I5a9f8fa2c1a2f5f08363a45cd9f28bb97cd77080
2012-10-15 19:19:50 -07:00
Romain Guy
cb09dba0b8
am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev
...
* commit '69fbc3c089e3399ebd94cc3a7ba846f426a7b32d':
Revert "Fix for bug 6050753."
2012-10-15 18:47:46 -07:00
Romain Guy
8ab33df56b
am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev
...
* commit 'edefaa25db7c9cd4facab258a0fd5913c6493bd0':
Ensure we always request conformant OpenGL ES 2.0 contexts
2012-10-15 18:47:42 -07:00
Romain Guy
4feddb27ef
am dec26f20: Merge "Add missing layout_width/height Bug #7334849 " into jb-mr1-dev
...
* commit 'dec26f2011a136868aebf50646b3cf3d27080008':
Add missing layout_width/height Bug #7334849
2012-10-15 18:47:38 -07:00