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

28026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Scott Main
dd08aca684 am 432a2a1b: am 005e2400: Merge "fix xml sample error" into froyo 
Merge commit '432a2a1bc7fb66e604772052f770857c149b2f97' into gingerbread-plus-aosp

* commit '432a2a1bc7fb66e604772052f770857c149b2f97':
  fix xml sample error
 2010-08-05 15:56:13 -07:00
Scott Main
432a2a1bc7 am 005e2400: Merge "fix xml sample error" into froyo 
Merge commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c' into gingerbread

* commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c':
  fix xml sample error
 2010-08-05 15:53:04 -07:00
Eric Fischer
625c2f8d6b Merge "Fix a bug where paragraph styles could leak onto an adjacent empty line." 2010-08-05 15:51:54 -07:00
Adam Powell
a55191fe8f DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller 
Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
 2010-08-05 15:50:31 -07:00
Scott Main
005e2400b5 Merge "fix xml sample error" into froyo 2010-08-05 15:49:08 -07:00
Jason Sams
fa56dd30e2 Merge "Fix behavior where the non-blocking sendToCliend would block when there was enough room for the message but not the message header." 2010-08-05 15:46:10 -07:00
Scott Main
307351a22d fix xml sample error 
Change-Id: Ifd188a5866382a79c2c9de94c0682b707baffdcf
 2010-08-05 15:44:26 -07:00
Eric Fischer
74d31ef2b2 Fix a bug where paragraph styles could leak onto an adjacent empty line. 
When the text ends with an empty line, the getSpans() call to retrieve
styles for it would also retrieve the styles of the preceding line.
Add a special case to detect and prevent this.

Change-Id: I888131cacce6bf45e68c53c931ebe8d58db0b7a9
 2010-08-05 15:29:36 -07:00
Eric Rowe
3417024b03 am 5c0f1e0a: am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit '5c0f1e0a870b5792bbc0456eef6fd21642db3798'

* commit '5c0f1e0a870b5792bbc0456eef6fd21642db3798':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:25:26 -07:00
James Dong
84d65c725b am 9c09a605: am 1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread 
Merge commit '9c09a60513faf39901bb8e4681d39812204b3f73'

* commit '9c09a60513faf39901bb8e4681d39812204b3f73':
  Use the target color format from the camera source if possible
 2010-08-05 15:25:18 -07:00
Eric Rowe
5c0f1e0a87 am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2' into gingerbread-plus-aosp

* commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:18:22 -07:00
James Dong
9c09a60513 am 1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread 
Merge commit '1441bdfc19d6998607adf1347ed8dafc102908c9' into gingerbread-plus-aosp

* commit '1441bdfc19d6998607adf1347ed8dafc102908c9':
  Use the target color format from the camera source if possible
 2010-08-05 15:18:16 -07:00
Jason Sams
b39a8272f5 Fix behavior where the non-blocking sendToCliend would block 
when there was enough room for the message but not the message header.

Change-Id: I600db04b91e76fa7966c7d8a98e5c56593e1806d
 2010-08-05 15:17:15 -07:00
Eric Rowe
f9ea8ec57e am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit '982f1521a662d274eca1216707d874f148396ac6' into gingerbread

* commit '982f1521a662d274eca1216707d874f148396ac6':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:10:15 -07:00
James Dong
1441bdfc19 Merge "Use the target color format from the camera source if possible" into gingerbread 2010-08-05 15:10:03 -07:00
Oscar Montemayor
7a1778afcd Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Simplified locking scheme in Proxy's getProxy(..) method. Also modified ContentObserver creation to be done from any thread." 2010-08-05 15:07:03 -07:00
Oscar Montemayor
6f71b42bc4 Fix for bug 2890320 Browser crashes, after adding bookmark. 
Simplified locking scheme in Proxy's getProxy(..) method.
Also modified ContentObserver creation to be done from any thread.

Change-Id: I54edb56a86796f08a1310cf1ae1d1f0c42a0cbc8
 2010-08-05 14:49:28 -07:00
Eric Rowe
982f1521a6 Merge "Checkin initial bluetooth stress tests." into froyo 2010-08-05 14:49:22 -07:00
Eric Rowe
14db8d9978 Checkin initial bluetooth stress tests. 
Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.

Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f
 2010-08-05 14:45:44 -07:00
Dianne Hackborn
90d5e8c08b Fix build. 
Change-Id: I18c0af97c7e204f023cea77e3e5d08eb37596222
 2010-08-05 14:28:57 -07:00