Daniel Sandler
108aacd88f
am aed9d41b: am 715896be: am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
2010-04-08 06:38:27 -07:00
Daniel Sandler
9019003307
am 59ff911b: am 8c66936a: am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
2010-04-08 06:38:21 -07:00
Daniel Sandler
715896be3d
am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
...
Merge commit '6fec76a081fd5976c3d7d0aa9616d5680ccb237f' into kraken
* commit '6fec76a081fd5976c3d7d0aa9616d5680ccb237f':
Transparent alarm icons for lockscreen.
2010-04-08 06:33:26 -07:00
Daniel Sandler
8c66936a8d
am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
...
Merge commit '070237771e89bbf027ed85302df7a91fae0fa5c2' into kraken
* commit '070237771e89bbf027ed85302df7a91fae0fa5c2':
Add emergency call button to PUK'd lockscreen.
2010-04-08 06:33:23 -07:00
Daniel Sandler
6fec76a081
am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
...
Merge commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8' into froyo-plus-aosp
* commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8':
Transparent alarm icons for lockscreen.
2010-04-08 06:10:12 -07:00
Daniel Sandler
070237771e
am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
...
Merge commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7' into froyo-plus-aosp
* commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7':
Add emergency call button to PUK'd lockscreen.
2010-04-08 06:10:09 -07:00
Daniel Sandler
8d318958a3
Merge "Transparent alarm icons for lockscreen." into froyo
2010-04-08 06:07:57 -07:00
Daniel Sandler
9f71025b37
Merge "Add emergency call button to PUK'd lockscreen." into froyo
2010-04-08 06:06:50 -07:00
Daisuke Miyakawa
58b50f86cd
Refactor vCard parser so that its implementation detail would be hidden from users.
...
Move the current implementation or 2.1 and 3.0 to VCardParserImpl_V21 and VCardParserImpl_V30.
- From the view of users, it is strange to make vCard 3.0 inherit vCard 2.1.
- Those two specifications still have similar implementation detail, so make implementation of vCard 3.0 inherits vCard 2.1 makes sense from technical view point.
Now VCardParser_V21 and VCardParser_V30 are independent class.
Remove strict mode in vCard 3.0, since strict parsing is not necessary from the view of actual use, and needs to extra effort to support it.
Bug: 2576738
Change-Id: I1d5cb6cffffb53337faa2dd7c519e7254e12da86
2010-04-08 19:58:58 +09:00
Wu-cheng Li
e2642ea220
am 1479d202: am 249c902c: am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review.
2010-04-07 22:10:18 -07:00
Wu-cheng Li
249c902ca6
am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review.
...
Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken
* commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
Update API and javadoc according to API review.
2010-04-07 22:01:54 -07:00
Wu-cheng Li
75a9cbaea4
am 3f4639a6: Update API and javadoc according to API review.
...
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp
* commit '3f4639a6611222ae1ae5493de49213250d292139':
Update API and javadoc according to API review.
2010-04-07 21:58:21 -07:00
Suchi Amalapurapu
4baf4e6a74
am eb606ec9: am 3e543abb: am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
2010-04-07 21:40:29 -07:00
Suchi Amalapurapu
3e543abbc1
am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
...
Merge commit 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken
* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
Fix 2579461
2010-04-07 21:32:30 -07:00
Wu-cheng Li
3f4639a661
Update API and javadoc according to API review.
...
bug:2553570
Change-Id: I0353938f513c119cec0e31eb980dc4569e17d7eb
2010-04-08 12:31:06 +08:00
Suchi Amalapurapu
a599469f90
am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
...
Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp
* commit 'c2461be6279137f872becf695befeb7ba8770a64':
Fix 2579461
2010-04-07 21:29:05 -07:00
Suchi Amalapurapu
c2461be627
Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
2010-04-07 21:24:36 -07:00
Suchi Amalapurapu
40e472521a
Fix 2579461
...
Move install location values to secure settings.
Diable attribute for UI. Set default value to auto.
Add command line interface to set install location via pm.
Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
2010-04-07 20:43:54 -07:00
Dianne Hackborn
2e13f37347
am f0dc083d: am d49c455c: am 822a7e2d: am ce59fb8b: Fix issue #2578244 : playing audio file downloaded by the browser...
2010-04-07 19:22:29 -07:00
Grace Kloba
9b4fe0271f
am 390aca99: am 962ebd1f: am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
2010-04-07 19:17:37 -07:00
Dianne Hackborn
d49c455cc9
am 822a7e2d: am ce59fb8b: Fix issue #2578244 : playing audio file downloaded by the browser...
...
Merge commit '822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken
* commit '822a7e2defcfbd006a7840e1da19cf0827d46736':
Fix issue #2578244 : playing audio file downloaded by the browser...
2010-04-07 19:13:22 -07:00
Dianne Hackborn
b758ff4748
am 9ed9c0e4: am d93df9ca: am b37abe38: am d3cc4967: Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
2010-04-07 19:10:13 -07:00
Dianne Hackborn
822a7e2def
am ce59fb8b: Fix issue #2578244 : playing audio file downloaded by the browser...
...
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp
* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
Fix issue #2578244 : playing audio file downloaded by the browser...
2010-04-07 19:07:54 -07:00
Grace Kloba
962ebd1fcc
am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
...
Merge commit '520d684093b50c25d06aac652ad4bca42ff7e862' into kraken
* commit '520d684093b50c25d06aac652ad4bca42ff7e862':
Revert "Use the content width to calculate the zoom overview"
2010-04-07 19:05:32 -07:00
Dianne Hackborn
ce59fb8b68
Fix issue #2578244 : playing audio file downloaded by the browser...
...
...shows an image downloaded by the browser
The downloads directory needs to be non-plural for backwards compatibility.
Change-Id: Ifb6ddf8ee980a57ad113a5fc8b51f5acd8df5955
2010-04-07 19:02:13 -07:00
Grace Kloba
520d684093
am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
...
Merge commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp
* commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
Revert "Use the content width to calculate the zoom overview"
2010-04-07 19:00:40 -07:00
Grace Kloba
667543cdb5
Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
2010-04-07 18:57:52 -07:00
Dianne Hackborn
d93df9cac9
am b37abe38: am d3cc4967: Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
...
Merge commit 'b37abe3867d582d68918d38f0684783f457543bb' into kraken
* commit 'b37abe3867d582d68918d38f0684783f457543bb':
Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app
2010-04-07 18:57:33 -07:00
Dianne Hackborn
b37abe3867
am d3cc4967: Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
...
Merge commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed' into froyo-plus-aosp
* commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed':
Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app
2010-04-07 18:41:42 -07:00
Grace Kloba
188bf8deb4
Revert "Use the content width to calculate the zoom overview"
...
This reverts commit 4a4f9886a7 .
Fix http://b/issue?id=2577238
2010-04-07 18:37:32 -07:00
Dianne Hackborn
d3cc496760
Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
2010-04-07 18:37:04 -07:00
Grace Kloba
11fa070d37
am d0010038: am c020ec57: am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
2010-04-07 18:31:37 -07:00
Grace Kloba
c020ec5723
am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
...
Merge commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293' into kraken
* commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293':
Cherry-pick https://android-git.corp.google.com/g/#change,38305
2010-04-07 18:26:38 -07:00
Grace Kloba
edee621f5c
am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
...
Merge commit 'faa2d970058557fa31d06d168b402d592c368aaf' into froyo-plus-aosp
* commit 'faa2d970058557fa31d06d168b402d592c368aaf':
Cherry-pick https://android-git.corp.google.com/g/#change,38305
2010-04-07 18:23:25 -07:00
Dianne Hackborn
559a787531
Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app
...
mResources will be null if we failed loading them because the app
is on external storage that has been unmounted.
Change-Id: If0dbbdc0c3441fa10d0ab074568361524db1c8db
2010-04-07 18:19:41 -07:00
Grace Kloba
faa2d97005
Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
2010-04-07 18:18:17 -07:00
Mike Reed
05b3720beb
Cherry-pick https://android-git.corp.google.com/g/#change,38305
...
disable high-quality filtering during scrolling, until I can cached the scaled images.
Change-Id: I58fa779a8d9a23a20a0fdd93ea06c251b6c6ca8d
Fix http://b/issue?id=2574172
2010-04-07 17:09:55 -07:00
San Mehat
a334389373
am cf1a7a77: am 12ebde61: am 692329cf: am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
2010-04-07 16:45:31 -07:00
Suchi Amalapurapu
716abe5739
am 4cdd682c: am 070e1ecf: am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo
2010-04-07 16:45:27 -07:00
San Mehat
12ebde61a5
am 692329cf: am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
...
Merge commit '692329cf3f1512b3f0475b619058f9a10d9950a8' into kraken
* commit '692329cf3f1512b3f0475b619058f9a10d9950a8':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
2010-04-07 16:36:07 -07:00
Suchi Amalapurapu
070e1ecfee
am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo
...
Merge commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe' into kraken
* commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe':
Fix 2578016.
2010-04-07 16:35:57 -07:00
San Mehat
692329cf3f
am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
...
Merge commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp
* commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
2010-04-07 16:32:29 -07:00
Suchi Amalapurapu
a137cf2a18
am 4b18ced6: Merge "Fix 2578016." into froyo
...
Merge commit '4b18ced6b5409bb9dd4013c06b9562b76a062939' into froyo-plus-aosp
* commit '4b18ced6b5409bb9dd4013c06b9562b76a062939':
Fix 2578016.
2010-04-07 16:32:26 -07:00
San Mehat
fd998a0caf
Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo
2010-04-07 15:32:44 -07:00
Suchi Amalapurapu
4b18ced6b5
Merge "Fix 2578016." into froyo
2010-04-07 15:25:51 -07:00
San Mehat
f0db6e1853
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
...
Change-Id: I1cfbdac7d06478243931c6acec462da8e257f42f
Signed-off-by: San Mehat <san@google.com >
2010-04-07 15:22:10 -07:00
Ray Chen
f974b84b54
am e4b62c23: am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 13:52:52 -07:00
Dianne Hackborn
b4d32b5657
am c24a1498: am 7aed1e14: am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
2010-04-07 13:52:46 -07:00
Dianne Hackborn
ef3d2f48dd
am 9004f5b8: am d00fb429: am 03e352a2: am 8258fda1: Fix issue #2576268 : There is no uiMode config change constant for the manifest
2010-04-07 13:52:42 -07:00
Ray Chen
84d12f3fe7
am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
...
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken
* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:14:49 -07:00