Scott Main
f61b86a5f7
am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit '5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
docs: switch from caps to initial-case for device button names
2012-02-06 14:14:09 -08:00
Scott Main
435d5b6321
am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
2012-02-06 14:12:39 -08:00
Jean-Baptiste Queru
b16e23ba94
am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
...
* commit 'f79bcd2dd5d82376640661f50aa2e9237af7c02c':
Skia API changes as a result of an update to the Skia library.
2012-02-06 14:12:05 -08:00
Scott Main
f20d8ee17f
am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
2012-02-06 14:12:03 -08:00
Scott Main
3a00a8ad29
Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
2012-02-06 14:10:16 -08:00
Jean-Baptiste Queru
eb7e2d29de
am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
...
* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
Skia API changes as a result of an update to the Skia library.
2012-02-06 14:09:36 -08:00
Jean-Baptiste Queru
a6739d66f9
am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
...
* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
Skia API changes as a result of an update to the Skia library.
2012-02-06 14:07:31 -08:00
Jean-Baptiste Queru
6ce7188266
Merge "Skia API changes as a result of an update to the Skia library."
2012-02-06 14:01:06 -08:00
Scott Main
59015b369d
am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
...
* commit '6f2f42d52a23de0bd639d5e4957331118ccc47b8':
2012-02-06 13:09:08 -08:00
Scott Main
29a0fb12d8
am 584156ad: am 8e399408: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
...
* commit '584156ad29ec3b62a403ac692b16025c652b984c':
docs: add Sony USB VID issue 5967572
2012-02-06 13:09:06 -08:00
Scott Main
52d55d8847
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
2012-02-06 13:07:24 -08:00
Scott Main
9f36e61a79
am 8e399408: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
...
* commit '8e399408724f3d18d48d13194e05a80108216fed':
docs: add Sony USB VID issue 5967572
2012-02-06 13:07:21 -08:00
Scott Main
fa585608f4
am 0654994b: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
...
* commit '0654994b9e546c50d84b3a9909f190220df65497':
docs: add Sony USB VID issue 5967572
2012-02-06 13:07:04 -08:00
Scott Main
e2a07c2902
am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
...
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue 5967572
2012-02-06 13:05:28 -08:00
Scott Main
d0b5f04467
am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
...
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue 5967572
2012-02-06 13:05:04 -08:00
Scott Main
5550262cc9
Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
2012-02-06 13:03:16 -08:00
Xavier Ducrohet
78b3490a9a
am 9485ca87: am b54f371c: am f8aea993: Make aapt ignore tools-related data.
...
* commit '9485ca87edd819e3106a4b8c3d08f1ab73adf818':
2012-02-06 11:46:49 -08:00
Xavier Ducrohet
e167f532b6
am 3d4db0dc: am c205a9d6: am f8aea993: Make aapt ignore tools-related data.
...
* commit '3d4db0dc1803252b924076f7d10d8e806af71824':
Make aapt ignore tools-related data.
2012-02-06 11:44:43 -08:00
Xavier Ducrohet
d424f2f502
am b54f371c: am f8aea993: Make aapt ignore tools-related data.
...
* commit 'b54f371cc4cfd32acf0fec35885a1da64accec9e':
2012-02-06 11:44:19 -08:00
Xavier Ducrohet
0ada13c455
am c205a9d6: am f8aea993: Make aapt ignore tools-related data.
...
* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
Make aapt ignore tools-related data.
2012-02-06 11:42:50 -08:00
Xavier Ducrohet
987d161da4
am f8aea993: Make aapt ignore tools-related data.
...
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
2012-02-06 11:41:56 -08:00
Xavier Ducrohet
a001da3e59
am f8aea993: Make aapt ignore tools-related data.
...
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
2012-02-06 11:41:04 -08:00
Xavier Ducrohet
4ad660b9b9
Merge "Add some lint control for the frameworks."
2012-02-06 10:57:50 -08:00
Xavier Ducrohet
54f82e7e40
Merge "Make aapt ignore tools-related data."
2012-02-06 10:57:40 -08:00
Chris Craik
e72412ad59
Merge "Pause webkit painting when UI tile painting queue is full"
2012-02-06 10:00:58 -08:00
Mathias Agopian
f6de1c04ff
fix a crasher when starting SF with the screen off
...
SF could end-up in an infinite crash-loop during startup if it
was stopped while the screen was off. This happened because
the thread that manages screen blanking was started before
other important pieces of SF were initialized.
Change-Id: I0dded11dbf2395fdd57b673859a7aa0fa9eb32b6
2012-02-05 02:15:28 -08:00
Mathias Agopian
303d538bb0
ui freeze workaround: reenable triple buffering mode
...
we're seeing UI freezes when window updates and
composition are separated. for now we workaround this
by always doing a composition after window updates on
vsync. triple buffering is reenabled for performance.
Change-Id: I693d705000b7452489bb0b4918fbeadb9879315c
2012-02-05 01:49:16 -08:00
Mathias Agopian
c95dbdc236
improve SF dumpsys
2012-02-05 00:19:27 -08:00
Mathias Agopian
b048cef231
fix UI freezes
...
In some situations SF would mark a window as "has a pending update"
but would never process that update because the window is not
visible (fully transparent, hidden by another window, etc...), this
window would then be "stuck" until some other window updated.
Change-Id: Ifa18a9aef3a53f2593b473556702688ae62d9503
2012-02-04 15:44:04 -08:00
James Dong
2040427ec7
Merge "Don't call virtual functions in the destructor for audio and camera source classes"
2012-02-04 05:54:54 -08:00
Fabrice Di Meglio
b3832840d0
Merge "Revert back to DroidSansArabic font for SystemUI"
2012-02-03 18:33:49 -08:00
Chet Haase
106a34c475
Merge "Make the TimeAnimator class public."
2012-02-03 17:48:11 -08:00
Mathias Agopian
c9ca701150
attempt to fix an ANR in various apps
...
recent changes in SF introduced a hang where some windows would
stop being refreshed.
This is an attemp to fix that.
Change-Id: I6aa32ac0d6f1c0a6aea8f6195825dc4f4e6f93f9
2012-02-03 17:22:09 -08:00
Jeff Brown
1d7264e9bd
Merge "Make the Choreographer thread-safe."
2012-02-03 15:48:33 -08:00
James Dong
5c9ff4c4a5
Merge "Don't call virtual functions in destructors for the writer classes"
2012-02-03 15:37:40 -08:00
Mathias Agopian
2e6ae0138b
Merge "fix a dead-lock in eglMakeCurrent"
2012-02-03 15:35:45 -08:00
Stephen Hines
cdaa8e83c4
Merge "We should not throw for non-fatal errors."
2012-02-03 15:34:38 -08:00
Mathias Agopian
a4b2c04182
fix a dead-lock in eglMakeCurrent
...
this was introduced in a recent change. eglMakeCurrent can
end up calling eglDestroyImageKHR via ANativewWindow::disconnect
when the consumer is in the same process.
we make sure we don't hold the lock while this is happening.
Change-Id: Id17fe4fd76eecf5f962cefb9aa32be41fc1b042d
2012-02-03 15:24:51 -08:00
Eric Fischer
b7a38f0f08
Merge "Import translations. DO NOT MERGE"
2012-02-03 13:48:14 -08:00
Adam Cohen
e96a27b1a1
Merge "Handle null PendingIntents, Bitmaps, Uris and Intents in RemoteViews (issue 5223291)"
2012-02-03 12:06:20 -08:00
Amith Yamasani
a11edd8dc1
Merge "Multi-user - 1st major checkin"
2012-02-03 12:04:40 -08:00
Amith Yamasani
4e975bb488
Multi-user - 1st major checkin
...
Switching activity stacks
Cache ContentProvider per user
Long-press power to switch users (on phone)
Added ServiceMap for separating services by user
Launch PendingIntents on the correct user's uid
Fix task switching from Recents list
AppWidgetService is mostly working.
Commands added to pm and am to allow creating and switching profiles.
Change-Id: I15810e8cfbe50a04bd3323a7ef5a8ff4230870ed
2012-02-03 12:01:47 -08:00
Fabrice Di Meglio
abe39f190f
Merge "Fix bug #5929529 Parentheses aren't correctly rendered in RTL context"
2012-02-03 11:57:54 -08:00
James Dong
4da4454266
Merge "Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine"
2012-02-03 11:29:59 -08:00
Robert Greenwalt
02861a5a78
Merge "Add some logging to NDC."
2012-02-03 08:54:02 -08:00
Glenn Kasten
fb3f824f27
Merge "Use audio_in_acoustics_t consistently"
2012-02-03 08:31:01 -08:00
Glenn Kasten
8d74e90460
Merge "Use ToneGenerator::tone_type consistently"
2012-02-03 08:00:52 -08:00
Glenn Kasten
b9b32cb622
Merge "Use NULL not 0 for raw pointers"
2012-02-03 07:59:42 -08:00
George Mount
3676d6ed07
Merge "Enable webkit text entry for all fields"
2012-02-03 07:58:14 -08:00
George Mount
d5305c8c14
Merge "Use a node pointer to identify content-editable fields."
2012-02-03 07:58:07 -08:00