Dianne Hackborn
0141278021
am f217145b: Merge "A few small missing things from the custom action bar layout." into jb-mr2-dev
...
* commit 'f217145b56d8826aa47f33f6ff5afe484ba8db69':
A few small missing things from the custom action bar layout.
2013-03-06 16:47:45 +00:00
Irfan Sheriff
011b8efce1
Merge "frameworks/base: stop find before issuing wps pbc."
2013-03-06 15:58:42 +00:00
Przemyslaw Szczepaniak
7341786b13
Forgot to rename constructor to match class name.
...
Change-Id: I7e66c3dd26ec7f8be381b0dfd87ac686665206cd
2013-03-06 10:04:07 +00:00
Przemyslaw Szczepaniak
fcf671be89
Fix EBADF in TTS synthesizeToFile method.
...
Recent TTS change altered how the TextToSpeech.synthesizeToFile method
operates. Previously, synthesis service was responsible for creating
output file. Now, client API creates a file and then sends opened file
descriptor using ParcelFileDescriptor.
On service side, I forgot to keep a reference to a ParcelFileDescriptor object.
When GC was removing it, it was closing underlying file descriptor, resulting
in a EBADF error for all following writes to the output file.
This change makes use of a ParcelFileDescriptor.AutoCloseOutputStream to keep a
reference to the ParcelFileDescriptor. It will be referenced until we are done
with writing.
Change-Id: I8327af0eaeabaebfbbd8816d959783e89086a7c5
2013-03-06 09:27:11 +00:00
Baligh Uddin
580554b8cf
Merge "Import translations. DO NOT MERGE"
2013-03-06 05:16:54 +00:00
Mathias Agopian
f4d6f153e6
Merge "remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT" into jb-mr2-dev
2013-03-06 03:52:50 +00:00
Scott Kennedy
8ad7fbae87
Specify the size of the Map in the constructor
...
Change-Id: Ie3325f387cec72216cb70c1b764370e6f3dd1a3e
2013-03-05 19:46:43 -08:00
Deepthi Gowri
575bb45e9d
frameworks/base: stop find before issuing wps pbc.
...
Stop p2p find before issuing a PBC to avoid GO switching to other
channel leading connection failure.
Change-Id: I88906f944de1c85b143f96cb7b35724af19cd151
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2013-03-06 08:24:03 +05:30
Romain Guy
78421f9033
Merge "Take only the scale params into account to rasterize text" into jb-mr2-dev
2013-03-06 02:43:45 +00:00
Dianne Hackborn
f217145b56
Merge "A few small missing things from the custom action bar layout." into jb-mr2-dev
2013-03-06 02:20:04 +00:00
Romain Guy
624234f69b
Take only the scale params into account to rasterize text
...
This change extracts the scale parameters of the current transform
to pass then to the font renderer. Rotation and perspective are
applied to the generated mesh inside the vertex shader. This limits
the number of glyphs we have to create in the font cache and thus
reduces memory churn.
Change-Id: Ic5b3bae2b2b0e0250a8ee723b071a1709725c749
2013-03-05 18:12:35 -08:00
Dianne Hackborn
7cf71fbdc3
A few small missing things from the custom action bar layout.
...
Change-Id: I91e0b43ccf92d5c9541f80220922951acb0795e7
2013-03-05 18:00:12 -08:00
Victoria Lease
807c5e2adf
am 956e0df9: am 913f3c8f: am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
...
* commit '956e0df9222296f7dd5f5a997462168ead03a30a':
FIX Null Pointer Exception on dialog cancel
2013-03-05 23:58:26 +00:00
Victoria Lease
54afd76fc0
am ac112cac: am b2f91e7b: am 8ef243cf: am f45efd27: Merge "Audio continue to played even if paused manually"
...
* commit 'ac112cace6ded8b143179f0a6b03355b24e025bb':
Audio continue to played even if paused manually
2013-03-05 23:58:23 +00:00
Victoria Lease
956e0df922
am 913f3c8f: am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
...
* commit '913f3c8f17ddfcfe67b8deb054272da29b6cdd6d':
FIX Null Pointer Exception on dialog cancel
2013-03-05 23:55:29 +00:00
Victoria Lease
ac112cace6
am b2f91e7b: am 8ef243cf: am f45efd27: Merge "Audio continue to played even if paused manually"
...
* commit 'b2f91e7b23031496082f4dc1f5f0efdbc22188ea':
Audio continue to played even if paused manually
2013-03-05 23:55:26 +00:00
Victoria Lease
913f3c8f17
am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
...
* commit '263554ae5f51fe1181c0c80123ec7f489e124f1a':
FIX Null Pointer Exception on dialog cancel
2013-03-05 23:53:48 +00:00
Victoria Lease
b2f91e7b23
am 8ef243cf: am f45efd27: Merge "Audio continue to played even if paused manually"
...
* commit '8ef243cf861044eec35ee3d8207561251e34c77c':
Audio continue to played even if paused manually
2013-03-05 23:53:46 +00:00
Victoria Lease
263554ae5f
am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
...
* commit '7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b':
FIX Null Pointer Exception on dialog cancel
2013-03-05 15:51:19 -08:00
Victoria Lease
8ef243cf86
am f45efd27: Merge "Audio continue to played even if paused manually"
...
* commit 'f45efd276c9b09adcb97ea43afc806731583aac7':
Audio continue to played even if paused manually
2013-03-05 15:51:16 -08:00
Romain Guy
4f5c8ccc55
am 75a1b294: am ebf213fc: Merge "Make glyph copies a little more cache friendly" into jb-mr2-dev
...
* commit '75a1b29419e0bb8185d60d526750afc301d5e54a':
Make glyph copies a little more cache friendly
2013-03-05 23:32:46 +00:00
Romain Guy
75a1b29419
am ebf213fc: Merge "Make glyph copies a little more cache friendly" into jb-mr2-dev
...
* commit 'ebf213fc38ff39c680e539479d164b54fc6b1bc4':
Make glyph copies a little more cache friendly
2013-03-05 23:30:43 +00:00
Romain Guy
ebf213fc38
Merge "Make glyph copies a little more cache friendly" into jb-mr2-dev
2013-03-05 23:26:53 +00:00
Scott Main
ccd6ddf3ef
am 8f724517: am cd5b9973: am ecc0cddd: am 570cd322: am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit '8f724517b04fc87b1e06e8f3a18edb263bb7cee0':
2013-03-05 23:26:05 +00:00
Victoria Lease
7d4e52baee
Merge "FIX Null Pointer Exception on dialog cancel"
2013-03-05 23:25:16 +00:00
Scott Main
8f724517b0
am cd5b9973: am ecc0cddd: am 570cd322: am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit 'cd5b99739ff1a00248acd230b1accbd7fc411593':
2013-03-05 23:23:49 +00:00
Victoria Lease
f45efd276c
Merge "Audio continue to played even if paused manually"
2013-03-05 23:20:45 +00:00
Scott Main
0681f9e32b
am 365ad40b: am d0cd11d5: am ef3bea6c: am 4be483da: am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit '365ad40b7297e4af00a8effe84ebe5faaeee621f':
docs: update country filtering description bug: 8278024
2013-03-05 23:19:16 +00:00
Scott Main
cd5b99739f
am ecc0cddd: am 570cd322: am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit 'ecc0cdddd5e9d0013ad34617172e83e0de6d9df8':
2013-03-05 23:18:19 +00:00
Scott Main
365ad40b72
am d0cd11d5: am ef3bea6c: am 4be483da: am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit 'd0cd11d541e182e8cce7884d8db296963300b1dd':
docs: update country filtering description bug: 8278024
2013-03-05 23:16:46 +00:00
Scott Main
ecc0cdddd5
am 570cd322: am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit '570cd32254903213ac1d54241401205bc129a035':
2013-03-05 15:15:28 -08:00
Scott Main
d0cd11d541
am ef3bea6c: am 4be483da: am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit 'ef3bea6cd878d42e67f749444883a9906be8c296':
docs: update country filtering description bug: 8278024
2013-03-05 23:14:53 +00:00
Scott Main
ef3bea6cd8
am 4be483da: am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit '4be483dac8eb1024ad9298d582ad2a7068cf5822':
docs: update country filtering description bug: 8278024
2013-03-05 15:11:53 -08:00
Scott Main
570cd32254
am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit 'baff6645d5c6d6b5461c24605c931515ef3217c9':
2013-03-05 15:11:49 -08:00
Glenn Kasten
7003ffdd43
Merge "Subclassing AudioTrack considered harmful"
2013-03-05 23:11:35 +00:00
Scott Main
baff6645d5
am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit '1fdb80caae9ffb3d6178de77097a8f09a23fc4fa':
2013-03-05 15:09:25 -08:00
Scott Main
4be483dac8
am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit 'f37669ffcfab9abdb99f378d8b9b88c974538b9f':
docs: update country filtering description bug: 8278024
2013-03-05 15:08:28 -08:00
Jim Miller
21ace3f34f
Fix widget update issue
...
This fixes an issue where widgets weren't being updated. It
was caused by creating widgets with the wrong package id.
Keyguard used to be identified with package "android" when it
was running in the system proces. Now that it's separate, we need
to explicitly pass in the package name for keyguard ("com.android.keyguard")
when we allocate app widget ids.
Change-Id: I48e1b78d97aa3d0271773219e477d3b741994901
2013-03-05 15:07:33 -08:00
Scott Main
1fdb80caae
am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit '9ea1bacaddb34933ce1dc73780bd868548d5ca2c':
2013-03-05 15:06:46 -08:00
Scott Main
f37669ffcf
am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit 'd6e8a00b0b7ebcd1aa807e694cee85db496711e0':
docs: update country filtering description bug: 8278024
2013-03-05 15:06:06 -08:00
Scott Main
9ea1bacadd
am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit '23513a2c856c1810e10425bcec4296df2be01584':
docs: update country filtering description bug: 8278024
2013-03-05 15:04:01 -08:00
Scott Main
d6e8a00b0b
am 23513a2c: docs: update country filtering description bug: 8278024
...
* commit '23513a2c856c1810e10425bcec4296df2be01584':
docs: update country filtering description bug: 8278024
2013-03-05 15:03:53 -08:00
Elliott Hughes
1641b2cc49
am c14c9f52: am bf494221: am 582c5b85: am 690d3435: Merge "jni: remove obsolete flag from makefile"
...
* commit 'c14c9f52ddeef106dbc7a85fd6a88cc3c0e7739f':
jni: remove obsolete flag from makefile
2013-03-05 22:48:10 +00:00
Elliott Hughes
c14c9f52dd
am bf494221: am 582c5b85: am 690d3435: Merge "jni: remove obsolete flag from makefile"
...
* commit 'bf49422197c81578cc3c0519143714f5006e9d38':
jni: remove obsolete flag from makefile
2013-03-05 22:45:29 +00:00
Elliott Hughes
bf49422197
am 582c5b85: am 690d3435: Merge "jni: remove obsolete flag from makefile"
...
* commit '582c5b85c5653d93afc63b00ac1efff94d0853ab':
jni: remove obsolete flag from makefile
2013-03-05 22:43:07 +00:00
Elliott Hughes
582c5b85c5
am 690d3435: Merge "jni: remove obsolete flag from makefile"
...
* commit '690d3435a4564f6ea7b37e1c6446b5301aeca6b6':
jni: remove obsolete flag from makefile
2013-03-05 14:40:59 -08:00
Elliott Hughes
690d3435a4
Merge "jni: remove obsolete flag from makefile"
2013-03-05 22:30:58 +00:00
Bruce Beare
d625127db9
jni: remove obsolete flag from makefile
...
Change-Id: Ia7e67694a736745333e9d36396b8cb6194fd26ec
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2013-03-05 14:29:46 -08:00
Fabrice Di Meglio
844efa911f
am 80273c6b: am 5f51fd69: Merge "Make Spinner widget RTL-aware (part 2)" into jb-mr2-dev
...
* commit '80273c6b5973d7d4d100a35f6646af45a3179740':
Make Spinner widget RTL-aware (part 2)
2013-03-05 22:29:22 +00:00
Fabrice Di Meglio
b0359666b4
am cc2e3c05: am 8e440a6c: Merge "Improve RTL code for RelativeLayout" into jb-mr2-dev
...
* commit 'cc2e3c05d2a0f58e67ed00e1ee1f08150d78ffcf':
Improve RTL code for RelativeLayout
2013-03-05 22:29:19 +00:00