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
Dianne Hackborn
5c607433e3 Fix issue #6073913: onActivityResult() not getting called... 
...if the process is killed and restarted

Try to ensure that in all cases we deliver an activity result if one
was requested.

Change-Id: Id43e830d2ee782f98ed1e3b68e5e16f3258d4ad8
 2012-02-28 14:45:23 -08:00
felipeal
635d492d59 am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit '4bcc910817c694c8d8b20e39a5ff42c584af1d49':
 2012-02-28 14:09:43 -08:00
felipeal
96236bc8d9 am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'fa73815e1d953e67c635877440e717dc84465d97':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:07:26 -08:00
felipeal
4bcc910817 am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:05:23 -08:00
felipeal
fa73815e1d am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:04:20 -08:00
Jean-Baptiste Queru
ccd08b8de9 am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'e939edb5b4e991998ae8219b03d75c10cdc765cb':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:53:17 -08:00
felipeal
e4ef9b1ac2 DO NOT MERGE 
(from master: Fixed minor typo on Javadoc)

Change-Id: I7d62e37011a7fd4d792fdfe5bd62022a850303a6
 2012-02-28 13:47:15 -08:00
Jean-Baptiste Queru
e939edb5b4 am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'f418738c64413b818e2dc507c912c2678876632f':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:33:44 -08:00
Jean-Baptiste Queru
f418738c64 am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'd7fa7deef9bc0cf22bf450fdb062327697c087c4':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:30:39 -08:00
Jason Noguchi
bb18957461 am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'eac4b187d357eac61475c4dc6f673656e08e75a9':
 2012-02-28 11:53:49 -08:00
Jason Noguchi
a1de5e4812 am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit '743aceec4289508a8c514dae7319659cf7f278c4':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:52:56 -08:00
Jason Noguchi
743aceec42 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:50:14 -08:00
Jason Noguchi
eac4b187d3 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:49:30 -08:00
Jason Noguchi
ee32993095 Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 2012-02-28 11:47:46 -08:00
Android Git Automerger
a66926ff7f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-28 10:49:07 -08:00
Svetoslav Ganov
8f4582a278 am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'c78f121716ff7d4cbf8a70519a266ae030942751':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:39:17 -08:00
Svetoslav Ganov
0c96daa5d5 am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit '0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:38:39 -08:00
Svetoslav Ganov
0c7ffac4ca am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:35:43 -08:00
Svetoslav Ganov
c78f121716 am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:35:18 -08:00
Jean-Baptiste Queru
d7fa7deef9 Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 2012-02-28 07:28:52 -08:00
Svetoslav Ganov
a2b41b438d NumberPicker showing IME when its input field gains focus. 
1. The NumberPicker was showing the IME if the input field
   gets focus and hiding it when the the arrows are pressed.
   The leads to a nasty behavior when the input is the first
   focusable and the uses presser an arrow button. In such
   a case the IME shows and hides on every arrow press pushing
   the window content up and down - this looks pretty ugly.
   Now the IME is show on double tap of the input field.

2. The NumberPicker input now by default has an IME action
   done, hence after editing it the IME goes away.

3. The NumberPicker input now clears focus when it gets
   IME action done, so the last picker in a sequence
   does not show selection which is focus driven.

4. NumberPicker was incorrectly detecting double tap to
   begin edit and it was possble to start edit on singe tap
   if the user has double tapped before to start an edit.
   Now double tap detection is using the double tap timeout
   correctly.

bug:6071977

Change-Id: I0ff5a491064e51663b3abec675d839d0a65b986a
 2012-02-27 17:32:54 -08:00
Jean-Baptiste Queru
254cf5973e am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit '7b6b81f89538d34415869710cbf464ba7c28bf9b':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 17:02:15 -08:00
Jean-Baptiste Queru
7b6b81f895 am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit 'f016dc1bd7f9a67adac13b0b564692dab8723392':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 16:59:59 -08:00
Jean-Baptiste Queru
f016dc1bd7 am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 16:57:06 -08:00
Jean-Baptiste Queru
f881fa5179 Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 2012-02-27 16:23:19 -08:00
The Android Automerger
85a6022143 merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 16:10:06 -08:00
Jean-Baptiste Queru
d107453ddf am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" 
* commit '84dd87d992d88d1f407796a41bc8baa27dc97a81':
  Add stubs for better compatibility
 2012-02-27 16:03:41 -08:00
Jean-Baptiste Queru
84dd87d992 am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" 
* commit '015a248e631dc10fd6b52ae8773c0a3e0cf752af':
  Add stubs for better compatibility
 2012-02-27 16:01:31 -08:00
Jean-Baptiste Queru
015a248e63 am 93df415c: Merge "Add stubs for better compatibility" 
* commit '93df415c1e0b4c99f274adb3629ce19abf1d0f53':
  Add stubs for better compatibility
 2012-02-27 15:58:50 -08:00
Jean-Baptiste Queru
93df415c1e Merge "Add stubs for better compatibility" 2012-02-27 15:36:22 -08:00
The Android Automerger
5fc5d779a6 merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 14:42:58 -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