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

20600 Commits

Author SHA1 Message Date
Brad Fitzpatrick
b8796212e3 resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp 
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
 2011-03-15 11:54:46 -07:00
Brad Fitzpatrick
b81d7f8338 am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long." 
* commit '33dd1bae6ef16ed1cdc4d9f82f0c608cc7601af6':
  Fixing improper boxing to Integer instead of Long.
 2011-03-15 11:42:58 -07:00
Brad Fitzpatrick
ceae99835e am 9a01a2f2: Merge "Fixing self-assignment in cloning code." 
* commit '9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
  Fixing self-assignment in cloning code.
 2011-03-15 11:33:40 -07:00
Brad Fitzpatrick
33dd1bae6e am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long." 
* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
  Fixing improper boxing to Integer instead of Long.
 2011-03-15 11:30:08 -07:00
Brad Fitzpatrick
cd7dfcec4b am 40b207c1: Merge "Using proper key for removing object from the map." 
* commit '40b207c131e224554e30cde30fe4ee49817432ee':
  Using proper key for removing object from the map.
 2011-03-15 11:30:04 -07:00
Brad Fitzpatrick
c73c4a36d2 am b37f7e59: Merge changes I81fc2f90,I5e7fd759 
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 11:29:56 -07:00
Brad Fitzpatrick
9a01a2f272 Merge "Fixing self-assignment in cloning code." 2011-03-15 11:15:19 -07:00
Dianne Hackborn
f58f041beb am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit 'cffde30fc10ecdfca53877fbee61525028eb47ba':
  Add some debug code to try to track down issue 3183612
 2011-03-15 11:03:42 -07:00
Brad Fitzpatrick
29d75c9a10 Merge "Fixing improper boxing to Integer instead of Long." 2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
40b207c131 Merge "Using proper key for removing object from the map." 2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
b37f7e59ee Merge changes I81fc2f90,I5e7fd759 
* changes:
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 10:56:16 -07:00
Dianne Hackborn
cffde30fc1 am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
  Add some debug code to try to track down issue 3183612
 2011-03-15 10:52:27 -07:00
Dianne Hackborn
44220a5602 Merge "Add some debug code to try to track down issue 3183612" into gingerbread 2011-03-15 10:29:04 -07:00
Svetoslav Ganov
6d4f318f0c am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 
* commit 'e65711b21f1b351f28d4f04819e1e05a9ac8dfee':
  Tapping on the week number sends the DatePicker to epoch start.
 2011-03-14 23:15:24 -07:00
Svetoslav Ganov
e65711b21f Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 2011-03-14 23:13:49 -07:00
Svetoslav Ganov
1a730dcc4f Tapping on the week number sends the DatePicker to epoch start. 
bug:4093343

1. If getting a day from location in a week view fails
   the out date was cleared but the client was unaware
   of that failure. I have added a return value indicating
   where getting the day from locations was successfull.

Change-Id: I566a9ee33dfe2e64300a4b50dacc652114e01442
 2011-03-14 18:34:55 -07:00
Adam Powell
15c9ab336e am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1 
* commit '57fccf12e1e71089aa01cbf9867314f82db4e6f9':
  Fix bug 4099023 - Phantom clicks on some websites
 2011-03-14 18:33:56 -07:00
Adam Powell
57fccf12e1 Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1 2011-03-14 18:32:45 -07:00
Justin Ho
71ee3ba0f0 am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 
* commit 'f47a16837cc0516e23811850f69839bb2f7ac95b':
  Updated HTML5 media playback controls Bug: 4080127
 2011-03-14 18:25:45 -07:00
Justin Ho
1586c133a3 am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 
* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets
 2011-03-14 18:25:43 -07:00
Justin Ho
7bc341cf80 am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit '3e3175428c81501d72cda3c026b927ca6408243f':
  Updated textfield search assets Bug: 3321263
 2011-03-14 18:25:40 -07:00
Justin Ho
f47a16837c Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 2011-03-14 18:24:13 -07:00
Justin Ho
cc886b9368 Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 2011-03-14 18:24:06 -07:00
Justin Ho
3e3175428c Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-14 18:23:18 -07:00
Justin Ho
4a21cabb9f Fixing naming for disabled paste assets 
Updated paste assets

Bug: 4083486
Change-Id: I21bc469ef42c4eca4bcbea953f3c9e3a72b13388
 2011-03-14 18:19:25 -07:00
Romain Guy
b245e31fa8 am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1 
* commit 'ee7ace065f77b53a57cb6273b9f2f5d85caba90c':
  Fix rendering artifact in edge fades. Bug #4092053
 2011-03-14 18:18:03 -07:00
Romain Guy
ee7ace065f Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1 2011-03-14 18:16:39 -07:00
Romain Guy
7b5b6abf85 Fix rendering artifact in edge fades. 
Bug #4092053

The problem always existed but was made visible by partial invalidation.
When saving a layer, the renderer would try to postpone glClear()
operations until the next drawing command. This however does not work
since the clip might have changed. The fix is rather simple and
simply gets rid of this "optimization" (that turned out to be
usless anyway given how View issues saveLayer() calls.)

This change also fixes an issue with gradients (color stops where
not properly computed when using a null stops array) and optimizes
display lists rendering (quickly rejects larger portions of the
tree to avoid executing unnecessary code.)

Change-Id: I0f5b5f6e1220d41a09cc2fa84c212b0b4afd9c46
 2011-03-14 18:05:08 -07:00
Justin Ho
db92972c53 Updated HTML5 media playback controls 
Bug: 4080127

Change-Id: I89e7822f18c11536aea92adf4a01a5af61ed1186
 2011-03-14 18:01:36 -07:00
Adam Powell
a0def7223f Fix bug 4099023 - Phantom clicks on some websites 
Don't forward touch events when webkit has already claimed it doesn't
want them.

Change-Id: Ib00f9014bb23ff544dde6ec9a50ce71ebcb2bb26
 2011-03-14 17:54:10 -07:00
Mike Lockwood
0958fb1068 am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1 
* commit '221830b93d6f35bcf20db2d34978392b43f44221':
  Add support for USB accessory serial numbers
 2011-03-14 17:41:22 -07:00
Mike Lockwood
015b1ecaec Add support for USB accessory serial numbers 
Change-Id: I47b79f091b300ced60bfc61eff2f771139663aae
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-14 20:10:47 -04:00
Nicolas Roard
373ece1fa1 am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1 
* commit '65c282042dab1dfa75b10517190ba38834782c3b':
  Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
 2011-03-14 15:39:37 -07:00
Nicolas Roard
b6866f81a9 am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 
* commit '0fd8fa33e28df28568532c30f53a91a8d652b35d':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 15:21:46 -07:00
Nicolas Roard
3efaa34015 Adding placeholders for the large play button 
used by the browser for HTML5 video (the button will appear
surimposed to the video)

bug:4080127
Change-Id: I681d2a4a3de1b2db64ffb3bbf4ce883320c771f1
 2011-03-14 15:14:28 -07:00
Nicolas Roard
0fd8fa33e2 Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 2011-03-14 15:11:55 -07:00
Huahui Wu
9691d3f318 am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 
* commit 'b71020ef4018195a21d2538ea3767b901610daf4':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 14:46:27 -07:00
Eric Fischer
d5e8dae883 Import revised translations. DO NOT MERGE 
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
 2011-03-14 14:44:41 -07:00
Scott Main
c899d32e8b docs: update search dev guide with SearcView widget 
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
 2011-03-14 14:44:41 -07:00
Eric Fischer
e0b33ce0c3 Add "new incognito window" translations. 
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.

Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
 2011-03-14 14:44:40 -07:00
Huahui Wu
b71020ef40 Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 2011-03-14 14:43:46 -07:00
Scott Main
462012db70 am abdf0d53: docs: update search dev guide with SearcView widget 
* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:36:56 -07:00
Dianne Hackborn
cf3004a46e Add some debug code to try to track down issue 3183612 
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.

Change-Id: I3e84f8795941744e697824a5e5b2e651f565b253
 2011-03-14 14:24:04 -07:00
Justin Ho
5e6b4b0392 Updated textfield search assets 
Bug: 3321263

Change-Id: I3e453f5d969cc94b11ec51a3807bc74948473833
 2011-03-14 14:19:17 -07:00
Eric Fischer
175121a513 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-14 14:17:01 -07:00
Eric Fischer
9f70f5268f Merge "Add "new incognito window" translations." into honeycomb-mr1 2011-03-14 14:13:29 -07:00
Eric Fischer
7b31d5c84f Import revised translations. DO NOT MERGE 
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
 2011-03-14 14:06:03 -07:00
Nicolas Roard
5ee534cf88 Adding placeholders for the fullscreen button 
used by the browser for HTML5 video

bug:4080127
Change-Id: I8fedef7eb0442de547ff083f15f6fcc7a9fea791
 2011-03-14 13:59:04 -07:00
Ramesh Sudini
c06c5c1a13 Do not merge: Telephony: Fix config to reflect the correct CM conn type. 
Reflect the correct connectivity manager connection type in the config.xml.

Change-Id: Ida4d0a6275addda6fe11878fa96dbac70283df91
 2011-03-14 13:44:30 -07:00
Wink Saville
c3853f3664 Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 2011-03-14 13:41:26 -07:00