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

27655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
4de823a759 Merge "Fix problems with moving Views around (invalidation, conflict with layout)" 2010-07-30 17:14:29 -07:00
Kenny Root
98b557de31 am 9117669c: am 8b61b68b: Merge "Only install after MCS success" into gingerbread 
Merge commit '9117669c7de41799535dfa88e5d68a30d7674733'

* commit '9117669c7de41799535dfa88e5d68a30d7674733':
  Only install after MCS success
 2010-07-30 17:03:51 -07:00
Kenny Root
9117669c7d am 8b61b68b: Merge "Only install after MCS success" into gingerbread 
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp

* commit '8b61b68b648985df37197de204398f608c4ad8b1':
  Only install after MCS success
 2010-07-30 17:00:01 -07:00
Kenny Root
8b61b68b64 Merge "Only install after MCS success" into gingerbread 2010-07-30 16:55:37 -07:00
Kenny Root
6f89fa07b4 Only install after MCS success 
If MCS dies in the middle of a call during install, only proceed if the
call was successful. Otherwise wait for the max retries to be reached
and run the failure handling code there.

Change-Id: I00a27ea91046ea6521a3cff5e5ffe2c71b2b5bb4
 2010-07-30 16:35:04 -07:00
Tadashi G. Takaoka
c8f5e43719 Merge "Fix KeyboardView's verticalCorrection handling" 2010-07-30 16:34:06 -07:00
Tadashi G. Takaoka
0972d071cd Fix KeyboardView's verticalCorrection handling 
Do not correct the touch point if it is within the range of
verticalCorrection from the top of KeyboardView, so that the touch
point will not have negative y-axis value.

Bug: 2659128

Change-Id: I91a3e65fc5dee1383dbbfb45690e307fc0adc1d1
 2010-07-30 16:08:47 -07:00
Brad Fitzpatrick
86dde2d64c am e2d33bbc: am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread 
Merge commit 'e2d33bbc496192d49c1e48baad446d8d0720d301'

* commit 'e2d33bbc496192d49c1e48baad446d8d0720d301':
  StrictMode: time violations in Binder calls
 2010-07-30 15:27:56 -07:00
Brad Fitzpatrick
e2d33bbc49 am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread 
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
 2010-07-30 15:23:19 -07:00
Brad Fitzpatrick
d2165cfce7 Merge "StrictMode: time violations in Binder calls" into gingerbread 2010-07-30 15:20:28 -07:00
Chet Haase
8fbf8d2b08 Fix problems with moving Views around (invalidation, conflict with layout) 
Change-Id: I38f8f8a4e8082854a53a2975da258b5d946ed525
 2010-07-30 15:01:32 -07:00
James Dong
e1c5dae372 am 7600f934: am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 
Merge commit '7600f934015cff4d678b0f4e8df0eb93749be7bb'

* commit '7600f934015cff4d678b0f4e8df0eb93749be7bb':
  Added damr box for AMR (NB and WB) sample entry
 2010-07-30 14:54:26 -07:00
Jeff Brown
bc6ed6c9f6 am 3b724c83: am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread 
Merge commit '3b724c836b13b320b2b2c492c28660617e0d503e'

* commit '3b724c836b13b320b2b2c492c28660617e0d503e':
  Improve thread safety of input mappers.
 2010-07-30 14:52:12 -07:00
James Dong
7600f93401 am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
  Added damr box for AMR (NB and WB) sample entry
 2010-07-30 14:52:05 -07:00
Jeff Brown
3b724c836b am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread 
Merge commit '00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp

* commit '00e5c61366d3d3d62c259277823ea15a14f68ad4':
  Improve thread safety of input mappers.
 2010-07-30 14:49:43 -07:00
James Dong
f0aa24d91d Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 2010-07-30 14:49:23 -07:00
Jeff Brown
00e5c61366 Merge "Improve thread safety of input mappers." into gingerbread 2010-07-30 14:48:25 -07:00
Jeff Brown
6328cdc89e Improve thread safety of input mappers. 
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.

Bug: 2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
 2010-07-30 14:43:58 -07:00
James Dong
aea75231a5 am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread 
Merge commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c'

* commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c':
  Lower the lower bound for max file duration check
 2010-07-30 14:33:05 -07:00
James Dong
e915b0ef5d am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread 
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp

* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
  Lower the lower bound for max file duration check
 2010-07-30 14:30:31 -07:00
Brad Fitzpatrick
cb9ceb1029 StrictMode: time violations in Binder calls 
Change-Id: I5796993dce98be722cf679b78acaf0c9de0ba461
 2010-07-30 14:28:55 -07:00
James Dong
d973a533da Merge "Lower the lower bound for max file duration check" into gingerbread 2010-07-30 14:28:26 -07:00
James Dong
c80218a966 Added damr box for AMR (NB and WB) sample entry 
- Some players, like QT, sometimes are picky about the missing sample entry

Change-Id: Ia32d78e48ac9fd8af8285dbc67f0d69142ba98b4
 2010-07-30 13:55:18 -07:00
Xia Wang
f1e4bd2a66 am 903d445f: (-s ours) am 131ce67d: Merge "DO NOT MERGE" into gingerbread 
Merge commit '903d445f4102f3ae15e370bd10e1745a88905a99'

* commit '903d445f4102f3ae15e370bd10e1745a88905a99':
  DO NOT MERGE
 2010-07-30 13:50:03 -07:00
Xia Wang
903d445f41 am 131ce67d: Merge "DO NOT MERGE" into gingerbread 
Merge commit '131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp

* commit '131ce67d276416e3cb23a5e31121fdff1a8bf290':
  DO NOT MERGE
 2010-07-30 13:46:24 -07:00
Xia Wang
131ce67d27 Merge "DO NOT MERGE" into gingerbread 2010-07-30 13:44:23 -07:00
James Dong
8894de6d3e Lower the lower bound for max file duration check 
- This fixed a CTS test where 200 ms is being used

Change-Id: Ib598b7b94be54e98a96703c58c5f244bc379cf7d
 2010-07-30 12:41:59 -07:00
Andreas Huber
f0ba841f74 am 2a5db6d4: am 432c5b6c: am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo 
Merge commit '2a5db6d4b389a1fb24f43f18b4207a5fad5296ca'

* commit '2a5db6d4b389a1fb24f43f18b4207a5fad5296ca':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
 2010-07-30 12:20:56 -07:00
Andreas Huber
2a5db6d4b3 am 432c5b6c: am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo 
Merge commit '432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp

* commit '432c5b6c1d4181194cb82a14107b6d10105231a9':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
 2010-07-30 12:18:58 -07:00
Jean-Baptiste Queru
994112e771 am 6a5ed6aa: am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread 
Merge commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7'

* commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7':
  fix inaccurate copyrights
 2010-07-30 12:15:42 -07:00
Andreas Huber
432c5b6c1d am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo 
Merge commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread

* commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
 2010-07-30 12:15:02 -07:00
Jean-Baptiste Queru
6a5ed6aa9d am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread 
Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp

* commit '154a320069a316491c25b716f2aeea8c51a758e8':
  fix inaccurate copyrights
 2010-07-30 12:13:43 -07:00
Daniel Sandler
84383376d8 Merge "More readable Configuration#toString() output." 2010-07-30 12:10:33 -07:00
Jean-Baptiste Queru
154a320069 resolved conflicts for merge of 27eecb70 to gingerbread 
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
 2010-07-30 12:08:31 -07:00
Dmitri Plotnikov
025b6ec308 Merge "Adding a lookup URI to simplify loading of a contact" 2010-07-30 12:03:17 -07:00
Jean-Baptiste Queru
ee2368ed35 am 8e258000: am 0f0dd448: Merge "Fix a bug that prevented the creation of EGL shared contexts." 
Merge commit '8e258000e86faa5dd0009caa5823119116ef5dec'

* commit '8e258000e86faa5dd0009caa5823119116ef5dec':
  Fix a bug that prevented the creation of EGL shared contexts.
 2010-07-30 12:01:46 -07:00
Gilles Debunne
8d0ea2155b am c943e174: am 4609b0a8: am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 
Merge commit 'c943e174f675ec7d1a217f4bb4418cd141217d57'

* commit 'c943e174f675ec7d1a217f4bb4418cd141217d57':
  Fixes regarding densities in "Providing Resources" documentation page.
 2010-07-30 12:01:43 -07:00
Gilles Debunne
d49533523b am 56329b46: am 628be513: am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 
Merge commit '56329b46ad7e1423118a640717b5904be0b48c77'

* commit '56329b46ad7e1423118a640717b5904be0b48c77':
  Fixed doc typos in HeterogeneousExpandableList.java.
 2010-07-30 12:01:34 -07:00
Jean-Baptiste Queru
8e258000e8 am 0f0dd448: Merge "Fix a bug that prevented the creation of EGL shared contexts." 
Merge commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916' into gingerbread-plus-aosp

* commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916':
  Fix a bug that prevented the creation of EGL shared contexts.
 2010-07-30 11:58:25 -07:00
Gilles Debunne
c943e174f6 am 4609b0a8: am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 
Merge commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp

* commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2':
  Fixes regarding densities in "Providing Resources" documentation page.
 2010-07-30 11:56:36 -07:00
Gilles Debunne
56329b46ad am 628be513: am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 
Merge commit '628be513e67ce6c61884b1baaf0379abfc56100b' into gingerbread-plus-aosp

* commit '628be513e67ce6c61884b1baaf0379abfc56100b':
  Fixed doc typos in HeterogeneousExpandableList.java.
 2010-07-30 11:56:24 -07:00
Gilles Debunne
4609b0a8fc am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 
Merge commit '3d8d9440d844816f065d2b10eb75bb693683cdad' into gingerbread

* commit '3d8d9440d844816f065d2b10eb75bb693683cdad':
  Fixes regarding densities in "Providing Resources" documentation page.
 2010-07-30 11:53:21 -07:00
Gilles Debunne
628be513e6 am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 
Merge commit '83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread

* commit '83884db9dc0fbddb6ece566284259f6b941beb33':
  Fixed doc typos in HeterogeneousExpandableList.java.
 2010-07-30 11:53:16 -07:00
Jean-Baptiste Queru
0f0dd448ea Merge "Fix a bug that prevented the creation of EGL shared contexts." 2010-07-30 11:42:09 -07:00
Romain Guy
42272759e4 Merge "Fix improper clipping after a save()" 2010-07-30 11:41:14 -07:00
Romain Guy
b82da65cb1 Fix improper clipping after a save() 
Change-Id: I13426a67f20d77e2710bd500d82884098f4be97c
 2010-07-30 11:40:21 -07:00
Andy McFadden
1951356a71 Merge "Add support for dalvik.vm.extra-opts property." 2010-07-30 11:26:29 -07:00
Steve Howard
48c05739dd am 6a114b21: am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread 
Merge commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76'

* commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76':
  Update Context.getSystemService() docs for download manager.
 2010-07-30 11:15:44 -07:00
Steve Howard
6a114b211a am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread 
Merge commit '7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp

* commit '7c600369c9695de73ca37db552eb81b8b89d5e76':
  Update Context.getSystemService() docs for download manager.
 2010-07-30 11:12:28 -07:00
Steve Howard
7c600369c9 Merge "Update Context.getSystemService() docs for download manager." into gingerbread 2010-07-30 11:09:48 -07:00