Scott Main
053e0d14bb
am dbee29ba: am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit 'dbee29ba559a0c16919b5977ed4972481b0a98ec':
docs: switch from caps to initial-case for device button names
2012-02-06 14:45:39 -08:00
Jean-Baptiste Queru
0a3f6d69b6
am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
...
* commit '33476f7ad1c3b4dcaefddb306f315e201c4efb33':
Skia API changes as a result of an update to the Skia library.
2012-02-06 14:45:36 -08:00
Scott Main
dbee29ba55
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
Jean-Baptiste Queru
33476f7ad1
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
5a0fe6fc13
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
a9d9fa723a
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
f79bcd2dd5
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
Scott Main
cf9fe43ce9
docs: switch from caps to initial-case for device button names
...
Change-Id: I2affdf7400fd814e43633806cebebee4c6075b0b
2012-02-06 14:09:00 -08:00
Jean-Baptiste Queru
52da99fac8
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
a081c7b8bc
Merge "Skia API changes as a result of an update to the Skia library."
2012-02-06 14:01:06 -08:00
Scott Main
e75abda25a
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
6d41c9a96e
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
6f2f42d52a
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
584156ad29
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
3cab656d38
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
0654994b9e
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
8e39940872
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
4ba15efc5b
Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
2012-02-06 13:03:16 -08:00
Scott Main
ed4d1f7dcf
docs: add Sony USB VID
...
issue 5967572
Change-Id: I5735d15bec6bd85b5fa74300193dfba1c9da6f34
2012-02-06 13:01:44 -08:00
Xavier Ducrohet
0afa7e2d95
am 9485ca87: am b54f371c: am f8aea993: Make aapt ignore tools-related data.
...
* commit '9485ca87edd819e3106a4b8c3d08f1ab73adf818':
2012-02-06 11:46:49 -08:00
Xavier Ducrohet
30ca4b5269
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
9485ca87ed
am b54f371c: am f8aea993: Make aapt ignore tools-related data.
...
* commit 'b54f371cc4cfd32acf0fec35885a1da64accec9e':
2012-02-06 11:44:19 -08:00
Xavier Ducrohet
3d4db0dc18
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
b54f371cc4
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
c205a9d68c
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
f8aea99385
Make aapt ignore tools-related data.
...
This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.
The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.
(cherry picked from commit a5d5e9d906583ebeb590ca200ca9840302a5cd1a)
Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5
2012-02-06 11:25:28 -08:00
Xavier Ducrohet
75ef7bea32
Merge "Add some lint control for the frameworks."
2012-02-06 10:57:50 -08:00
Xavier Ducrohet
edc3c65387
Merge "Make aapt ignore tools-related data."
2012-02-06 10:57:40 -08:00
Chris Craik
d5544ac710
Merge "Pause webkit painting when UI tile painting queue is full"
2012-02-06 10:00:58 -08:00
Mathias Agopian
37f6934e86
a test to measure the touch latency
...
Change-Id: I01782274563fc9d6e4c1ba48e5aa371c164ed589
2012-02-05 22:25:32 -08:00
Mathias Agopian
587ae01ad6
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
cf7f0c7328
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
077f29f8ae
improve SF dumpsys
2012-02-05 00:19:27 -08:00
Mathias Agopian
fe005282db
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
cea2c396c5
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
ffd121233a
Merge "Revert back to DroidSansArabic font for SystemUI"
2012-02-03 18:33:49 -08:00
Chet Haase
f492b43f45
Merge "Make the TimeAnimator class public."
2012-02-03 17:48:11 -08:00
Mathias Agopian
af87216387
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
Chet Haase
a33de55404
Make the TimeAnimator class public.
...
This class has existed since ICS, but was hidden. This change
just makes it public API.
Also, cleaned up some internal javadocs.
Change-Id: Id69408446ced183e01d2b065a67397eb305d9665
2012-02-03 16:28:24 -08:00
Chris Craik
4390c6b4a6
Pause webkit painting when UI tile painting queue is full
...
Change-Id: I8836d7951f8f02d7f966dc22d807ea785ac9e637
2012-02-03 16:07:11 -08:00
Jeff Brown
33c84496a6
Merge "Make the Choreographer thread-safe."
2012-02-03 15:48:33 -08:00
James Dong
4651c0ea80
Merge "Don't call virtual functions in destructors for the writer classes"
2012-02-03 15:37:40 -08:00
Mathias Agopian
4d10ed3210
Merge "fix a dead-lock in eglMakeCurrent"
2012-02-03 15:35:45 -08:00
Stephen Hines
e05bc81c19
Merge "We should not throw for non-fatal errors."
2012-02-03 15:34:38 -08:00
Stephen Hines
be74bdd234
We should not throw for non-fatal errors.
...
BUG=5955072
Change-Id: I731242805957a057aaff1ba96a58c69d6e474a59
2012-02-03 15:29:36 -08:00
Mathias Agopian
7b864906e5
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
Jeff Sharkey
241dde2306
Unify shorthand for byte-based units.
...
Change-Id: If990859dee3f0973e1d4c48f05312c84071b3328
2012-02-03 14:50:13 -08:00
Eric Fischer
1c9fcd9086
Merge "Import translations. DO NOT MERGE"
2012-02-03 13:48:14 -08:00
Xavier Ducrohet
9e194a1557
Add some lint control for the frameworks.
...
Change-Id: Ie80ffee31ca87da3e7f1031317f2d4c1a36640c8
2012-02-03 13:27:52 -08:00
Eric Fischer
8d3d580c51
Import translations. DO NOT MERGE
...
Change-Id: I50c6c58c7b20c3e8ce02adeac7e05f23d0a3fe44
2012-02-03 12:24:15 -08:00