Marco Nelissen
c861411d4b
Bypass emulated storage for metadata extraction
...
b/6543148
Change-Id: Ic65957870199a2592ebe53b32517166f96e48ef2
2012-06-08 14:22:56 -07:00
Martijn Coenen
218eb9c03b
am 57486f95: am fefd4896: Merge "Small NFC API docs addition." into jb-dev
...
* commit '57486f9535ed3100a9b694e651ffe44ba0028544':
Small NFC API docs addition.
2012-06-07 10:41:15 -07:00
Martijn Coenen
57486f9535
am fefd4896: Merge "Small NFC API docs addition." into jb-dev
...
* commit 'fefd48965c5f521f21c10aad86586cf68ae48f71':
Small NFC API docs addition.
2012-06-07 10:37:24 -07:00
Martijn Coenen
fefd48965c
Merge "Small NFC API docs addition." into jb-dev
2012-06-07 10:35:15 -07:00
Chris Wren
600f5005fb
am af56345c: am 059537e7: Merge "Back from the dead: Carrier name, background dimming." into jb-dev
...
* commit 'af56345cf844c266ac9b4296173f4173246185e7':
Back from the dead: Carrier name, background dimming.
2012-06-07 09:55:25 -07:00
Chris Wren
a6b45df7b9
am 77b924e5: am 8a718889: Merge "Fix notification icon fading." into jb-dev
...
* commit '77b924e5f9f8a0ac05a23b4db7798f4e8d2005eb':
Fix notification icon fading.
2012-06-07 09:55:21 -07:00
Chet Haase
89b8838496
am ca43c961: am 44b2fe3f: Track canvas clearing for swap buffers logic.
...
* commit 'ca43c96127e9f7cdab8ee70638a2445347eebd08':
Track canvas clearing for swap buffers logic.
2012-06-07 09:51:07 -07:00
Chris Wren
af56345cf8
am 059537e7: Merge "Back from the dead: Carrier name, background dimming." into jb-dev
...
* commit '059537e7924a5547849b537bf0e50d2f814b80a5':
Back from the dead: Carrier name, background dimming.
2012-06-07 09:49:56 -07:00
Chris Wren
77b924e5f9
am 8a718889: Merge "Fix notification icon fading." into jb-dev
...
* commit '8a71888975aba851edc8916b189f4c73daa1926b':
Fix notification icon fading.
2012-06-07 09:49:53 -07:00
Chet Haase
ca43c96127
am 44b2fe3f: Track canvas clearing for swap buffers logic.
...
* commit '44b2fe3fc114ee5f7273c6b0fee2cc999bf244a2':
Track canvas clearing for swap buffers logic.
2012-06-07 09:45:16 -07:00
Chris Wren
059537e792
Merge "Back from the dead: Carrier name, background dimming." into jb-dev
2012-06-07 09:44:54 -07:00
Chris Wren
8a71888975
Merge "Fix notification icon fading." into jb-dev
2012-06-07 09:44:34 -07:00
Victoria Lease
29b9885c25
Merge "Fix hardcoded font path. Allow adding new font path thru Skia changes. Bug: 6609231"
2012-06-07 08:33:15 -07:00
The Android Open Source Project
e17200a5d7
am 7c5c86d7: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '7c5c86d7624646554156339b5f48e110fc53d8ed':
Always queue A2DP connection state message with wakelock held
Adding more logging for bug: 6499508
Fix bug 6558006: SystemUI native heap is huge. Fix memory leak
Fix build.
Revert "Make the protectionLevel of framework permissions consistent and related to sensitive user data. Dangerous permissions are applied only where sensitive user data may be exposed."
Survey says: NIET!
Fix 6580421: make sure MultiWaveView.reset() makes handle visible
Fix issue #6579824 : Email crash observed after updating...
Fix 6398209: SearchPanel gesture improvements
2012-06-07 07:55:38 -07:00
The Android Open Source Project
7c5c86d762
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Ibd5be536b10a8df19d365da267d2ad46b84dc14c
2012-06-07 07:49:05 -07:00
The Android Automerger
8e2eaea676
merge in jb-release history after reset to jb-dev
2012-06-07 07:02:42 -07:00
Chet Haase
44b2fe3fc1
Track canvas clearing for swap buffers logic.
...
A previous fix made it necessary for a frame to render something to GL
in order to cause a call to eglSwapBuffers(). Besides the calls being
tracked as part of issuing a DisplayList, there is also a potential call
to clear the canvas (via glClear()) on non-opaque surfaces. This call is also
good to track, since a surface that gets cleared without any other drawing operations
is worth flipping to the screen (to erase old contents on that surface).
This fix tracks the status of the pre-draw operations to find out whether
glClear() was called and then sets the drawing status appropriately.
Issue #6606422 QuickContact dismissal is janky again (Tracking)
Change-Id: I5fcaccfdc9293dd46b83f2fc279730a5d2740ebf
2012-06-07 06:25:04 -07:00
Daniel Sandler
67e7d90376
Fix notification icon fading.
...
Bug: 6581738
Change-Id: I547cae03533d9a9e6cf1d15e4b47845f61eee072
2012-06-07 01:23:12 -04:00
Daniel Sandler
3d32a24adf
Back from the dead: Carrier name, background dimming.
...
Unlike previous versions of Android, we now show the current
wifi SSID in the carrier label if connected to wifi.
Bug: 6612419
Bug: 6620626
Change-Id: Ifb5ba8efe6dd387e960efc6a9b1da69a08e97d96
2012-06-07 01:10:11 -04:00
Fabrice Di Meglio
e4beeb8e3c
Merge "Make Spinner widget aware of layout direction"
2012-06-06 18:27:35 -07:00
Fabrice Di Meglio
38d64c5a95
Make Spinner widget aware of layout direction
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I6ebeee67e3e34271897e14f73b7364b1ae83145a
2012-06-06 18:19:51 -07:00
Christian Robertson
5f85a76e87
am 5cb84d2b: am 43fa4c52: Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev
...
* commit '5cb84d2b1d7c89f7b1bdd42f94328bbd89a9d7ce':
New mouse pointer arrow with high res versions. Bug: 6579869
2012-06-06 18:02:45 -07:00
Christian Robertson
5cb84d2b1d
am 43fa4c52: Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev
...
* commit '43fa4c5261a732decae3bbfaea2a00f8bb9b709c':
New mouse pointer arrow with high res versions. Bug: 6579869
2012-06-06 17:58:55 -07:00
Christian Robertson
43fa4c5261
Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev
2012-06-06 17:56:36 -07:00
Martijn Coenen
3b6ecf0ec1
Small NFC API docs addition.
...
Indicate that if the device does not support Bluetooth or WiFI,
calling the API is a no-op.
Bug: 6620788
Change-Id: Ib261e0e7855d0914e97803b3b808015b72f3a186
2012-06-06 17:05:37 -07:00
Chris Craik
d2ce0bc723
am 0df6d579: am 37e0c368: Merge "Revert "Add temporary functor detach logging"" into jb-dev
...
* commit '0df6d579dbe509c2d520c6f163ff2bafbd801208':
Revert "Add temporary functor detach logging"
2012-06-06 17:05:13 -07:00
Chris Craik
0df6d579db
am 37e0c368: Merge "Revert "Add temporary functor detach logging"" into jb-dev
...
* commit '37e0c3681ef403e5a43a4f3dbca954ec8a4bfb5d':
Revert "Add temporary functor detach logging"
2012-06-06 17:01:27 -07:00
Chris Craik
37e0c3681e
Merge "Revert "Add temporary functor detach logging"" into jb-dev
2012-06-06 16:59:01 -07:00
Chris Craik
4e772cb938
am 6d99a024: am 8f1f714f: Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev
...
* commit '6d99a024647ff845179311d611dcf031965ba96d':
Revert "Add more temporary logging for investigating detachFunctor"
2012-06-06 16:52:16 -07:00
Chris Craik
6d99a02464
am 8f1f714f: Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev
...
* commit '8f1f714f831bf8bf10f94211c42e36ef2851810d':
Revert "Add more temporary logging for investigating detachFunctor"
2012-06-06 16:47:57 -07:00
Chris Craik
aa3b7d88ef
Revert "Add temporary functor detach logging"
...
bug:6608646
This reverts commit f98851ab37c07b243c485168cca201b07a22e6c7
2012-06-06 16:45:53 -07:00
Chris Craik
8f1f714f83
Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev
2012-06-06 16:45:04 -07:00
Keun young Park
7c8db6dda8
am 310c067e: am b0de6224: Merge "add MINIMAL_FONT_FOOTPRINT configuration for PDK" into jb-dev
...
* commit '310c067e234c7dfdf5e78b7fd3702ed753170fb2':
add MINIMAL_FONT_FOOTPRINT configuration for PDK
2012-06-06 16:36:48 -07:00
George Mount
6b1e614f70
Merge "Fix scrolling behavior for text input and textarea."
2012-06-06 16:32:40 -07:00
Keun young Park
310c067e23
am b0de6224: Merge "add MINIMAL_FONT_FOOTPRINT configuration for PDK" into jb-dev
...
* commit 'b0de6224fcd31ba088bd828819d181629ea9adf9':
add MINIMAL_FONT_FOOTPRINT configuration for PDK
2012-06-06 16:26:51 -07:00
Keun young Park
b0de6224fc
Merge "add MINIMAL_FONT_FOOTPRINT configuration for PDK" into jb-dev
2012-06-06 16:24:25 -07:00
Jean-Michel Trivi
567f0e22a9
Always queue A2DP connection state message with wakelock held
...
Messages for changes to A2DP connection state are intended to be
queued in AudioService after acquiring a wake lock, which is
released after the message has been handled.
This was correctly done for connection messages when the system
is up and running, but wasn't when the BluetoothProfile service
listener gets an onServiceConnected() event, which is the case
the the device boots.
This change correctly uses the queueMsgUnderWakeLock() method
whenever a MSG_SET_A2DP_CONNECTION_STATE is to be sent.
Bug 6616292
Change-Id: Ie337a4641a89c522e2d233bccaac4e08ce324117
2012-06-06 16:13:15 -07:00
Irfan Sheriff
4d7d5268ba
am 2654105b: am ca96a322: Merge "Update group capability before connect" into jb-dev
...
* commit '2654105b15d8da5ad4fd84eef7e2c3f662373283':
Update group capability before connect
2012-06-06 15:59:15 -07:00
Fabrice Di Meglio
a26ddfacd7
Merge "Remove dead code in Switch"
2012-06-06 15:56:36 -07:00
Irfan Sheriff
2654105b15
am ca96a322: Merge "Update group capability before connect" into jb-dev
...
* commit 'ca96a322f0485db9f0beed243e10a607c909729f':
Update group capability before connect
2012-06-06 15:51:23 -07:00
Marco Nelissen
a061ef6c5f
am f9800a01: am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev
...
* commit 'f9800a01fe3690bac64bff0ba734a39f8a7f8ada':
Ensure we compute display name when needed
2012-06-06 15:51:19 -07:00
Marco Nelissen
f9800a01fe
am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev
...
* commit '08b3090848ad211e043a561b6bb774adf3a7bba1':
Ensure we compute display name when needed
2012-06-06 15:47:28 -07:00
Irfan Sheriff
ca96a322f0
Merge "Update group capability before connect" into jb-dev
2012-06-06 15:45:41 -07:00
Marco Nelissen
08b3090848
Merge "Ensure we compute display name when needed" into jb-dev
2012-06-06 15:44:20 -07:00
Craig Mautner
409a1a5402
am fd62576f: am a9144ffd: Merge "Disable automatic screen dimming." into jb-dev
...
* commit 'fd62576f06c05d6aab687892b9fcccfed3899021':
Disable automatic screen dimming.
2012-06-06 15:32:36 -07:00
Craig Mautner
fd62576f06
am a9144ffd: Merge "Disable automatic screen dimming." into jb-dev
...
* commit 'a9144ffd6466a914a9138dabab8bc331fdc70e2f':
Disable automatic screen dimming.
2012-06-06 15:28:37 -07:00
Craig Mautner
a9144ffd64
Merge "Disable automatic screen dimming." into jb-dev
2012-06-06 15:24:36 -07:00
Dianne Hackborn
b51e5bd666
am ecc42f8b: am 4ca17df3: Fix build.
...
* commit 'ecc42f8bdcd7279c6804bda3b4feeaea51019d48':
Fix build.
2012-06-06 15:15:24 -07:00
Dianne Hackborn
ecc42f8bdc
am 4ca17df3: Fix build.
...
* commit '4ca17df3802cad87a4d07b804823ad9c11e090ea':
Fix build.
2012-06-06 15:10:33 -07:00
Dianne Hackborn
4ca17df380
Fix build.
...
Change-Id: I42c3f6466d926258bbd303f2082de7207734451a
2012-06-06 15:02:25 -07:00