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
Svetoslav Ganov
78bd9835eb
Accessibility focus drawing does not take into account view's transformation matrix.
...
1. We are using the view drawing bounds but did not take into account the transformation
matrix. This leads to showing ugly artifacts on the launcher's hotseat which is
pretty much the first thing we see.
2. Updated the documentation of View.getDrawingRect to be more explicit that the
results does not have the transformation matrix applied.
bug:7354033
Change-Id: Ief2e0ea8da05471d71e215ce4497d94ff6e92d1a
2012-10-15 19:13:29 -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
Romain Guy
69fbc3c089
Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev
2012-10-15 18:45:03 -07:00
Romain Guy
edefaa25db
Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev
2012-10-15 18:43:59 -07:00
Romain Guy
dec26f2011
Merge "Add missing layout_width/height Bug #7334849 " into jb-mr1-dev
2012-10-15 18:43:12 -07:00
Jeff Brown
d56d67020b
am 0e082155: Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev
...
* commit '0e082155ef2d7390d7befc139a788d3def94fecc':
Stop dreaming if the battery not charging effectively.
2012-10-15 18:43:08 -07:00
Jeff Brown
6593105cbc
am 322de606: Merge "Cleanup some internal documentation." into jb-mr1-dev
...
* commit '322de606574f45d1a4335b515369ce27c74d2b6b':
Cleanup some internal documentation.
2012-10-15 18:43:04 -07:00
Jeff Brown
0e082155ef
Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev
2012-10-15 18:41:11 -07:00
Jeff Brown
322de60657
Merge "Cleanup some internal documentation." into jb-mr1-dev
2012-10-15 18:40:05 -07:00
Jim Miller
bb2a020181
am 33987528: Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev
...
* commit '339875283263dbbe3587388f94f603439e59af5f':
Fix inoperative "Forgot pattern" button when face unlock enabled
2012-10-15 18:39:19 -07:00
Jim Miller
3398752832
Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev
2012-10-15 18:37:00 -07:00
Jeff Sharkey
77ce60a593
am 7789c9bb: Merge "Support pm clear as --user." into jb-mr1-dev
...
* commit '7789c9bbfca079655e9285173d6175b94bc774b0':
Support pm clear as --user.
2012-10-15 18:29:51 -07:00
Raph Levien
b9e224ccb5
am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
...
* commit '6f8c1bad8a7891f50eda2d3d14f774e28b8f8107':
Fix for bug 7344916 text view flickers when you hit enter
2012-10-15 18:25:13 -07:00
Jeff Sharkey
7789c9bbfc
Merge "Support pm clear as --user." into jb-mr1-dev
2012-10-15 18:24:34 -07:00
Raph Levien
6f8c1bad8a
Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
2012-10-15 18:19:50 -07:00
Jim Miller
63f9b81795
Fix inoperative "Forgot pattern" button when face unlock enabled
...
This fixes a bug where the forgot pattern button wasn't working because
the logic for face unlock was interfering with determining the proper
backup to use.
The fix:
- adds a new state to SecurityMode so we have an initial condition
we can check for.
- passes the current mode to SecurityModel.getBackupSecurityMode() so
it relies on the current state.
- prevents face unlock from invoking callbacks that change state
once we're no longer showing face unlock.
Fixes bug 7346989
Change-Id: I4e64515efbbad712f11c820e690b458f352bf46c
2012-10-15 18:16:24 -07:00
Romain Guy
8efca54693
Ensure we always request conformant OpenGL ES 2.0 contexts
...
Change-Id: I6b9d6f2dace02ad28baef6811007302b8e552a54
2012-10-15 18:09:49 -07:00
Justin Ho
04fe8723e4
Update alarm sounds and tune some ringtones
...
Bug: 7351672
Bug: 5502770
Bug: 7312457
Change-Id: Icb89cdbadc0e06b4a845b1cad16560f66d5b2bdd
2012-10-15 17:40:57 -07:00
Jeff Brown
4eaba60fff
am df409231: Merge "Update wifi display device name when renamed." into jb-mr1-dev
...
* commit 'df409231a75c8b2ae976af66c0baec99b280aa33':
Update wifi display device name when renamed.
2012-10-15 17:23:39 -07:00
Raph Levien
f5c1a8798f
Fix for bug 7344916 text view flickers when you hit enter
...
The flickering was caused by trying to scroll to the cursor position
while the view was in an inconsistent state (text updated to change the
number of lines, but layout not done yet). This patch defers the actual
setting of the cursor until layout is done, when layout is pending.
Change-Id: I8ed3a402beb8058ac7a7f3935afeb946a23308ab
2012-10-15 17:22:26 -07:00
Jeff Brown
df409231a7
Merge "Update wifi display device name when renamed." into jb-mr1-dev
2012-10-15 17:21:20 -07:00
Svetoslav Ganov
4a533efae3
am 25160a6f: Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev
...
* commit '25160a6f35b2cf487be2b8cea8b87b750f0c1c97':
Announce changes to the keyguard security message for accessibility.
2012-10-15 17:17:50 -07:00
Svetoslav Ganov
25160a6f35
Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev
2012-10-15 17:15:44 -07:00
Amith Yamasani
756901d82b
Do cleanup when Stopping users
...
Mark user 0 as initialized, otherwise it will show up as
uninitialized when viewed from secondary user if never switched to user 0.
Bug: 7301595
Also clean up any users that were in the process of being removed, if device
crashes at a bad time.
Change-Id: Ic16a6c9ccb6a64b7463725f6cc279335a821fcd5
2012-10-15 16:57:26 -07:00
Jeff Brown
016ff14f12
Stop dreaming if the battery not charging effectively.
...
If the user activity timeout expired and the battery appears
to be draining faster than it is charging then stop dreaming
and go to sleep.
Bug: 7312455
Change-Id: I1b9d89e5b2647c72c455d2792e3778a2fe6a4e34
2012-10-15 16:56:20 -07:00
Romain Guy
42b0c70a31
Add missing layout_width/height
...
Bug #7334849
Change-Id: Ie4bbe5905bec1d410b8b51e0194bb1c8c2b84680
2012-10-15 16:47:16 -07:00