Eric Fischer
2b1769fe26
Merge "Import translations. DO NOT MERGE"
2012-02-27 15:41:31 -08:00
Gilles Debunne
528e6dda42
Merge "Selection highlight made possible with no editor"
2012-02-27 15:30:57 -08:00
Gilles Debunne
0ca95700b1
Merge "Fix for NPE on long press to start a selection on text."
2012-02-27 15:30:37 -08:00
Gilles Debunne
f94c04abaf
Merge "Fix for NPE when dragging on TextView"
2012-02-27 15:28:49 -08:00
Gilles Debunne
e7769bc76d
Fix for NPE when dragging on TextView
...
Bug 6076166
Change-Id: I52b1e2edc451f0601b71af50e6056dcbe69add43
2012-02-27 15:26:17 -08:00
Alex Sakhartchouk
a65fb113dd
Merge "Removing GL calls from librs"
2012-02-27 15:08:07 -08:00
George Mount
e7b57be185
Merge "Perform action when action button pressed during text input."
2012-02-27 15:06:29 -08:00
Gilles Debunne
7e07adbcd3
Fix for NPE on long press to start a selection on text.
...
Bug 6075849
Change-Id: Ie07bd2adfecc0820995b9c8a75cd4de6dd9891e1
2012-02-27 15:03:52 -08:00
Gilles Debunne
83051b8c75
Selection highlight made possible with no editor
...
Bug 6065081
Selecting text programatically is possible (like when a link is highlighted
by LinkMovementMethod) even when the text is not editable.
Also removed the textCanBeSelected text is highlight computation which prevented
links from being highlighted (legacy problem, not reported).
Now that they work, we can see that the highlight is not removed when the text
loses focus. Will be addressed in a different CL.
Change-Id: I673f435966686234b4c0b0a97bcc65abd01169ff
2012-02-27 14:54:58 -08:00
Eric Fischer
6c3a226f33
Import translations. DO NOT MERGE
...
Change-Id: I947afb66b1299b0b69a3602f55f0da746f7658e1
2012-02-27 14:43:17 -08:00
George Mount
cbd01c31bf
Merge "Paste window instead of action bar when cursor shown."
2012-02-27 14:21:03 -08:00
George Mount
e12dd8fd96
Perform action when action button pressed during text input.
...
Bug 6059576
Change-Id: Ia87f323873b86b22930a2a39bf1c20756f06beec
2012-02-27 14:19:44 -08:00
George Mount
1023aa44ef
Paste window instead of action bar when cursor shown.
...
Use the paste window shown with TextView when the
cursor is shown rather than use the action bar.
Change-Id: I47d0bc2d5cba066399532a9e75171a75628ac7ed
2012-02-27 14:01:33 -08:00
John Huang
fd400f5f48
Merge "Prevent dial() return null in a racing condition."
2012-02-27 13:47:13 -08:00
Romain Guy
3cd9c12db3
Merge "Small optimization for the battery status screen"
2012-02-27 13:35:37 -08:00
Jamie Gennis
f6b53db704
Merge "libutils: add a system-wide tracing utility"
2012-02-27 13:35:30 -08:00
Romain Guy
765dcf3230
Small optimization for the battery status screen
...
Change-Id: I2833ba4009f6c284c9ef33c45a4dd7365423fb5f
2012-02-27 13:28:22 -08:00
Glenn Kasten
fa28f57f29
Merge "Fix tracking of hardware state for dump"
2012-02-27 13:23:51 -08:00
Jamie Gennis
c7d47ec622
Merge "Revert "Removed dependecies between BufferQueue and SurfaceTexture""
2012-02-27 13:23:51 -08:00
Jean-Baptiste Queru
e912404f85
am 19bb6261: am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
...
* commit '19bb62613f512b62d492fb4caf36de88fd1914dd':
stagefright aacenc: Add prototypes for arm specific implementations of functions
2012-02-27 13:15:15 -08:00
Jean-Baptiste Queru
308eb8f51f
am 360db46e: am b7913f70: am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static"
...
* commit '360db46e78a1492b695d5be6e779386dc66a502e':
stagefright amrwb: Make local const arrays static
2012-02-27 13:15:13 -08:00
Jean-Baptiste Queru
930b3c0b22
am 5ba910d8: am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
...
* commit '5ba910d867d029e69c4f52667c02a4c114f849df':
stagefright amrwb: Change a C++ style cast into a C style cast
2012-02-27 13:15:10 -08:00
Jean-Baptiste Queru
e3463238ed
am b205a5d8: am 50ee92e9: am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
...
* commit 'b205a5d861c5ba31599084a42c7d92549f464dac':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
2012-02-27 13:15:06 -08:00
Jean-Baptiste Queru
b8a098b287
am 18a64b74: am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
...
* commit '18a64b74aa3cb0babb5f50e5f80660f601d80123':
stagefright aacenc: Simplify the definition of __inline
2012-02-27 13:15:03 -08:00
Jean-Baptiste Queru
64d2ca5e21
am 6b4d7bad: am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
...
* commit '6b4d7bada0b1d34f93149211cb179b71c864d5d3':
stagefright amrwbenc: Remove a useless check
2012-02-27 13:14:59 -08:00
Jean-Baptiste Queru
0b8525c9a1
am 2bf76b98: am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
...
* commit '2bf76b983da1d1730d685f9907d5d4fa6ea46fcd':
stagefright aacenc: Remove a stray semicolon
2012-02-27 13:14:56 -08:00
Jean-Baptiste Queru
2ba0804164
am 484fc74b: am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
...
* commit '484fc74beb79d0b8d49223cb3fce9e1ccbfd3501':
stagefright amrwb: Make a global const array static
2012-02-27 13:14:53 -08:00
Jean-Baptiste Queru
cfef1d0ac0
am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
...
* commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0':
stagefright amrwbenc: Change keyword ordering
2012-02-27 13:14:48 -08:00
Jean-Baptiste Queru
8eb14828f1
am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
...
* commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
2012-02-27 13:14:45 -08:00
Jean-Baptiste Queru
19bb62613f
am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
...
* commit 'bf8269238be1c5bde9f82a986fb128d9a80f250b':
stagefright aacenc: Add prototypes for arm specific implementations of functions
2012-02-27 13:12:42 -08:00
Jean-Baptiste Queru
360db46e78
am b7913f70: am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static"
...
* commit 'b7913f709b443df8d55ac2f6e080ab0ae38bcadf':
stagefright amrwb: Make local const arrays static
2012-02-27 13:12:39 -08:00
Jean-Baptiste Queru
5ba910d867
am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
...
* commit '040c5b2ca716bef082506065606cb9708d051625':
stagefright amrwb: Change a C++ style cast into a C style cast
2012-02-27 13:12:37 -08:00
Jean-Baptiste Queru
b205a5d861
am 50ee92e9: am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
...
* commit '50ee92e972cf8a4cc56e95f44625eed649cc8196':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
2012-02-27 13:12:34 -08:00
Jean-Baptiste Queru
18a64b74aa
am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
...
* commit 'a887ff9ae61f6cb925feb6e08643716ac28e35db':
stagefright aacenc: Simplify the definition of __inline
2012-02-27 13:12:32 -08:00
Jean-Baptiste Queru
6b4d7bada0
am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
...
* commit 'f7210cf55cafef55cca8cca65e1749b1dd088e77':
stagefright amrwbenc: Remove a useless check
2012-02-27 13:12:29 -08:00
Jean-Baptiste Queru
2bf76b983d
am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
...
* commit '3e61e413435ed745336c44d63fb6ffa6378e393b':
stagefright aacenc: Remove a stray semicolon
2012-02-27 13:12:26 -08:00
Jean-Baptiste Queru
484fc74beb
am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
...
* commit '4bcdeb86965d25697e2439a53f791cd140c8fe6b':
stagefright amrwb: Make a global const array static
2012-02-27 13:12:24 -08:00
Jean-Baptiste Queru
eb483de58e
am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
...
* commit 'bf5c5e5b03fda1b6397e95fa621ed9b0649a5360':
stagefright amrwbenc: Change keyword ordering
2012-02-27 13:12:21 -08:00
Jean-Baptiste Queru
5b299d2f90
am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
...
* commit '18643e705a50f6c1c865e56e75d8403422a76d65':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
2012-02-27 13:12:19 -08:00
Jean-Baptiste Queru
bf8269238b
am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
...
* commit 'faf38b24c0255ea7492277b0aa03a401dbdbb2b8':
stagefright aacenc: Add prototypes for arm specific implementations of functions
2012-02-27 13:10:10 -08:00
Jean-Baptiste Queru
b7913f709b
am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static"
...
* commit '163777b8be102a10f6e4a4a6c5be90eed2a479d2':
stagefright amrwb: Make local const arrays static
2012-02-27 13:10:07 -08:00
Jean-Baptiste Queru
040c5b2ca7
am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
...
* commit 'ded8e6818dbec3f1a6589345f0d8d6b189e1ea2b':
stagefright amrwb: Change a C++ style cast into a C style cast
2012-02-27 13:10:04 -08:00
Jean-Baptiste Queru
50ee92e972
am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
...
* commit 'd91b744dedaa19a42ea9d878cfa5925cb15b2698':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
2012-02-27 13:10:00 -08:00
Jean-Baptiste Queru
a887ff9ae6
am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
...
* commit '4f74be57e72cb2fbee05184f5bc00e716d0b95b3':
stagefright aacenc: Simplify the definition of __inline
2012-02-27 13:09:57 -08:00
Jean-Baptiste Queru
f7210cf55c
am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
...
* commit '7346d73cac355f2b05051450eb1059d5e11e4ffb':
stagefright amrwbenc: Remove a useless check
2012-02-27 13:09:53 -08:00
Jean-Baptiste Queru
3e61e41343
am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
...
* commit '32901b397b590cc9133d21caab20b5ef01f0dd04':
stagefright aacenc: Remove a stray semicolon
2012-02-27 13:09:50 -08:00
Jean-Baptiste Queru
4bcdeb8696
am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
...
* commit '716a051719993cae576590f6a43620697e50b3b5':
stagefright amrwb: Make a global const array static
2012-02-27 13:09:46 -08:00
Jean-Baptiste Queru
bf5c5e5b03
am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
...
* commit 'c1da1e1b2f18896c65df85de93a07680175c5277':
stagefright amrwbenc: Change keyword ordering
2012-02-27 13:09:43 -08:00
Jean-Baptiste Queru
18643e705a
am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
...
* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
2012-02-27 13:09:40 -08:00
Jean-Baptiste Queru
faf38b24c0
am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
...
* commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e':
stagefright aacenc: Add prototypes for arm specific implementations of functions
2012-02-27 13:07:43 -08:00