Eino-Ville Talvala
001778393d
Merge "Add camera as an ATRACE tag"
2012-05-31 18:32:54 -07:00
Eino-Ville Talvala
9c0d9cf25f
Add camera as an ATRACE tag
...
Change-Id: I7b4fc51f8b0eb97190817f8cbc9f743b0d112922
2012-05-31 18:12:18 -07:00
Chris Craik
35ec6b7b30
am 7d4c2ec0: am 53913ed5: Merge "Force webview invalidates on unsuccessful functor attach" into jb-dev
...
* commit '7d4c2ec0f4dc1843ed5e3f6768d55cc9506052c6':
Force webview invalidates on unsuccessful functor attach
2012-05-31 18:06:13 -07:00
Dianne Hackborn
d2cf399e5d
am ce2907b1: am f0e96de8: Merge "Maybe fix #6584979 : Unable to launch share chooser activity from a Notification action" into jb-dev
...
* commit 'ce2907b1b6bf58cae681f1f009e4b308174c9a1e':
Maybe fix #6584979 : Unable to launch share chooser activity from a Notification action
2012-05-31 18:06:07 -07:00
Alice Yang
e56a8e7c7d
am 3fea6462: am be504401: Merge "Fix bug where existing account not pre-checked" into jb-dev
...
* commit '3fea64623bc52f01af451bae9d18129c327300c4':
Fix bug where existing account not pre-checked
2012-05-31 18:06:01 -07:00
Chris Craik
7d4c2ec0f4
am 53913ed5: Merge "Force webview invalidates on unsuccessful functor attach" into jb-dev
...
* commit '53913ed55ce2b5f0d2137b2a7b67eaf7556c0c28':
Force webview invalidates on unsuccessful functor attach
2012-05-31 18:00:46 -07:00
Chris Craik
53913ed55c
Merge "Force webview invalidates on unsuccessful functor attach" into jb-dev
2012-05-31 17:57:45 -07:00
Dianne Hackborn
ce2907b1b6
am f0e96de8: Merge "Maybe fix #6584979 : Unable to launch share chooser activity from a Notification action" into jb-dev
...
* commit 'f0e96de863a06bbee2aaf2aeb0f586e2a434aa62':
Maybe fix #6584979 : Unable to launch share chooser activity from a Notification action
2012-05-31 17:41:47 -07:00
Dianne Hackborn
f0e96de863
Merge "Maybe fix #6584979 : Unable to launch share chooser activity from a Notification action" into jb-dev
2012-05-31 17:38:42 -07:00
Chet Haase
486590963e
Skip eglSwapBuffers() call when we do not draw to GL
...
The fix is to track when we issue GL drawing commands, and to skip the
call to eglSwapBuffers() when a DisplayList does not result in
any actual rendering calls to GL.
Issue #6364143 QuickMuni list items and buttons flicker instead of fade
Change-Id: I60a02c61a58c32d92481a1e814b4c8a49c6a37a3
2012-05-31 17:22:27 -07:00
Alice Yang
3fea64623b
am be504401: Merge "Fix bug where existing account not pre-checked" into jb-dev
...
* commit 'be5044015212b82a6e530c4516004255fe245ebe':
Fix bug where existing account not pre-checked
2012-05-31 17:11:58 -07:00
Alice Yang
be50440152
Merge "Fix bug where existing account not pre-checked" into jb-dev
2012-05-31 17:09:25 -07:00
Andrew Flynn
0fa9d2d03f
Refresh signal cluster for airplane switch.
...
This fixes a bug where if Airplane mode on/off is the only icon
that is changing in the signal cluster (for example, someone on
a wifi-only device has wifi turned on in airplane mode, so wifi
icon is not changing), this will refresh the signal cluster.
Bug: 6531918
Change-Id: I7a440b84c9dfa0b300b81d14426b99fd48fad06c
2012-05-31 16:44:12 -07:00
Jeff Brown
80a1de1007
Use sp<LooperCallback> to fix race causing dangling pointer.
...
Bug: 6559630
Change-Id: I9b9c76577779841006f9c024a80685ba8b7cd0e1
2012-05-31 16:23:11 -07:00
Dianne Hackborn
a3a041d55b
Maybe fix #6584979 : Unable to launch share chooser activity from a Notification action
...
Don't count an activity as a system dialog to be closed, if it is the
one that asked to have system dialogs closed.
Change-Id: I60bb194adde78dc3ac0a4d9b0c1dfbabd105e594
2012-05-31 16:18:21 -07:00
Eric Fischer
f0336df5a7
am fdb26c1e: (-s ours) am 69a1f6e6: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'fdb26c1e853ba16af0794ced83463aa1744a8a99':
Import translations. DO NOT MERGE
2012-05-31 15:50:34 -07:00
Alice Yang
6cab5e823a
Fix bug where existing account not pre-checked
...
The fix was to call ListView.setItemChecked()
instead of ListView.setSelection() for setting radio button status.
Also refactored the code a bit so it's less verbose.
Bug 6588533
Change-Id: I8add072a0277183baec7c0d5634a28f2d3a28c5e
2012-05-31 15:48:51 -07:00
Eric Fischer
fdb26c1e85
am 69a1f6e6: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '69a1f6e6a1259d18848d2172b6407fb0fe6f5bc6':
Import translations. DO NOT MERGE
2012-05-31 15:45:07 -07:00
Craig Mautner
b138995f6c
am 41efed0e: am 35c60c94: Merge "Use Surface layer for Surface operation." into jb-dev
...
* commit '41efed0ecc07e1d79ee9112c8f64325fbceab44c':
Use Surface layer for Surface operation.
2012-05-31 15:43:52 -07:00
Eric Fischer
d477a1a403
Merge "Import translations. DO NOT MERGE"
2012-05-31 15:41:22 -07:00
Eric Fischer
69a1f6e6a1
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-31 15:41:07 -07:00
Craig Mautner
41efed0ecc
am 35c60c94: Merge "Use Surface layer for Surface operation." into jb-dev
...
* commit '35c60c944a9350d6240673e157fe06a97fb24180':
Use Surface layer for Surface operation.
2012-05-31 15:38:51 -07:00
Craig Mautner
35c60c944a
Merge "Use Surface layer for Surface operation." into jb-dev
2012-05-31 15:35:56 -07:00
Chris Craik
41ee465734
Force webview invalidates on unsuccessful functor attach
...
Functor attach should always be successful, but adding a fallback just in
case. Also invalidates the WebView on initial content arriving.
bug:6511995
Change-Id: Ibca16505afec9f693ea4a7cc4966cd6d7353725c
2012-05-31 15:23:11 -07:00
Craig Mautner
881656831c
Use Surface layer for Surface operation.
...
Previous fix exposed an existing bug where we were using mAnimLayer to
determine the highest Surface layer. This fix uses mSurfaceLayer to set
the layer limits for making the screenshot.
Fixes bug 6586168.
Change-Id: Iaa3b43867aef795ca617ff4b8076428dfc91eaf2
2012-05-31 14:25:31 -07:00
Jim Miller
ddf18061d7
am 359822c5: am 593b4446: Merge "Fix 6583164: Make navbar slippery when shade is open" into jb-dev
...
* commit '359822c586afb667b7ef51a2786cdd33bd4a3942':
Fix 6583164: Make navbar slippery when shade is open
2012-05-31 13:54:38 -07:00
Jim Miller
359822c586
am 593b4446: Merge "Fix 6583164: Make navbar slippery when shade is open" into jb-dev
...
* commit '593b4446fd5cac974b86988cbd03f5a8c1a4862d':
Fix 6583164: Make navbar slippery when shade is open
2012-05-31 13:50:35 -07:00
Jim Miller
593b4446fd
Merge "Fix 6583164: Make navbar slippery when shade is open" into jb-dev
2012-05-31 13:47:47 -07:00
Jim Miller
b490c3e64d
Fix 6583164: Make navbar slippery when shade is open
...
Change-Id: Ie7bc726dd292b8b363c155492fb620e49a123f05
2012-05-31 13:34:16 -07:00
Amith Yamasani
30e4e88c91
am 2afe8252: am 4a3a9685: Merge "Protect volumepanel slider creation from race condition." into jb-dev
...
* commit '2afe8252addcf080d4752e85f6d0f21c930fde7f':
Protect volumepanel slider creation from race condition.
2012-05-31 13:17:11 -07:00
Amith Yamasani
2afe8252ad
am 4a3a9685: Merge "Protect volumepanel slider creation from race condition." into jb-dev
...
* commit '4a3a9685d17cb29f70a7c56a3d33f2c8d5288e72':
Protect volumepanel slider creation from race condition.
2012-05-31 13:13:34 -07:00
Craig Mautner
225fef5e3e
am c3dfaf8d: am a13b4da6: Merge "Fix initial brightness state after startup." into jb-dev
...
* commit 'c3dfaf8d587d3ea4ffd62377ec6041ad70fc152a':
Fix initial brightness state after startup.
2012-05-31 13:13:23 -07:00
Craig Mautner
c3dfaf8d58
am a13b4da6: Merge "Fix initial brightness state after startup." into jb-dev
...
* commit 'a13b4da68d8df0977c8dec5001de7c9ecea71d9e':
Fix initial brightness state after startup.
2012-05-31 13:09:48 -07:00
Amith Yamasani
4a3a9685d1
Merge "Protect volumepanel slider creation from race condition." into jb-dev
2012-05-31 13:08:07 -07:00
Craig Mautner
a13b4da68d
Merge "Fix initial brightness state after startup." into jb-dev
2012-05-31 13:07:03 -07:00
Eric Fischer
061a0904a3
Import translations. DO NOT MERGE
...
Change-Id: I25d7b5a5a2140a371bd3a3e03ae157c8e1950f18
2012-05-31 12:57:56 -07:00
Eric Fischer
70a9975ab8
Import translations. DO NOT MERGE
...
Change-Id: Id25d07811a971bc2e52eaa9e755477114642af93
2012-05-31 12:52:04 -07:00
Irfan Sheriff
39150720c0
am 39b79e79: am ce9b5c76: Merge "Fix walled garden detection on nakasi" into jb-dev
...
* commit '39b79e79d3ad9e98a9c76c1b104599be494213f6':
Fix walled garden detection on nakasi
2012-05-31 11:35:31 -07:00
Irfan Sheriff
39b79e79d3
am ce9b5c76: Merge "Fix walled garden detection on nakasi" into jb-dev
...
* commit 'ce9b5c7611954fba91f4983bd41c0507b9931046':
Fix walled garden detection on nakasi
2012-05-31 11:30:46 -07:00
Irfan Sheriff
ce9b5c7611
Merge "Fix walled garden detection on nakasi" into jb-dev
2012-05-31 11:28:36 -07:00
Irfan Sheriff
ae094b2715
Fix walled garden detection on nakasi
...
Bug: 6576101
Change-Id: Iad2ea67e54662cd30a0e7425dab2a6174d13d152
2012-05-31 11:11:23 -07:00
Makoto Onuki
5d6c1e3dbf
am 46d12127: am bde32efa: Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev
...
* commit '46d1212704b962df06e0d150a3d81c2c95acd5f5':
Fix bug 6563184: API compatibility issue with quick contact
2012-05-31 11:05:09 -07:00
Makoto Onuki
46d1212704
am bde32efa: Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev
...
* commit 'bde32efa209acb47324add8981577af1fa410574':
Fix bug 6563184: API compatibility issue with quick contact
2012-05-31 11:01:24 -07:00
Makoto Onuki
bde32efa20
Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev
2012-05-31 10:58:58 -07:00
Philip Milne
0597161ee4
Merge "Fix for bug 6050753."
2012-05-31 10:30:09 -07:00
Craig Mautner
af01fe0215
Fix initial brightness state after startup.
...
Setting of mInitialAnimation member was assuming that currentValue
member would only be 0 at boot. It also gets set to 0 when the
sensor goes dark. This fix removes mInitialValue reliance on
currentValue.
Fixes bug 6444319.
Change-Id: I27069f1b44f1f727533d34bbecad2e5aeaa7aab8
2012-05-31 10:03:32 -07:00
Jean-Michel Trivi
2d8dab5a54
Handle wakelocks for device connection intents from AudioService
...
Now that AudioService handles the device connection intents itself,
those need to be sent under wakelock.
The wake lock is acquired when AudioService is notified of the
device connection, and released when the corresponding message
has been handled.
This change only covers the device connection messages, and doesn't
affect the handling of the other AudioService messages.
Bug 6485897
Change-Id: I2d35f5404f097b5adde8af21fd81347bdd5576a6
2012-05-31 08:58:01 -07:00
John Spurlock
b84814b279
am 60dbc3c0: am e857632a: Merge "Dock: Renable desk-dock apps" into jb-dev
...
* commit '60dbc3c05c644ae057c4946f1229387e60be8cb3':
Dock: Renable desk-dock apps
2012-05-31 08:53:10 -07:00
Uriel Rodriguez
0474853086
am 6e43ee67: (-s ours) am fa716c7b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
...
* commit '6e43ee6796795840819843e2693f6f3622638208':
BUG 5457035 : Anti-spoofing : DO NOT MERGE
2012-05-31 08:53:07 -07:00
John Spurlock
60dbc3c05c
am e857632a: Merge "Dock: Renable desk-dock apps" into jb-dev
...
* commit 'e857632abd994bd1e4a649afb4231f3a97763828':
Dock: Renable desk-dock apps
2012-05-31 08:49:24 -07:00