Craig Mautner
9cf13e5beb
am aa2804aa: am e13ae648: Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
...
* commit 'aa2804aa2bf1a2c89af947501549361945ffac3f':
Use parent window to evaluate show-to-all-users.
2012-10-16 19:04:04 -07:00
Craig Mautner
aa2804aa2b
am e13ae648: Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
...
* commit 'e13ae648504661ca158d15aa415568e351b380c4':
Use parent window to evaluate show-to-all-users.
2012-10-16 19:01:35 -07:00
Jim Miller
dcf59629be
This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
...
Revert "Revert "Revert "Fix for bug 6050753."""
This reverts commit 6868d6f349610c15256471cc3d5fa708cbfd5f1d
Change-Id: I8843d92dba14c82f06d9ee59517cf11b2abbbf04
2012-10-16 19:01:32 -07:00
Craig Mautner
e13ae64850
Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
2012-10-16 18:58:58 -07:00
Romain Guy
713e1bb9df
Add API to enable mipmaps on Bitmap
...
Bug #7353771
This API can be used when scaling large images down to a small size
to get nicer looking results.
Change-Id: If09087eed36077eee5355f6047a3ca67747d7d9e
2012-10-16 18:44:09 -07:00
Casey Burkhardt
0312d6d94a
More descriptive content description for quick settings toggle.
...
Bug: 7362316
Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf
2012-10-16 18:39:25 -07:00
Dianne Hackborn
bef0f617a0
Fix issue #7343719 : GlobalActions dialog (power off / airplane mode / sound off)
...
does not show if you press on power button when the "low battery" dialog is showing up
Always put the global actions dialog in the keyguard dialog layer (above
the keyguard). I don't see any reason to have it change layers based
on whether the keyguard is showing.
Change-Id: I1bd3600af9f115d662d2a4783f835e234db1b7f0
2012-10-16 18:34:48 -07:00
Svetoslav Ganov
72e3512960
Long press not working if explore by touch and magnification are on.
...
1. In the magnifier we are caching the touch events until we figure
out whether the user is triple tapping to enable magnification.
If the user is not trying to engage magnification we deliver the
stashed events. However, these events are stale and the subsequent
transformations such as the touch explorer get confused when trying
to detect a tap since the delay is longer than the tap slop.
This change compensates for the time the events were cached
before sending them to the next transformation in the chain.
bug:7362365
Change-Id: Idd8539ffed7ba4892c5a916bd34910fd2ef50f75
2012-10-16 18:26:57 -07:00
Irfan Sheriff
edba852930
Handle null BSSID
...
The root cause of why bssid needs investigation, but for now,
we can avoid crashing wifiwatchdog.
When bssid is null, just treat it as a good link.
Bug: 7357232
Change-Id: I080dfc990f3412646976cdc6ef75112ab093d326
2012-10-16 18:10:38 -07:00
Steven Ross
dd7203228a
am 80c0413a: am 9dff9125: am e4728b15: Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
...
* commit '80c0413af6fd1f51b370c193a9d7d79592c964c2':
Stopping Face Unlock immediately on detaching from window fixes 7338808
2012-10-16 17:53:04 -07:00
Steven Ross
80c0413af6
am 9dff9125: am e4728b15: Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
...
* commit '9dff9125074bfd1a4ead4ba995fd830b9a121263':
Stopping Face Unlock immediately on detaching from window fixes 7338808
2012-10-16 17:51:01 -07:00
Christopher Tate
7ca396f5f8
am 19f56158: am f0bba8a8: am 69b0c974: Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev
...
* commit '19f561580aecb927253bfdc37e96ba5aff7ef3cf':
Fix ApplicationInfo copy ctor
2012-10-16 17:49:19 -07:00
Steven Ross
9dff912507
am e4728b15: Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
...
* commit 'e4728b15cba1cebb8d9f60d146d95ff58a945ad8':
Stopping Face Unlock immediately on detaching from window fixes 7338808
2012-10-16 17:47:23 -07:00
Steven Ross
e4728b15cb
Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
2012-10-16 17:44:53 -07:00
Christopher Tate
19f561580a
am f0bba8a8: am 69b0c974: Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev
...
* commit 'f0bba8a8d0ace06f786bc0d78b0ed3ea3ae59814':
Fix ApplicationInfo copy ctor
2012-10-16 17:39:42 -07:00
Christopher Tate
f0bba8a8d0
am 69b0c974: Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev
...
* commit '69b0c974b5abb38a4443410cf09f7d5f28cf2c7f':
Fix ApplicationInfo copy ctor
2012-10-16 17:37:46 -07:00
Chet Haase
aa42c9af6e
Correctly adjust clip regions that lie offscreen
...
We were clamping the x/y location of the scissor to 0,0, but not adjusting
the width/height appropriately. This fix adjusts width/height and also clamps
them to 0 to correctly clip out offscreen operations.
Issue #7221524 Top left and top right portions of the screen blanks out after some time
Change-Id: I47f23336ea612409ed86652b9a68e272819ef00e
2012-10-16 17:36:16 -07:00
Jim Miller
6fa7bcfc36
am 366a6f2b: am ac8b732e: am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
...
* commit '366a6f2bf3be44013f1bcd5ad3c3bd4ffe562616':
Fix missing layout parameters in keyguard.
2012-10-16 17:36:06 -07:00
Laurent Tu
37882dbecc
am 9bebd2a4: am 130ba7da: am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
...
* commit '9bebd2a438f0ee0c53b41c83746637a8fd28223b':
Handle unknown case in LocationManager.getProvider
2012-10-16 17:36:02 -07:00
Christopher Tate
69b0c974b5
Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev
2012-10-16 17:33:55 -07:00
Jim Miller
366a6f2bf3
am ac8b732e: am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
...
* commit 'ac8b732e37ab68046c46b48302663e00a8dcb334':
Fix missing layout parameters in keyguard.
2012-10-16 17:33:23 -07:00
Laurent Tu
9bebd2a438
am 130ba7da: am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
...
* commit '130ba7dae85afc46e0066114a33acba5eee7530c':
Handle unknown case in LocationManager.getProvider
2012-10-16 17:33:16 -07:00
Jeff Brown
d8fad129ee
am 63241c51: am 5d32cba6: am 645b05a6: Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
...
* commit '63241c51b7374b31dec94c35df54c5164e3b74a0':
Blank all displays including Wifi Display when screen is off.
2012-10-16 17:31:54 -07:00
Jim Miller
ac8b732e37
am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
...
* commit '48994ce9451cccb9ee6a6a27c18dbaaddffca452':
Fix missing layout parameters in keyguard.
2012-10-16 17:30:46 -07:00
Laurent Tu
130ba7dae8
am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
...
* commit 'de5c3a04517bba3adacd8c6eb2b365cf93c73a69':
Handle unknown case in LocationManager.getProvider
2012-10-16 17:30:43 -07:00
Daniel Sandler
07a88c2702
am c7edbf4d: am 2b7ed31f: am fe3376b4: Fix NPE in quick settings tiles.
...
* commit 'c7edbf4d66b177c0ab1447e96e2fad1d49c5d0ed':
Fix NPE in quick settings tiles.
2012-10-16 17:29:52 -07:00
Jim Miller
48994ce945
Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
2012-10-16 17:28:08 -07:00
Jeff Brown
63241c51b7
am 5d32cba6: am 645b05a6: Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
...
* commit '5d32cba6e42c9b7b1ce61e5ea4f6a2940347efdd':
Blank all displays including Wifi Display when screen is off.
2012-10-16 17:27:45 -07:00
Laurent Tu
de5c3a0451
Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
2012-10-16 17:27:09 -07:00
Daniel Sandler
c7edbf4d66
am 2b7ed31f: am fe3376b4: Fix NPE in quick settings tiles.
...
* commit '2b7ed31f8b851a588db7c9acdae8a60b35940fe3':
Fix NPE in quick settings tiles.
2012-10-16 17:26:02 -07:00
Jeff Brown
5d32cba6e4
am 645b05a6: Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
...
* commit '645b05a6e47ee7052b12a8b4e916d311f4e59e99':
Blank all displays including Wifi Display when screen is off.
2012-10-16 17:25:21 -07:00
Daniel Sandler
2b7ed31f8b
am fe3376b4: Fix NPE in quick settings tiles.
...
* commit 'fe3376b41aa48b6894afad9b977170bc658a6ac1':
Fix NPE in quick settings tiles.
2012-10-16 17:23:32 -07:00
Jeff Brown
645b05a6e4
Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
2012-10-16 17:22:40 -07:00
Christopher Tate
bcb0255770
Fix ApplicationInfo copy ctor
...
Need to copy ALL the fields!
Bug 7360899
Change-Id: Ie6ed2d6f41c2efaf793ebf111adc8fa5e8b57d7c
2012-10-16 17:14:34 -07:00
Daniel Sandler
fe3376b41a
Fix NPE in quick settings tiles.
...
Bug: 7360759
Change-Id: I5b000e063baa1b7e2dddaa25be5b9bcdafa1a974
2012-10-16 19:54:02 -04:00
Jeff Brown
8ec0943a79
Blank all displays including Wifi Display when screen is off.
...
Calling blank() on Surface Flinger to turn the screen off is not
enough to ensure that the content is blanked to all virtual displays.
What's more, the black surface left in place by the ElectronBeam may
not completely hide the content (particularly if the display orientation
changes). To fix this for real, we'll want to move the display power
management code from the power manager into the display manager
but we don't have time for that.
As a work around, force all displays to show an empty layer stack
with no surfaces on it while blanked.
Bug: 7311959
Change-Id: I870c985f9e76f3f2322e5d83cdbbed9ed15b9f10
2012-10-16 16:19:23 -07:00
Craig Mautner
341220fd09
Use parent window to evaluate show-to-all-users.
...
When a window is attached to another window use the parent window's
attributes to determine whether the child window should be shown
to all users.
Bug: 7328633 fixed.
Change-Id: I9601c149af87f624378e6895063bb3179d4f845e
2012-10-16 15:20:09 -07:00
Irfan Sheriff
748fef57c4
am dad4fb5d: am c741f5c1: am 983faeed: Merge "Fix NPE" into jb-mr1-dev
...
* commit 'dad4fb5de960a7059521d950a4f1a6d2920dff44':
Fix NPE
2012-10-16 15:11:51 -07:00
Irfan Sheriff
dad4fb5de9
am c741f5c1: am 983faeed: Merge "Fix NPE" into jb-mr1-dev
...
* commit 'c741f5c13d5976289289b65ce3c1e7b71be4c266':
Fix NPE
2012-10-16 15:09:13 -07:00
Irfan Sheriff
c741f5c13d
am 983faeed: Merge "Fix NPE" into jb-mr1-dev
...
* commit '983faeed0b8090e12d10a31624e1cf09ff30c20c':
Fix NPE
2012-10-16 15:06:33 -07:00
Irfan Sheriff
983faeed0b
Merge "Fix NPE" into jb-mr1-dev
2012-10-16 15:03:27 -07:00
Raph Levien
886d159aa8
am 17732ff1: am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
...
* commit '17732ff107706d1e816d45307594e8b73f8bb01b':
Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:52:03 -07:00
Raph Levien
17732ff107
am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
...
* commit '142155b5cec5dfbde4a875828505cd1434df0d2b':
Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:49:29 -07:00
Raph Levien
142155b5ce
am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
...
* commit '3377b404b82403c4c137c699088eb09c4b806dba':
Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:46:41 -07:00
Raph Levien
3377b404b8
Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
2012-10-16 14:44:18 -07:00
Svetoslav Ganov
88939e5c84
am c53fee3b: am 5ac909f9: am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
...
* commit 'c53fee3b435f8e84b4608ee4eac5c536210c5c20':
Occasionally triple tap on the keyboard toggles screen magnification.
2012-10-16 14:41:13 -07:00
Chet Haase
ffe661c5d3
am 4b0e8734: am cb6f35f9: am 8db45f0b: Merge "Avoid redundant wallpaper loading/drawing" into jb-mr1-dev
...
* commit '4b0e8734cce56a305e43bde95196a80a32d40027':
Avoid redundant wallpaper loading/drawing
2012-10-16 14:40:54 -07:00
Romain Guy
dbfb2727dd
am 9c198ecc: am 7b852ab3: am 5778cb9a: Merge "Always use the correct pixel store size Bug #7357394 " into jb-mr1-dev
...
* commit '9c198ecc2be5b7d1b8290a35aefa80f31ba8ed59':
Always use the correct pixel store size Bug #7357394
2012-10-16 14:40:50 -07:00
Raph Levien
8b17969c64
Fix for bug 7358703 Gmail ANR when trying to compose a message
...
When deferring scroll to a point, it's possible the text changed between
the time the scroll was requested to the time layout happens. In this
case, it attempts to scroll to a point past the end of the text buffer,
which created an infinite loop.
This patch clamps the scroll offset to the length of the text, so it
just scrolls to the end in that case, rather than crashing.
Change-Id: I53740d119d588560f5a4d9fb80e38f7057faab89
2012-10-16 14:32:47 -07:00
Svetoslav Ganov
c53fee3b43
am 5ac909f9: am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
...
* commit '5ac909f9e2ab42842c0697c9af31bd95bfc3cb68':
Occasionally triple tap on the keyboard toggles screen magnification.
2012-10-16 14:25:59 -07:00