Commit Graph

28047 Commits

Author SHA1 Message Date
Nipun Kwatra
f9263dd0ea Merge "When using still camera for time lapse capture, don't set preview." 2010-08-06 09:02:11 -07:00
Maksymilian Osowski
f2cbc68d73 Merge "Added detection of missing EventSender functions." 2010-08-06 08:11:15 -07:00
Mike Lockwood
7503b96e8e am 19be0bd0: am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
Merge commit '19be0bd07e348fc405e1c46a698843695fc64e48'

* commit '19be0bd07e348fc405e1c46a698843695fc64e48':
  GPS: Don't set XTRA download pending flag at boot time.
2010-08-06 07:44:28 -07:00
Mike Lockwood
19be0bd07e am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
Merge commit '5723dfe8c87d0887b8926f43637ed300466890d2' into gingerbread-plus-aosp

* commit '5723dfe8c87d0887b8926f43637ed300466890d2':
  GPS: Don't set XTRA download pending flag at boot time.
2010-08-06 07:41:44 -07:00
Mike Lockwood
5723dfe8c8 GPS: Don't set XTRA download pending flag at boot time.
XTRA data downloads are now strictly on demand from the GPS engine.
Also fix typo in handleDownloadXtraData()

Change-Id: Ied1a6e2e62134add4d965326aae909c86f834682
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-06 10:15:15 -04:00
Maksymilian Osowski
7e2a39b598 Added detection of missing EventSender functions.
Change-Id: I5268a66089d5e29a9ae5e496d05f3c79465771f5
2010-08-06 10:11:12 +01:00
Chia-chi Yeh
5727e6cc82 am 69a8d4a8: am 4c5d28ce: RTP: move into frameworks.
Merge commit '69a8d4a8723d5c9fd7d93a15d09b3809cd56f50a'

* commit '69a8d4a8723d5c9fd7d93a15d09b3809cd56f50a':
  RTP: move into frameworks.
2010-08-05 23:19:42 -07:00
Chia-chi Yeh
69a8d4a872 am 4c5d28ce: RTP: move into frameworks.
Merge commit '4c5d28cee0537c83ff0e5bc0daaae78f68dfc7c8' into gingerbread-plus-aosp

* commit '4c5d28cee0537c83ff0e5bc0daaae78f68dfc7c8':
  RTP: move into frameworks.
2010-08-05 23:17:23 -07:00
Chia-chi Yeh
4c5d28cee0 RTP: move into frameworks.
Change-Id: Ic9c17b460448c746b21526ac10b647f281ae48e9
2010-08-06 14:12:05 +08:00
Chung-yih Wang
910cf20289 Merge "Fix the SipPhone codes related to the ITelephone interface change." 2010-08-05 22:47:09 -07:00
Chung-yih Wang
88e590fb37 Fix the SipPhone codes related to the ITelephone interface change.
Change-Id: Id8ab7a6e4feaac67cd09e8412af61b40c6e774b4
2010-08-06 13:36:10 +08:00
Carl Shapiro
5187d2f43f Merge "Remove overwritefree property. The underlying flag no longer exists." 2010-08-05 22:08:52 -07:00
Nipun Kwatra
453e92f6e1 When using still camera for time lapse capture, don't set preview.
Since HD resolution may not be supported by the video camera,
don't set preivew using the HD size. The app should have set the
preview already, just use that.

Change-Id: I2f8e89bf2c7440f7bc8db7e4a228f4c8250d92b4
2010-08-05 21:30:08 -07:00
Chung-yih Wang
cffebf85be am 6866ecb9: am 1d62c773: Fix the build
Merge commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea'

* commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea':
  Fix the build
2010-08-05 21:13:25 -07:00
Chung-yih Wang
e6747b6787 am e7b92260: am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread
Merge commit 'e7b92260e228039295874bea024b629cb5a4d89a'

* commit 'e7b92260e228039295874bea024b629cb5a4d89a':
  Revert "Revert "Move SIP telephony related codes to framework.""
2010-08-05 21:11:09 -07:00
Chung-yih Wang
6866ecb927 am 1d62c773: Fix the build
Merge commit '1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp

* commit '1d62c7737c33f92e79f0a180b05969f52484e64c':
  Fix the build
2010-08-05 21:10:06 -07:00
Chung-yih Wang
024d59601e resolved conflicts for merge of a06ad953 to master
Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
2010-08-06 12:06:04 +08:00
Chung-yih Wang
1d62c7737c Fix the build
Change-Id: I410e2fd057b68e1b5b5b33ee10178a01d3c9b2fa
2010-08-06 11:52:38 +08:00
Carl Shapiro
a8bc19901c Remove overwritefree property. The underlying flag no longer exists.
Change-Id: Iecd1710887a7b16536cdbd52846952cc72cc0727
2010-08-05 20:24:40 -07:00
Chung-yih Wang
e7b92260e2 am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread
Merge commit 'b9605886d1a94de624b6feb5a81bb37f41653437' into gingerbread-plus-aosp

* commit 'b9605886d1a94de624b6feb5a81bb37f41653437':
  Revert "Revert "Move SIP telephony related codes to framework.""
2010-08-05 19:38:04 -07:00
Chung-yih Wang
a06ad953a2 am 7324489f: Merge "Add SIP service into system server." into gingerbread
Merge commit '7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp

* commit '7324489f18ee01586931f577f00567092cbf52df':
  Add SIP service into system server.
2010-08-05 19:37:59 -07:00
Chung-yih Wang
b9605886d1 Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 2010-08-05 19:35:54 -07:00
Chung-yih Wang
7324489f18 Merge "Add SIP service into system server." into gingerbread 2010-08-05 19:35:45 -07:00
Jason Sams
b423dac932 Merge "Fix length normilization bug in rsMatrixLoadRotate." 2010-08-05 19:08:46 -07:00
Romain Guy
855e0d58c7 Merge "Add 3d transformation test." 2010-08-05 19:08:15 -07:00
Romain Guy
ba7186e082 Add 3d transformation test.
Change-Id: Ia163af802e5a320490196461a97d5f797b71abb4
2010-08-05 19:08:32 -07:00
Adam Powell
a1e309632d am a68a0ebb: (-s ours) am 740aa4b2: am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
Merge commit 'a68a0ebb51fdf00e0be0b77f03c6f3af3095973d'

* commit 'a68a0ebb51fdf00e0be0b77f03c6f3af3095973d':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
2010-08-05 18:46:57 -07:00
Adam Powell
a68a0ebb51 am 740aa4b2: am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
Merge commit '740aa4b2865a20700254314158bcb685514b2ac2' into gingerbread-plus-aosp

* commit '740aa4b2865a20700254314158bcb685514b2ac2':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
2010-08-05 18:44:49 -07:00
Adam Powell
740aa4b286 am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
Merge commit '9093717985095913934c079abfa879049bd33ba5' into gingerbread

* commit '9093717985095913934c079abfa879049bd33ba5':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
2010-08-05 18:39:37 -07:00
Adam Powell
9093717985 Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 2010-08-05 18:33:31 -07:00
Dianne Hackborn
5e0d59547c Fix some Loader bugs.
- Weren't re-attaching to the current loader manager after retaining
  instance state.
- Ensure loaders are being destroyed.
- Fix a bug if you call restartLoader() inside of onLoadFinished().

Change-Id: I89df53db49d8e09047bf55216ebeb0f133c059e7
2010-08-05 18:25:32 -07:00
Jason Sams
41d9825b9a Fix length normilization bug in rsMatrixLoadRotate.
Change-Id: Ibdc1a64f2db6110acd971f8cacd6b1f9c09b02de
2010-08-05 18:11:49 -07:00
Fred Quintana
c6e7d7658c am c2a836a5: am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c'

* commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c':
  Changed SyncOperation.toKey() to not rely on the implementation of
2010-08-05 17:57:11 -07:00
Fred Quintana
c2a836a5f4 am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803' into gingerbread-plus-aosp

* commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803':
  Changed SyncOperation.toKey() to not rely on the implementation of
2010-08-05 17:51:28 -07:00
Fred Quintana
5005a6c031 am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39' into gingerbread

* commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39':
  Changed SyncOperation.toKey() to not rely on the implementation of
2010-08-05 17:42:05 -07:00
Chung-yih Wang
2d94231ef9 Add SIP service into system server.
Change-Id: Icc39e4e54768cfdcc1b20a3efe6206009b9a8d10
2010-08-06 08:40:50 +08:00
Jason Sams
f6b5306e90 Merge "Use lowp colors in fixed funtion emulation." 2010-08-05 17:39:52 -07:00
Jason Sams
1911c60a4e Use lowp colors in fixed funtion emulation.
Change-Id: Ie525ee6e52652ba83efe4d9f1627410d846824ee
2010-08-05 17:38:29 -07:00
Fred Quintana
cdf16787fc Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 2010-08-05 17:36:27 -07:00
Eric Fischer
001951499c Merge "Import revised translations." 2010-08-05 17:27:46 -07:00
Fred Quintana
b4b7b4837b Changed SyncOperation.toKey() to not rely on the implementation of
Account.toString()

bug: 2898033
Change-Id: I6bfac976127190d2d667312df7aa9c7d57b21555
2010-08-05 17:26:58 -07:00
Romain Guy
8cc44cb669 Merge "Add support for paths." 2010-08-05 17:25:48 -07:00
Romain Guy
7fbcc0492f Add support for paths.
Rendering is implementing by rasterizing the paths into A8 textures.
This cna be extremely inefficient if the path changes often.

Change-Id: I609343f304ae38e0d319359403ee73b9b5b3c93a
2010-08-05 17:23:49 -07:00
Vasu Nori
434e4b4b64 am bde1fc84: am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread
Merge commit 'bde1fc848d6b2b6b7e0dc9df99d77ae43264b333'

* commit 'bde1fc848d6b2b6b7e0dc9df99d77ae43264b333':
  (gingerbread) remove unused tests. bug:2898376
2010-08-05 17:18:24 -07:00
Vasu Nori
bde1fc848d am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread
Merge commit '499b743851aa84b9fc1a7e445e189946bc47ad5d' into gingerbread-plus-aosp

* commit '499b743851aa84b9fc1a7e445e189946bc47ad5d':
  (gingerbread) remove unused tests. bug:2898376
2010-08-05 17:15:08 -07:00
Vasu Nori
499b743851 Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread 2010-08-05 17:11:53 -07:00
Vasu Nori
286b9770cc (gingerbread) remove unused tests. bug:2898376
Change-Id: Icc4c8ed20c9e910784bf202415d58e4af2366bee
2010-08-05 16:56:09 -07:00
Elliott Slaughter
f21d2e3059 Initial work on browser incognito mode history feature.
Change-Id: I050edf263d5c4ee0c0373692e267d7e19f47ba1b
2010-08-05 16:22:33 -07:00
Eric Fischer
b301814161 Import revised translations.
Change-Id: Ic46c123f6c639c612830db8e2c4c742d71a172c9
2010-08-05 16:03:00 -07:00
Scott Main
230182701c am dd08aca6: am 432a2a1b: am 005e2400: Merge "fix xml sample error" into froyo
Merge commit 'dd08aca684a3ddbeacd58591743e654fc4bc7581'

* commit 'dd08aca684a3ddbeacd58591743e654fc4bc7581':
  fix xml sample error
2010-08-05 15:59:10 -07:00