Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,971 Commits 3 Branches 0 Tags
2d14045754007c05d99c0ccb4b783c2fef26f33a
Commit Graph

4397 Commits

Author SHA1 Message Date
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
Evan Millar
54e7073fef am 1935a341: Merge change I9d12beeb into eclair 
Merge commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc' into eclair-plus-aosp

* commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc':
  Change FasttrackBadgeWidget->QuickContactBadge and make public.
 2009-09-30 10:08:59 -07:00
Android (Google) Code Review
1935a3417e Merge change I9d12beeb into eclair 
* changes:
  Change FasttrackBadgeWidget->QuickContactBadge and make public.
 2009-09-30 13:00:46 -04:00
Andrei Popescu
d01d77f5cc am 6e58cf21: Merge change I020d2e34 into eclair 
Merge commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17' into eclair-plus-aosp

* commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17':
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
 2009-09-30 09:13:33 -07:00
Android (Google) Code Review
6e58cf2108 Merge change I020d2e34 into eclair 
* changes:
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
 2009-09-30 12:07:24 -04:00
Evan Millar
c1a2a8296e Change FasttrackBadgeWidget->QuickContactBadge and make public. 
Change-Id: I9d12beeba16c2f64742b4a99d0da4ceb73525b5b
 2009-09-30 08:33:31 -07:00
Bryan Mawhinney
973c0998b2 am fb54aadd: Merge change Ic3aa7aa6 into eclair 
Merge commit 'fb54aaddf25c8b60e57239880663655ec76a1e8d' into eclair-plus-aosp

* commit 'fb54aaddf25c8b60e57239880663655ec76a1e8d':
  Recreate search dialog view each time it's shown.
 2009-09-30 08:11:43 -07:00
Cary Clark
8fbd4a7a6b am 0c5924e9: preserve webkit-side text selection 
Merge commit '0c5924e9dd1befadae8c73505d3acc9813bf8224' into eclair-plus-aosp

* commit '0c5924e9dd1befadae8c73505d3acc9813bf8224':
  preserve webkit-side text selection
 2009-09-30 08:11:36 -07:00
Android (Google) Code Review
fb54aaddf2 Merge change Ic3aa7aa6 into eclair 
* changes:
  Recreate search dialog view each time it's shown.
 2009-09-30 11:06:59 -04:00
Cary Clark
0c5924e9dd preserve webkit-side text selection 
When webkit modifies a text field programmatically, it may change
the selection. This competes with the UI thread attempting to
set the selection in response to the IME next button and changes
made by the trackball.

One recent fix (https://android-git.corp.google.com/g/#change,26904)
sets the selection from the UI side after the IME generated click.
Unfortunately, this can be generated under other circumstances,
so this change qualifies this with mOkayForFocusNotToMatch, which
is only set after the IME next button is pressed.

The other change qualfies onTextChanged calls so that if it was
triggered by setTextAndKeepSelection, the webkit-side selection
is unchanged.

fixes http://b/issue?id=2096746
 2009-09-30 10:52:14 -04:00
Bryan Mawhinney
f36740b2e4 Recreate search dialog view each time it's shown. 
This is slower, but less vulnerable to problems in TextField, for example.

Change-Id: I3bb6220f30d8231cedde97fc5e0c4db993660d27
 2009-09-30 15:20:22 +01:00
Andrei Popescu
020d2e3453 Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws. 
Fixes http://b/issue?id=2156505
 2009-09-30 14:54:55 +01:00
Leon Clarke
2f208646eb am ccf6947e: Merge change Ib89f80df into eclair 
Merge commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015' into eclair-plus-aosp

* commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015':
  Re-instate the link coloring on startup, but going via the browser
 2009-09-30 03:11:50 -07:00
Jim Miller
2c799f0534 am badfac38: Merge change I85d63002 into eclair 
Merge commit 'badfac3825c6f6823e77fe53eab79ffbb8caef4c' into eclair-plus-aosp

* commit 'badfac3825c6f6823e77fe53eab79ffbb8caef4c':
  Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView.
 2009-09-30 03:11:42 -07:00
Android (Google) Code Review
ccf6947eaa Merge change Ib89f80df into eclair 
* changes:
  Re-instate the link coloring on startup, but going via the browser to read the bookmark history, and restricting it to 100 results.
 2009-09-30 06:08:08 -04:00
Jim Miller
85d630020a Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView. 
Can be configured by config_virtualKeyVibePattern.
 2009-09-30 02:53:05 -07:00
Leon Clarke
194e345eb0 Re-instate the link coloring on startup, but going via the browser 
to read the bookmark history, and restricting it to 100 results.

Link coloring - doing db lookup in new thread

Whitespace, following review
 2009-09-30 10:09:49 +01:00
Ray Chen
5a92f5dc80 am 49e750a3: Merge change I7495977a into eclair 
Merge commit '49e750a3586cdb09aa1a374442af48982b225050' into eclair-plus-aosp

* commit '49e750a3586cdb09aa1a374442af48982b225050':
  Add cancelThumbnailRequest to thumbnail API.
 2009-09-30 00:07:08 -07:00
Android (Google) Code Review
49e750a358 Merge change I7495977a into eclair 
* changes:
  Add cancelThumbnailRequest to thumbnail API.
 2009-09-30 02:59:56 -04:00
Costin Manolache
264f9b4530 am 3348f14b: Remove GAIA string 
Merge commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb' into eclair-plus-aosp

* commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb':
  Remove GAIA string
 2009-09-29 22:58:53 -07:00
Costin Manolache
3348f14b3d Remove GAIA string 2009-09-29 22:52:05 -07:00
Mike Cleron
90183823b0 am b4ee8349: Merge change I290947bb into eclair 
Merge commit 'b4ee8349cc7e64a264335ee2dfecc00980eca07a' into eclair-plus-aosp

* commit 'b4ee8349cc7e64a264335ee2dfecc00980eca07a':
  Git sucks
 2009-09-29 22:33:22 -07:00
Mike Cleron
290947bbf8 Git sucks 2009-09-29 21:53:56 -07:00