Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,023 Commits 3 Branches 0 Tags
8d7ca86ce6adace7e1ae113e279336db87043ae6
Commit Graph

4441 Commits

Author SHA1 Message Date
Romain Guy
7174f15fd7 am 2fbdbb65: am 5392556b: Merge change I5910a70c into eclair 
Merge commit '2fbdbb657a1ae591fc69821675124b1fbe6f06c5'

* commit '2fbdbb657a1ae591fc69821675124b1fbe6f06c5':
  Fix documentation.
 2009-10-01 12:17:12 -07:00
Andrei Popescu
9af8374e09 am 5b95f833: am 486733c1: Merge change I94856f6d into eclair 
Merge commit '5b95f83356f130e138f3e9a26a1580c479eb955d'

* commit '5b95f83356f130e138f3e9a26a1580c479eb955d':
  Update <video> implementation after new IRC discussion with Eric Carlsson.
 2009-10-01 12:16:14 -07:00
Romain Guy
d41d29a370 am 7c749f81: am 27d8514f: Merge change I78f113bc into eclair 
Merge commit '7c749f81a64f8778af66429dd041fafcce32e503'

* commit '7c749f81a64f8778af66429dd041fafcce32e503':
  Fix possible crash in AutoCompleteTextView.
 2009-10-01 12:15:55 -07:00
Nick Pelly
34714f24c9 am 83f86de3: am 285f2422: Merge change I28bad882 into eclair 
Merge commit '83f86de3de60ea24462a0e04a09ddb4a435966c9'

* commit '83f86de3de60ea24462a0e04a09ddb4a435966c9':
  Fix broken build.
 2009-10-01 12:15:14 -07:00
Amith Yamasani
b9174e0239 am 2fe7c9e5: am 86aece8b: Merge change I8dfd6ea8 into eclair 
Merge commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d'

* commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d':
  Handle bad lines in /proc/wakelocks : Fix for 2124260
 2009-10-01 12:14:46 -07:00
Evan Millar
b6fc6f225a am 09aa95bf: am 1537a255: Merge change I46a6d39c into eclair 
Merge commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d'

* commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d':
  Remove unused api in QuickContact.java and fix the build.
 2009-10-01 12:14:35 -07:00
Daisuke Miyakawa
832fa33955 am 367e1af2: am 255d51cc: Merge change Ia6fc04c8 into eclair 
Merge commit '367e1af28754dd952a8da6f262c41dc5004c2366'

* commit '367e1af28754dd952a8da6f262c41dc5004c2366':
  Remove android.syncml package completely.
 2009-10-01 12:14:07 -07:00
Zhu Lan
e7b2d93f22 am ba61cff4: am e5661c40: Merge change I8366852f into eclair 
Merge commit 'ba61cff482a048131937d82f0d9652c799383314'

* commit 'ba61cff482a048131937d82f0d9652c799383314':
  Bluetooth A2DP suspend/resume functionality
 2009-10-01 12:13:57 -07:00
Daisuke Miyakawa
825af8cb2c am ee1a41d0: am 85d86af9: Merge change I82be558f into eclair 
Merge commit 'ee1a41d00adab64cd426d13d72551f28077adaff'

* commit 'ee1a41d00adab64cd426d13d72551f28077adaff':
  Fix vCard composer in three points.
 2009-10-01 12:12:34 -07:00
Fred Quintana
c8735f183a am 32a702a7: am 609c2c08: Merge change Ia54b1bf0 into eclair 
Merge commit '32a702a7a8a328a7080c18fd65478caf82d86e0e'

* commit '32a702a7a8a328a7080c18fd65478caf82d86e0e':
  - make SyncManager get the accounts list during the constructor,
 2009-10-01 12:12:25 -07:00
Jaikumar Ganesh
5ffad23e91 am 8d984bc9: am 017c5de1: Merge change I78c4e64a into eclair 
Merge commit '8d984bc9c351e18271213c58ae7baea5cc81fda6'

* commit '8d984bc9c351e18271213c58ae7baea5cc81fda6':
  Query from Bluez if name is not present in cache.
 2009-10-01 12:11:18 -07:00
Android Git Automerger
6eb1d79db5 merge 54e7073f, ignoring preloaded-classes 2009-10-01 12:07:15 -07:00
Andrei Popescu
ace8382a05 am d01d77f5: am 6e58cf21: Merge change I020d2e34 into eclair 
Merge commit 'd01d77f5cc9ac037c5bc9c5b05f1decfec0abbe2'

* commit 'd01d77f5cc9ac037c5bc9c5b05f1decfec0abbe2':
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
 2009-10-01 11:58:17 -07:00
Bryan Mawhinney
94b9befdf9 am 973c0998: am fb54aadd: Merge change Ic3aa7aa6 into eclair 
Merge commit '973c0998b243a2fbfc1419238d50726c67c12cfb'

* commit '973c0998b243a2fbfc1419238d50726c67c12cfb':
  Recreate search dialog view each time it's shown.
 2009-10-01 11:56:56 -07:00
Cary Clark
4c49cfb0dd am 8fbd4a7a: am 0c5924e9: preserve webkit-side text selection 
Merge commit '8fbd4a7a6bb9dd68d39fff6c3b1fd91303765fc4'

* commit '8fbd4a7a6bb9dd68d39fff6c3b1fd91303765fc4':
  preserve webkit-side text selection
 2009-10-01 11:56:46 -07:00
Leon Clarke
1b46ea41d3 am 2f208646: am ccf6947e: Merge change Ib89f80df into eclair 
Merge commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3'

* commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3':
  Re-instate the link coloring on startup, but going via the browser
 2009-10-01 11:55:25 -07:00
Jim Miller
1959d9321f am 2c799f05: am badfac38: Merge change I85d63002 into eclair 
Merge commit '2c799f0534215e76ad2cd0fd4a513bd9f1fa0252'

* commit '2c799f0534215e76ad2cd0fd4a513bd9f1fa0252':
  Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView.
 2009-10-01 11:55:15 -07:00
Ray Chen
ede7a8220e am 5a92f5dc: am 49e750a3: Merge change I7495977a into eclair 
Merge commit '5a92f5dc80ae74ad859b86c6d18d8ad42cc799a3'

* commit '5a92f5dc80ae74ad859b86c6d18d8ad42cc799a3':
  Add cancelThumbnailRequest to thumbnail API.
 2009-10-01 11:52:39 -07:00
Costin Manolache
d153ea28e0 am 264f9b45: am 3348f14b: Remove GAIA string 
Merge commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376'

* commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376':
  Remove GAIA string
 2009-10-01 11:51:16 -07:00
Mike Cleron
a8b2d463b8 am 90183823: am b4ee8349: Merge change I290947bb into eclair 
Merge commit '90183823b00ad5ce04948cf03d827a47c82ca445'

* commit '90183823b00ad5ce04948cf03d827a47c82ca445':
  Git sucks
 2009-10-01 11:50:07 -07:00
Mike LeBeau
7b86961d45 am 6cf9ab65: am 2e4dbe70: Unhide APIs for enabling geolocation in web views. I\'ve confirmed with Grace that these are okay to unhide. 
Merge commit '6cf9ab65888265aa87139694ed94ba0830b54707'

* commit '6cf9ab65888265aa87139694ed94ba0830b54707':
  Unhide APIs for enabling geolocation in web views. I've confirmed
 2009-10-01 11:47:43 -07:00
Wu-cheng Li
42a7e790dd am 0ce5a41c: am 8d1ff3a4: Merge change I77153ee0 into eclair 
Merge commit '0ce5a41c6074f40800dfcb5c48de0abef41f9833'

* commit '0ce5a41c6074f40800dfcb5c48de0abef41f9833':
  Hide zoom api.
 2009-10-01 11:43:43 -07:00
Evan Millar
55a0cd658a am a7155663: am c4e20e9e: Merge change Iae12c7f0 into eclair 
Merge commit 'a715566313f192e3c447d1cea351c7e4ad49789a'

* commit 'a715566313f192e3c447d1cea351c7e4ad49789a':
  Add REQUESTING_PACKAGE_PARAM_KEY.
 2009-10-01 11:41:15 -07:00
Jim Miller
0e08e9f7fa am 10abe7f3: am 98747715: Merge change I88614e93 into eclair 
Merge commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50'

* commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50':
  Fix for 2137900: Be more conservative about poking the wakelock.
 2009-10-01 11:40:43 -07:00
Romain Guy
f36c579279 am de63adcc: am 8eb0f348: Merge change I67285c9a into eclair 
Merge commit 'de63adcc2679b75ab5a9fbee7c36338ae1f98afd'

* commit 'de63adcc2679b75ab5a9fbee7c36338ae1f98afd':
  Prevent NPE when doing a fillSpecific layout.
 2009-10-01 11:39:41 -07:00
lknguyen
385fac09b9 am ed7f8831: am de04cb81: Merge change Ie9f76062 into eclair 
Merge commit 'ed7f883187f8f6c6dfd240412523a911f616b688'

* commit 'ed7f883187f8f6c6dfd240412523a911f616b688':
  Add Gservices flag for Vending doctor download complete timeout.
 2009-10-01 11:39:28 -07:00
Daisuke Miyakawa
7aa7084bbc am 9e2421a3: am a39f9188: Merge change I9c45753b into eclair 
Merge commit '9e2421a3a3b22119a65665c7825de08ee5c5697b'

* commit '9e2421a3a3b22119a65665c7825de08ee5c5697b':
  Clean up vCard code.
 2009-10-01 11:36:59 -07:00
Jason Parks
094d8f4045 am bc82ea5d: am ac35dc47: Merge change I1cd7d0e5 into eclair 
Merge commit 'bc82ea5d441fa37029c4260c74ee0ed4bd1402ac'

* commit 'bc82ea5d441fa37029c4260c74ee0ed4bd1402ac':
  Implement the checkin option in AccountManagerService.dump()
 2009-10-01 11:36:49 -07:00
Mark Wagner
fbccf1f41d am 10662ae7: am d35afcda: Merge change Ib2c6429d into eclair 
Merge commit '10662ae78f8900e28f13f6abdeee002c25b8c18d'

* commit '10662ae78f8900e28f13f6abdeee002c25b8c18d':
  border for the non-badge case
 2009-10-01 11:36:38 -07:00
Cary Clark
5e56933a10 am dfab8b68: am 4fbf81bc: check for null item in web history in saveState 
Merge commit 'dfab8b687039ef764249c22c00d0b030c55067da'

* commit 'dfab8b687039ef764249c22c00d0b030c55067da':
  check for null item in web history in saveState
 2009-10-01 11:35:23 -07:00
Cary Clark
05bcbd6280 am ed843820: am eaa18dec: scroll text field with touch 
Merge commit 'ed843820f7aa93e0d3a2529956414a2ed940fa89'

* commit 'ed843820f7aa93e0d3a2529956414a2ed940fa89':
  scroll text field with touch
 2009-10-01 11:33:08 -07:00
Jeff Hamilton
2e2d8e92a0 am 11bb09c3: am f993fefc: Merge change Icbd74742 into eclair 
Merge commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3'

* commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3':
  EventLog when a database file is deleted due to corruption.
 2009-10-01 11:19:08 -07:00
Leon Scroggins
d809c7dcd7 am a4f2ac7e: am d84e7d53: Allow scrolls to continue when getting a new content size. 
Merge commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c'

* commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c':
  Allow scrolls to continue when getting a new content size.
 2009-10-01 11:18:05 -07:00
Dianne Hackborn
a085d5e747 am 0b03fa8b: am 490d5222: Merge change I6cacaa0d into eclair 
Merge commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad'

* commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
 2009-10-01 11:16:09 -07:00
Grace Kloba
3af7c575bd am 4435baa4: am 7745e035: Merge change I94c715d6 into eclair 
Merge commit '4435baa48a64ed985e6f7fa8d132560341a78470'

* commit '4435baa48a64ed985e6f7fa8d132560341a78470':
  Skip requestRectangleOnScreen for WebTextView during
 2009-10-01 11:13:01 -07:00
Bjorn Bringert
bf1bc07b44 am c055f869: am 7db7e6a0: Merge change I17f45d35 into eclair 
Merge commit 'c055f869867be98c9a4f2ca5e1532c007a8d1998'

* commit 'c055f869867be98c9a4f2ca5e1532c007a8d1998':
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
 2009-10-01 11:11:55 -07:00
Dianne Hackborn
dcb305f42e am ce37120d: am 7eca687c: Fix bug where we would return null with disabled components. 
Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'

* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
  Fix bug where we would return null with disabled components.
 2009-10-01 11:11:30 -07:00
Dianne Hackborn
892a216105 am 4df43ab1: am ffc16544: Merge change Ib7c1701a into eclair 
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'

* commit '4df43ab1d834f839f3b1e535554836a936902d00':
  Fix issue #1930911: Crash in system process
 2009-10-01 11:10:25 -07:00
Mike Cleron
74516d0096 am e6566064: am 0368334d: Merge change Ie1072f12 into eclair 
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'

* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
  Finish off java API to allow fading scrollbars
 2009-10-01 11:06:05 -07:00
Romain Guy
2fbdbb657a am 5392556b: Merge change I5910a70c into eclair 
Merge commit '5392556b65261b5da86301d9b038a12cf70e6197' into eclair-plus-aosp

* commit '5392556b65261b5da86301d9b038a12cf70e6197':
  Fix documentation.
 2009-09-30 13:35:17 -07:00
Android (Google) Code Review
5392556b65 Merge change I5910a70c into eclair 
* changes:
  Fix documentation.
 2009-09-30 16:29:43 -04:00
Romain Guy
040c218429 Fix documentation. 
Change-Id: I5910a70ccc2abd2b52f07d3a7204241e1879099a
 2009-09-30 13:29:10 -07:00
Andrei Popescu
5b95f83356 am 486733c1: Merge change I94856f6d into eclair 
Merge commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71' into eclair-plus-aosp

* commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71':
  Update <video> implementation after new IRC discussion with Eric Carlsson.
 2009-09-30 13:04:42 -07:00
Android (Google) Code Review
486733c1fd Merge change I94856f6d into eclair 
* changes:
  Update <video> implementation after new IRC discussion with Eric Carlsson.
 2009-09-30 15:55:41 -04:00
Romain Guy
7c749f81a6 am 27d8514f: Merge change I78f113bc into eclair 
Merge commit '27d8514f56574011c606daedc5cabf0219b5be81' into eclair-plus-aosp

* commit '27d8514f56574011c606daedc5cabf0219b5be81':
  Fix possible crash in AutoCompleteTextView.
 2009-09-30 12:50:25 -07:00
Android (Google) Code Review
27d8514f56 Merge change I78f113bc into eclair 
* changes:
  Fix possible crash in AutoCompleteTextView.
 2009-09-30 15:42:11 -04:00
Nick Pelly
83f86de3de am 285f2422: Merge change I28bad882 into eclair 
Merge commit '285f242214d38352b844898edffc8eb336d0c19e' into eclair-plus-aosp

* commit '285f242214d38352b844898edffc8eb336d0c19e':
  Fix broken build.
 2009-09-30 12:16:01 -07:00
Andrei Popescu
50c862324b Update <video> implementation after new IRC discussion with Eric Carlsson. 
- move poster drawing on the WebKit side
- get rid of the child views
- add prepareToPlay method to the MediaPlayer iface.

Fixes http://b/issue?id=2156592
 2009-09-30 20:09:29 +01:00
Android (Google) Code Review
285f242214 Merge change I28bad882 into eclair 
* changes:
  Fix broken build.
 2009-09-30 15:08:29 -04:00
Nick Pelly
e766eae938 Fix broken build. 
Should be bool not int. Forgot to roll in local changes to last commit.

Change-Id: I28bad88238e5b715a5033b0d5a897d924ef8b538
 2009-09-30 12:06:28 -07:00