drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,690 Commits 1 Branch 0 Tags
Commit Graph

63690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Baptiste Queru
163777b8be am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 
* commit '354ac772eca0afea25dd12d233e5cdee9677888b':
  stagefright amrwb: Make local const arrays static
 2012-02-27 13:07:40 -08:00
Jean-Baptiste Queru
ded8e6818d am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 
* commit '695cfe1e1e189f176fdf994f72d05a0129a66394':
  stagefright amrwb: Change a C++ style cast into a C style cast
 2012-02-27 13:07:36 -08:00
Jean-Baptiste Queru
d91b744ded am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* commit 'f7f1280e0c71d64098efb42b58a922d056164b5e':
  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:07:33 -08:00
Jean-Baptiste Queru
4f74be57e7 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" 
* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
  stagefright aacenc: Simplify the definition of __inline
 2012-02-27 13:07:30 -08:00
Jean-Baptiste Queru
7346d73cac am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit '77576ff487e227092cdaf09db163e21f1e07604a':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:07:26 -08:00
Jean-Baptiste Queru
32901b397b am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" 
* commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7':
  stagefright aacenc: Remove a stray semicolon
 2012-02-27 13:07:23 -08:00
Jean-Baptiste Queru
716a051719 am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" 
* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
  stagefright amrwb: Make a global const array static
 2012-02-27 13:07:20 -08:00
Jean-Baptiste Queru
c1da1e1b2f am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:07:16 -08:00
Jean-Baptiste Queru
6bc542e0f3 am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" 
* commit '5aff259c61e54e441ed04bf77e3cc69a0374432d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
 2012-02-27 13:07:12 -08:00
Jean-Baptiste Queru
9e3d957599 Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 2012-02-27 12:14:41 -08:00
Jean-Baptiste Queru
354ac772ec Merge "stagefright amrwb: Make local const arrays static" 2012-02-27 12:14:02 -08:00
Jean-Baptiste Queru
695cfe1e1e Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 2012-02-27 12:13:27 -08:00
Martin Storsjo
b084141342 stagefright amr: Avoid C++/C99 for loops with variable declaration 
This makes the code compileable in C89 mode, too.

Change-Id: I9b76f8bfca148d1aec6081b8db139f351d64cfed
 2012-02-27 21:35:48 +02:00
Robert Ly
718af2f93b am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '55a1c40fa0f127b442a2e7f0677a3181e28b6ec2':
 2012-02-27 11:28:07 -08:00
Jean-Baptiste Queru
f7f1280e0c Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* changes:
  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 11:16:23 -08:00
Jean-Baptiste Queru
1a864db772 Merge "stagefright aacenc: Simplify the definition of __inline" 2012-02-27 11:11:57 -08:00
Jean-Baptiste Queru
77576ff487 Merge "stagefright amrwbenc: Remove a useless check" 2012-02-27 11:11:18 -08:00
Jean-Baptiste Queru
be9a705586 Merge "stagefright aacenc: Remove a stray semicolon" 2012-02-27 11:09:59 -08:00
Jean-Baptiste Queru
fe5f5d7728 Merge "stagefright amrwb: Make a global const array static" 2012-02-27 11:08:09 -08:00
Jean-Baptiste Queru
94ee1bf232 Merge "stagefright amrwbenc: Change keyword ordering" 2012-02-27 11:06:25 -08:00
Jean-Baptiste Queru
5aff259c61 Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" 2012-02-27 10:58:51 -08:00
Jean-Baptiste Queru
c3c90353f9 Add stubs for better compatibility 
Change-Id: I3fafee637f3ab239e3b870c73bcfe34cf73caf4c
 2012-02-27 08:54:57 -08:00
Robert Ly
9dc8ea87b5 am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit 'c76ca242ce2bd26c97c78ddf6842429850f541d9':
  docs: fix bug 5990526
 2012-02-27 08:46:00 -08:00
Robert Ly
c76ca242ce am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
  docs: fix bug 5990526
 2012-02-27 08:42:48 -08:00
Robert Ly
55a1c40fa0 am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
  docs: fix bug 5990526
 2012-02-27 08:42:19 -08:00
Robert Ly
85cb9dece2 Merge "docs: fix bug 5990526" into ics-mr1 2012-02-27 08:40:54 -08:00
Xavier Ducrohet
7a879da157 am df154866: am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit 'df154866fbad10faf8f9bceb8843aca1e2a69984':
 2012-02-24 19:36:34 -08:00
Xavier Ducrohet
77fdcbff8b am f038868d: am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit 'f038868d74af534effceaa8f1d932f9576f4f647':
  Support rendering layout that use the new res-auto namespace.
 2012-02-24 19:35:25 -08:00
Xavier Ducrohet
f038868d74 am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
  Support rendering layout that use the new res-auto namespace.
 2012-02-24 19:32:47 -08:00
Xavier Ducrohet
df154866fb am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
  Support rendering layout that use the new res-auto namespace.
 2012-02-24 19:32:32 -08:00
Xavier Ducrohet
44e63a218c Support rendering layout that use the new res-auto namespace. 
Change-Id: I9b89c965dc8c9458e74c15ab8ff765e16e1b32c2
 2012-02-24 19:29:31 -08:00
Dianne Hackborn
44b1a43d82 am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':
 2012-02-24 16:29:44 -08:00
Dianne Hackborn
34706a4c81 am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
  Fix build.
 2012-02-24 16:26:57 -08:00
Dianne Hackborn
4a6e6991b0 am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:25:30 -08:00
Dianne Hackborn
e65a9ab1ea am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:24:40 -08:00
Dianne Hackborn
5786f5cf1b Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Dianne Hackborn
b69b2c01b4 Fix build. 
Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
 2012-02-24 16:10:26 -08:00
Dianne Hackborn
92ce6314c1 am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '140da7c4140f0536c3fad1f7be555ebd58055b63':
 2012-02-24 15:42:43 -08:00
Dianne Hackborn
911b505f11 am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit 'dc5fa1859d03ecca36fc6be2fed7bbd4ba70b51f':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:41:35 -08:00
Dianne Hackborn
dc5fa1859d am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:07 -08:00
Dianne Hackborn
140da7c414 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:03 -08:00
Dianne Hackborn
133dc2d7ae Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 2012-02-24 15:36:33 -08:00
The Android Open Source Project
5cb79935b9 am 2ddd7b3e: Reconcile with ics-mr1-release 
* commit '2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':
 2012-02-24 14:12:35 -08:00
The Android Open Source Project
2ddd7b3e87 Reconcile with ics-mr1-release 
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
 2012-02-24 14:05:51 -08:00
The Android Open Source Project
cb20fab2ee am aac21480: Reconcile with ics-mr1-release 
* commit 'aac214800b518259306960ff9cc90de65d095398':
 2012-02-24 14:01:27 -08:00
The Android Open Source Project
aac214800b Reconcile with ics-mr1-release 
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
 2012-02-24 13:57:46 -08:00
Dianne Hackborn
7663d80f6b Fix issue #6048808: sometimes auto-correct is inactive 
My previous change to speed up the time the IME is dismissed was
fundamentally flawed.  That change basically switched the order
the application called the input method manager service from doing
startInput() and then windowGainedFocus(), to first windowGainedFocus()
and then startInput().

The problem is that the service relies on startInput() being done
first, since this is the mechanism to set up the new input focus,
and windowGainedFocus() is just updating the IME visibility state
after that is done.  However, by doing the startInput() first, that
means in the case where we are going to hide the IME we must first
wait for the IME to re-initialize editing on whatever input has
focus in the new window.

To address this, the change here tries to find a half-way point
between the two.  We now do startInput() after windowGainedFocus()
only when this will result in the window being hidden.

It is not as easy as that, though, because these are calls on to
the system service from the application.  So being able to do that
meant a fair amount of re-arranging of this part of the protocol
with the service.  Now windowGainedFocus() is called with all of
the information also needed for startInput(), and takes care of
performing both operations.  The client-side code is correspondingly
rearranged so that the guts of it where startInput() is called can
instead call the windowGainedFocus() entry if appropriate.

So...  in theory this is safer than the previous change, since it
should not be impacting the behavior as much.  In practice, however,
we are touching and re-arranging a lot more code, and "should" is
not a promise.

Change-Id: Icb58bef75ef4bf9979f3e2ba88cea20db2e2c3fb
 2012-02-24 13:18:23 -08:00
Martin Storsjo
dafebd6bfc stagefright amrnb: Remove extern from table definitions 
Local prototype declarations are added where no suitable ones are
available in headers.

This fixes warnings when compiling as C - while the source
files are named .cpp, they actually are compileable as pure C.

This was committed on the master branch of the opencore
repository in commit a0acb494ea6682ca966b5ebbd3676c89c56d63a6,
based on AOSP contribution 10303.

Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
 2012-02-24 23:07:49 +02:00