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

4375 Commits

Author SHA1 Message Date
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
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
Ray Chen
b994419263 Add cancelThumbnailRequest to thumbnail API. 2009-09-29 20:26:58 -07:00
Mike LeBeau
6cf9ab6588 am 2e4dbe70: Unhide APIs for enabling geolocation in web views. I\'ve confirmed with Grace that these are okay to unhide. 
Merge commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2' into eclair-plus-aosp

* commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2':
  Unhide APIs for enabling geolocation in web views. I've confirmed
 2009-09-29 19:56:13 -07:00
Mike LeBeau
2e4dbe70e7 Unhide APIs for enabling geolocation in web views. I've confirmed 
with Grace that these are okay to unhide.
 2009-09-29 19:40:28 -07:00
Wu-cheng Li
0ce5a41c60 am 8d1ff3a4: Merge change I77153ee0 into eclair 
Merge commit '8d1ff3a4c1df2e76e8f4ea9a4052e9b81f840135' into eclair-plus-aosp

* commit '8d1ff3a4c1df2e76e8f4ea9a4052e9b81f840135':
  Hide zoom api.
 2009-09-29 17:51:18 -07:00
Wu-cheng Li
77153ee04e Hide zoom api. 2009-09-29 16:16:33 -07:00
Evan Millar
a715566313 am c4e20e9e: Merge change Iae12c7f0 into eclair 
Merge commit 'c4e20e9e1ab761a6ec0766ef7cb649acca4fdc5f' into eclair-plus-aosp

* commit 'c4e20e9e1ab761a6ec0766ef7cb649acca4fdc5f':
  Add REQUESTING_PACKAGE_PARAM_KEY.
 2009-09-29 16:01:34 -07:00
Jim Miller
10abe7f3e7 am 98747715: Merge change I88614e93 into eclair 
Merge commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c' into eclair-plus-aosp

* commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c':
  Fix for 2137900: Be more conservative about poking the wakelock.
 2009-09-29 15:51:38 -07:00
Android (Google) Code Review
c4e20e9e1a Merge change Iae12c7f0 into eclair 
* changes:
  Add REQUESTING_PACKAGE_PARAM_KEY.
 2009-09-29 18:51:10 -04:00
Android (Google) Code Review
987477159f Merge change I88614e93 into eclair 
* changes:
  Fix for 2137900: Be more conservative about poking the wakelock.
 2009-09-29 18:41:52 -04:00
Jim Miller
41e8dc02cd Fix for 2137900: Be more conservative about poking the wakelock. 
Updated after review: white space, check for null pattern listener.
 2009-09-29 15:33:06 -07:00
Romain Guy
de63adcc26 am 8eb0f348: Merge change I67285c9a into eclair 
Merge commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57' into eclair-plus-aosp

* commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57':
  Prevent NPE when doing a fillSpecific layout.
 2009-09-29 15:24:12 -07:00
lknguyen
ed7f883187 am de04cb81: Merge change Ie9f76062 into eclair 
Merge commit 'de04cb810f47c679583767df78f8490d96d310d1' into eclair-plus-aosp

* commit 'de04cb810f47c679583767df78f8490d96d310d1':
  Add Gservices flag for Vending doctor download complete timeout.
 2009-09-29 15:24:05 -07:00
Android (Google) Code Review
8eb0f34893 Merge change I67285c9a into eclair 
* changes:
  Prevent NPE when doing a fillSpecific layout.
 2009-09-29 18:19:05 -04:00
Romain Guy
8bcdc0764f Prevent NPE when doing a fillSpecific layout. 
Change-Id: I67285c9a314400da11fdf158c413bf05fe6b982e
 2009-09-29 15:17:47 -07:00
Android (Google) Code Review
de04cb810f Merge change Ie9f76062 into eclair 
* changes:
  Add Gservices flag for Vending doctor download complete timeout.
 2009-09-29 18:16:52 -04:00
Evan Millar
49da15f34d Add REQUESTING_PACKAGE_PARAM_KEY. 
Change-Id: Iae12c7f029b8efd1811d99d24df9281a8f9a2446
 2009-09-29 14:31:52 -07:00
Daisuke Miyakawa
9e2421a3a3 am a39f9188: Merge change I9c45753b into eclair 
Merge commit 'a39f9188d6c1cdcacef2ab468fd78376171a3447' into eclair-plus-aosp

* commit 'a39f9188d6c1cdcacef2ab468fd78376171a3447':
  Clean up vCard code.
 2009-09-29 14:16:54 -07:00
Jason Parks
bc82ea5d44 am ac35dc47: Merge change I1cd7d0e5 into eclair 
Merge commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c' into eclair-plus-aosp

* commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c':
  Implement the checkin option in AccountManagerService.dump()
 2009-09-29 14:13:53 -07:00
Mark Wagner
10662ae78f am d35afcda: Merge change Ib2c6429d into eclair 
Merge commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39' into eclair-plus-aosp

* commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39':
  border for the non-badge case
 2009-09-29 14:13:46 -07:00
Android (Google) Code Review
a39f9188d6 Merge change I9c45753b into eclair 
* changes:
  Clean up vCard code.
 2009-09-29 17:09:55 -04:00
Android (Google) Code Review
ac35dc4716 Merge change I1cd7d0e5 into eclair 
* changes:
  Implement the checkin option in AccountManagerService.dump()
 2009-09-29 17:06:57 -04:00
Android (Google) Code Review
d35afcda67 Merge change Ib2c6429d into eclair 
* changes:
  border for the non-badge case
 2009-09-29 17:06:23 -04:00