ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,808 Commits 2 Branches 0 Tags 54 MiB
95ed70568f
Commit Graph

11808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
95ed70568f am 202a6734: am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest 
Merge commit '202a6734fd39289257955d404edf7a1165f6e480'

* commit '202a6734fd39289257955d404edf7a1165f6e480':
  Added TransformGestureDetector (still in progress)
 2010-01-12 15:19:28 -08:00
Adam Powell
6f1c63dfbe am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest 
Merge commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp

* commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164':
  Added TransformGestureDetector (still in progress)
 2010-01-12 15:15:43 -08:00
Ken Shirriff
97acf3d48c Merge "Fix calendar sync_account / type constants to be consistent." 2010-01-12 13:47:07 -08:00
Andreas Huber
013fb7fbd5 Merge "Make sure to release the buffer we're not using in case of an error." 2010-01-12 12:20:52 -08:00
Grace Kloba
8c8b8d8875 am ba5220fc: (-s ours) am ce63c639: Merge "DO NOT MERGE." into eclair 
Merge commit 'ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8'

* commit 'ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8':
  DO NOT MERGE.
 2010-01-12 11:57:02 -08:00
Jean-Baptiste Queru
df36dc2c27 Merge "resolved conflicts for merge of d26707da to master" 2010-01-12 11:55:12 -08:00
Jean-Baptiste Queru
40858b24e7 resolved conflicts for merge of d26707da to master 
Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd
 2010-01-12 11:53:42 -08:00
Bjorn Bringert
17c3c4a629 Merge "Add and expose SearchManager.getSearchableInfo()" 2010-01-12 11:21:27 -08:00
Makoto Onuki
831f258fd9 Moved DomainNameChecker to android common. 
- Moved DomainNameChecker from android.net.http to android common, and renamed to DomainNameValidator.
- Added a simplified version of DNParser, which DomainNameValidator uses instead of X509Name in order to extract Subject Name from a certificate.
- Added unit tests for DomainNameChecker and DNParser.

There's a suspicious comment in DomainNameChecker saying something like "X509Certificate fails to parse a certificate when a subject alt name begins with '*'".  I think we should fix it if it's really the case -- otherwise certificates with the wildcard wouldn't work.  I'll see if it's true after submitting this patch.
 2010-01-12 10:27:13 -08:00
Grace Kloba
060d4f411e am ce63c639: Merge "DO NOT MERGE." into eclair 
Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.
 2010-01-12 10:02:48 -08:00
San Mehat
c4284d5f90 am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp

* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
  framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
 2010-01-12 10:02:40 -08:00
Grace Kloba
378a16f1b9 Merge "DO NOT MERGE." into eclair 2010-01-12 10:00:03 -08:00
San Mehat
7ee1a4e444 Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 2010-01-12 09:59:35 -08:00
Andrei Popescu
40d851cc47 Merge "Implement timeupdate events for video tag." 2010-01-12 08:17:27 -08:00
Niko Catania
25eba45256 Merge "Fix the CallerInfo lookup when a phone URL is used." 2010-01-12 07:55:27 -08:00
Jim Miller
08425fb96d Merge "Fix 2332563: Add password-lock support to lockscreen" 2010-01-11 17:12:13 -08:00
Romain Guy
9224d1f1b9 Merge "Fix how RelativeLayout handles alignParentBottom/Right when dimension is wrap_content. Bug: #2194109." 2010-01-11 16:48:10 -08:00
Grace Kloba
f39e0770da Merge "As setNewZoomScale is called asynchronously, the WebView can be destroyed. If it is, skip scaling." 2010-01-11 16:35:32 -08:00
Andreas Huber
2eef630e0d Merge "The mp3 decoder should not assert that decoding was successful but return an error instead." 2010-01-11 16:08:56 -08:00
Tom O'Neill
9a19b5b48c Merge "Improve ContactsContract documentation, esp. of Data inner class" 2010-01-11 15:59:36 -08:00
Xavier Ducrohet
359148c03d am f5a84f8a: am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair 
Merge commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8'

* commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8':
  LayoutLib: support for custom styles.
 2010-01-11 15:30:29 -08:00
Xavier Ducrohet
f9c5c8ca43 am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair 
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp

* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
  LayoutLib: support for custom styles.
 2010-01-11 15:28:07 -08:00
Xavier Ducrohet
94ff01104b Merge "LayoutLib: support for custom styles." into eclair 2010-01-11 15:25:16 -08:00
Dan Egnor
66b5fee3b0 Merge "Simplify & update ANR logging; report ANR data into the dropbox. Eliminate the per-process 200ms timeout during ANR thread-dumping. Dump all the threads at once, then wait for the file to stabilize. Seems to work great and is much, much, much faster." 2010-01-11 15:09:51 -08:00
Andreas Huber
e79d0b8a04 Merge "Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string." 2010-01-11 14:56:39 -08:00
Jean-Michel Trivi
138d6be589 Merge "Apply EQ on the output of the speech synthesis only when using the Pico TTS engine." 2010-01-11 14:26:17 -08:00
Jaikumar Ganesh
18e96ca11a am 495d820c: am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it. 
Merge commit '495d820c0124a811b9352b93ce4fe88c716f259d'

* commit '495d820c0124a811b9352b93ce4fe88c716f259d':
  Don't set priority in Bonding state.
 2010-01-11 14:23:18 -08:00
Tom Taylor
b075b38986 am 2bb1f870: am 1edd8277: Merge "Hide unused fields" into eclair 
Merge commit '2bb1f87089faa14954c1b5afa92a34ea947f5ff6'

* commit '2bb1f87089faa14954c1b5afa92a34ea947f5ff6':
  Hide unused fields
 2010-01-11 14:23:09 -08:00
Jaikumar Ganesh
57bb82bdc4 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it. 
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.
 2010-01-11 14:20:53 -08:00
Tom Taylor
752eae6149 am 1edd8277: Merge "Hide unused fields" into eclair 
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp

* commit '1edd8277440c83ef44e0128e86afb8c002e49b17':
  Hide unused fields
 2010-01-11 14:15:51 -08:00
Derek Sollenberger
a6bea15589 am 1fed31aa: am fef4874a: fixing build break by removing unused imports. 
Merge commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8'

* commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8':
  fixing build break by removing unused imports.
 2010-01-11 14:14:28 -08:00
Tom Taylor
216cb739d8 Merge "Hide unused fields" into eclair 2010-01-11 14:11:46 -08:00
Trevor Johns
247d3a9858 am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'

* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
 2010-01-11 14:08:15 -08:00
Trevor Johns
bd74632bcb am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
 2010-01-11 14:05:55 -08:00
Trevor Johns
3fb5c80eb0 Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 2010-01-11 14:00:54 -08:00
Dirk Dougherty
ae0c32322e am 6b113b1a: am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9'

* commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 13:50:42 -08:00
Grace Kloba
b4d83d5aea am 6c87c77d: (-s ours) am a2b0d38f: First draft of multitouch in the WebView. 
Merge commit '6c87c77de449f6f85b822022501c2de7ecd24660'

* commit '6c87c77de449f6f85b822022501c2de7ecd24660':
  First draft of multitouch in the WebView.
 2010-01-11 13:49:49 -08:00
Derek Sollenberger
ee153b2305 am fef4874a: fixing build break by removing unused imports. 
Merge commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009' into eclair-mr2-plus-aosp

* commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009':
  fixing build break by removing unused imports.
 2010-01-11 13:31:43 -08:00
Derek Sollenberger
4b21578c52 am d55aa751: am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context. 
Merge commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f'

* commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f':
  consolidating to only use one surface per plugin. give plugin access to java context.
 2010-01-11 13:23:41 -08:00
Derek Sollenberger
285a13f335 am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context. 
Merge commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp

* commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
  consolidating to only use one surface per plugin. give plugin access to java context.
 2010-01-11 13:11:13 -08:00
Jack Palevich
fd3f7d68af am 90ce68a9: (-s ours) am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 
Merge commit '90ce68a99f8803643d83be963aa0f28fa952a186'

* commit '90ce68a99f8803643d83be963aa0f28fa952a186':
  DO NOT MERGE A library for encoding and decoding ETC1 textures.
 2010-01-11 13:00:36 -08:00
Vasu Nori
a7a02f9ecb am 9c74295f: am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 
Merge commit '9c74295fb16da0469304a7c04c471915e28d09bd'

* commit '9c74295fb16da0469304a7c04c471915e28d09bd':
  add eventlog message whenever sqlite reports db corruption error
 2010-01-11 13:00:28 -08:00
Scott Main
ee76c1cbeb am c9a26f29: am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering) 
Merge commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d'

* commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d':
  javadoc change: fix the selector sample XML in the class
 2010-01-11 13:00:14 -08:00
Dirk Dougherty
1d4fcc764d am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp

* commit '595f48b2a4fa2751ad638b60d2476e77738b21da':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 11:38:04 -08:00
Dirk Dougherty
8eeeeb1ba4 Merge "SDK doc change: Miscellaneous fixes." into eclair 2010-01-11 11:33:57 -08:00
Mike Lockwood
389e94b37a Merge "Unhide LocationManager APIs needed for unbundled location providers." 2010-01-11 10:48:51 -08:00
Andrei Popescu
c2398cfd06 Merge "Allow a video to be correctly resumed programatically after being paused." 2010-01-11 10:47:23 -08:00
Grace Kloba
e840bede1b am a2b0d38f: First draft of multitouch in the WebView. 
Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp

* commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
  First draft of multitouch in the WebView.
 2010-01-11 10:47:21 -08:00
San Mehat
e669f3d27f Merge "MountService: Clean up some logspam" 2010-01-11 10:10:10 -08:00
Bjorn Bringert
6f71b35998 Merge "Copy SearchSourceSelector from QuickSearchBox" 2010-01-11 08:39:24 -08:00