Commit Graph

33666 Commits

Author SHA1 Message Date
Mike Lockwood
5ebac83e20 MTP: Add support for renaming files
Change-Id: I679d674eb4dae88f60165ab2850cc20eec7ceee3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-12 12:41:58 -04:00
Bjorn Bringert
5684d464c0 Merge "Move SyncStateContentProviderHelper to frameworks/ex" 2010-10-12 02:31:42 -07:00
Wu-cheng Li
7b76bed1ee Merge "Fix camera display orientation." 2010-10-12 01:41:59 -07:00
Wu-cheng Li
b0f7d95bf8 Fix camera display orientation.
bug:3036262
Change-Id: I6fc3dc381fcfaceba09fd5bd14afb85045b3d676
2010-10-12 15:52:44 +08:00
Chris Tate
5994359f30 Be sure to hold the window manager lock around *Lw() methods
Change-Id: Ia0271df34b084bf1d3dc39373dd66b6afe96c379
2010-10-11 20:58:07 -07:00
Jeff Brown
26b6df74b9 Merge "Track input state when transferring touch focus." 2010-10-11 20:29:36 -07:00
Romain Guy
4bede9e425 Add an API to control AbsListView's friction.
Change-Id: Iafb08cd28703d282c369c472a5d85a22cc5dacb7
2010-10-11 19:38:37 -07:00
Hung-ying Tyan
82b4003871 am df08c2f0: am 692cac9f: SipHelper: add debug log for challenge responses.
Merge commit 'df08c2f03e7cf7be7002d34efe8e4e8d24e406de'

* commit 'df08c2f03e7cf7be7002d34efe8e4e8d24e406de':
  SipHelper: add debug log for challenge responses.
2010-10-11 18:59:05 -07:00
Jean-Baptiste Queru
40e7a62789 am 6d1321f0: am 65f23e71: Merge "Corrected visibility reporting error in WindowManager"
Merge commit '6d1321f02f8e8c201469f17a7a62a4d063821b9a'

* commit '6d1321f02f8e8c201469f17a7a62a4d063821b9a':
  Corrected visibility reporting error in WindowManager
2010-10-11 18:58:35 -07:00
Jean-Baptiste Queru
057c13bcce am c43189e7: am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3'

* commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3':
  Hold partial wakelock during shutdown to avoid entering sleep
2010-10-11 18:58:25 -07:00
Jean-Baptiste Queru
81bef57f6d am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing"
Merge commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f'

* commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f':
  Telephony: Fix radio state printing
2010-10-11 18:57:54 -07:00
Jean-Baptiste Queru
6a443f2ee1 am d54a97a0: am fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot"
Merge commit 'd54a97a0efc5cdd8088a277b0e6787ea24711e0c'

* commit 'd54a97a0efc5cdd8088a277b0e6787ea24711e0c':
  Fix time zone info in kernel is nothing after reboot
2010-10-11 18:57:43 -07:00
Jean-Baptiste Queru
a081fa662b am 9dfa3037: am 334a4d84: Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Merge commit '9dfa30375e66ae533e253f5287a8c8e293187e19'

* commit '9dfa30375e66ae533e253f5287a8c8e293187e19':
  Telephony: Remove unused mRuimFileHandler reference from CDMAPhone
2010-10-11 18:57:33 -07:00
Gilles Debunne
8245acaab6 am 1457bb0e: am 6b8bdaa9: New AppsPermission and market style
Merge commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683'

* commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683':
  New AppsPermission and market style
2010-10-11 18:57:14 -07:00
Jeff Brown
9c9f1a3ba1 Track input state when transferring touch focus.
Copies the input state to the destination window and sends synthesic
cancelation events to the source window.

Change-Id: Ia75820b0d756ed5d6cd22dce7830251ac85141ed
2010-10-11 18:32:20 -07:00
Jeff Brown
4231124c9d Merge "Fix an event injection bug when the policy is bypassed." 2010-10-11 18:15:38 -07:00
Romain Guy
d5d2b7382c Merge "Don't draw fully transparent views/primitives." 2010-10-11 18:00:43 -07:00
Romain Guy
dbc26d2ba1 Don't draw fully transparent views/primitives.
Change-Id: Icd7d8ef1f57b51a24faf32f7004125e6300d4fdc
2010-10-11 17:58:29 -07:00
Jeff Brown
e20c9e0264 Fix an event injection bug when the policy is bypassed.
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.

Cherry pick of b931a1b4 from gingerbread into master.

Change-Id: I700a5f07b8b227878cea9437a289a45a245c0424
2010-10-11 17:54:12 -07:00
Jean-Baptiste Queru
02241ab292 am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc'

* commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc':
  Support showing "Cold" battery health.
2010-10-11 17:49:42 -07:00
Jean-Baptiste Queru
76f8688e9b am 779d1778: am bd1454f5: Merge "Include debugger connection status in error entry"
Merge commit '779d1778b6147ee1b57428af234d1498a26f031e'

* commit '779d1778b6147ee1b57428af234d1498a26f031e':
  Include debugger connection status in error entry
2010-10-11 17:49:28 -07:00
David Brown
a23935ab33 am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3'

* commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3':
  Don't manually create CallerInfo objects from SipPhone
2010-10-11 17:48:47 -07:00
Mike Lockwood
986d170182 am 1bdba9fa: am 2f77c3e4: Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
Merge commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61'

* commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61':
  GPS: Fix another race condition in GPS HAL initialization
2010-10-11 17:48:35 -07:00
Justin Ho
e13fc12941 am 90390e69: (-s ours) am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
Merge commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf'

* commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf':
  Updated media playback controls, unlock screen, misc framework assets
2010-10-11 17:48:24 -07:00
Vasu Nori
182e5cf105 am a23964f9: am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread
Merge commit 'a23964f9a1df7fb2f18e350fb4215933674f9991'

* commit 'a23964f9a1df7fb2f18e350fb4215933674f9991':
  bug:3082865 don't use IN to construct sql to delete downloads
2010-10-11 17:43:34 -07:00
Brad Fitzpatrick
d532d8d8c1 am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit 'ca1db5ae68971779fd8af83c908128849f470ae0'

* commit 'ca1db5ae68971779fd8af83c908128849f470ae0':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
2010-10-11 17:43:06 -07:00
Xavier Ducrohet
49bbd66251 am ceb3aae3: am 4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d'

* commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d':
  Avoid pre-processing images when they won't be used
2010-10-11 17:42:54 -07:00
Jeff Brown
dd8b0c9040 am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '41aabeb51305d19747687f246080f44fc2a74435'

* commit '41aabeb51305d19747687f246080f44fc2a74435':
  Added more robust tracking and cancelation of events.
2010-10-11 17:42:30 -07:00
Stephen Hines
5d3f6073bf Merge "Support for unsigned long and unsigned long long." 2010-10-11 17:32:25 -07:00
Romain Guy
20b4cf8cc7 Merge changes I9a5e01bc,If1caee31
* changes:
  Optimize GLSL shaders.
  Improve performance of linear gradients.
2010-10-11 17:13:32 -07:00
Romain Guy
707b2f78cc Optimize GLSL shaders.
Change-Id: I9a5e01bced63d8da0c61330a543a2b805388a59d
2010-10-11 16:34:59 -07:00
Stephen Hines
52d836332f Support for unsigned long and unsigned long long.
Change-Id: I2f9cfb7f352e2e7e7fd49eac42a821c03b5fcb9f
2010-10-11 16:10:42 -07:00
Stephen Hines
1e1ebcb2d0 Merge "Test exported "long" type." 2010-10-11 15:14:36 -07:00
Alex Sakhartchouk
75a3bcc36b Merge "Update allocation from bitmap. GL attribute cleanup in type." 2010-10-11 15:03:29 -07:00
Romain Guy
7537f856f9 Improve performance of linear gradients.
Change-Id: If1caee31fc045dea13a4c5c10f25f2ffd325c4f8
2010-10-11 14:38:28 -07:00
Mike Lockwood
25cf4fd9c7 Merge "MTP: Include size of 12 byte header in packet size for GetObject data packet" 2010-10-11 14:37:06 -07:00
Mike Lockwood
db7743128b MTP: Include size of 12 byte header in packet size for GetObject data packet
Fixes file transfer from device to host with libmtp.

Change-Id: Ifb304c1f106e94b2710ee5c11816b83cf5f25478
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-10-11 17:33:52 -04:00
Stephen Hines
2332340b0e Test exported "long" type.
Change-Id: I1239aecf29f6d25ed975c8d026328366624d58b9
2010-10-11 14:33:21 -07:00
Alex Sakhartchouk
26ae3904e8 Update allocation from bitmap.
GL attribute cleanup in type.

Change-Id: I504dcf6744ad13d65e068e784b6608c999ab48c6
2010-10-11 14:04:09 -07:00
Stephen Hines
3e6fee857a Merge "Fix support for 64-bit integers." 2010-10-11 14:02:08 -07:00
Shimeng (Simon) Wang
21d4e42366 Merge "Initialized the orientation variable to -1." 2010-10-11 13:56:15 -07:00
Shimeng (Simon) Wang
2edfcd584e Initialized the orientation variable to -1.
issue: 3057966
Change-Id: I31047d31376d79b1718c42633c9e6802e51213a7
2010-10-11 13:50:25 -07:00
Shimeng (Simon) Wang
10186c45ff Merge "Avoid sending false orientation event to webkit." 2010-10-11 13:23:42 -07:00
Shimeng (Simon) Wang
5f7c5a25de Avoid sending false orientation event to webkit.
issue: 3057966
Change-Id: I1061df6da751e3a0ef158b5eabfb520d0473d3d0
2010-10-11 13:12:48 -07:00
Romain Guy
7f92b04089 Merge "Redraw the screen when needed." 2010-10-11 12:44:28 -07:00
Romain Guy
101e2ae00c Redraw the screen when needed.
Bug #3085265

Change-Id: Ibb47500f819b823eb4f3dee829f0396dce9a3d65
2010-10-11 12:41:21 -07:00
Stephen Hines
031ec58cfc Fix support for 64-bit integers.
Change-Id: I4e2146a5fda41f280ee3f6f685a34f3cff28f05e
2010-10-11 12:32:33 -07:00
Gilles Debunne
fe14293f58 resolved conflicts for merge of 2da9338c to master
Change-Id: I0a5d667b578e23c064ebe7bacc898125fbf40cc2
2010-10-11 12:23:55 -07:00
Gil Dobjanschi
c5d3229983 Merge "Color effect comments and method name changes." 2010-10-11 12:11:25 -07:00
Mike Lockwood
4cda1e3e8b am 2d39374f: am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread
Merge commit '2d39374f081031871a15c4532242afe9a8738f9f'

* commit '2d39374f081031871a15c4532242afe9a8738f9f':
  GPS: More HAL initialization cleanup
2010-10-11 11:36:01 -07:00