Christopher Tate
079edce86d
am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
...
Merge commit '98e26575373461dc16c749d1f756403e46a909d4' into froyo-plus-aosp
* commit '98e26575373461dc16c749d1f756403e46a909d4':
Add Backup/Restore sample to the SDK docs
2010-04-07 14:22:23 -07:00
Christopher Tate
727b5ff4e6
Merge "Add Backup/Restore sample to the SDK docs" into froyo
2010-04-07 14:19:44 -07:00
Marco Nelissen
e53f6e4966
am 92431300: am 724f3008: am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
2010-04-07 13:53:07 -07:00
Ray Chen
135b99d12a
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
a9059f5e30
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
a43062d2ca
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
Marco Nelissen
0f02c803ac
am 724f3008: am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
2010-04-07 13:40:38 -07:00
Marco Nelissen
86f84b7653
am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
...
Merge commit 'ca9a083bcf1ad753812e14f506c210a2104342c5' into kraken
* commit 'ca9a083bcf1ad753812e14f506c210a2104342c5':
Don't check whether a specific named activity supports mp3 playback,
2010-04-07 13:37:21 -07:00
Marco Nelissen
eabd04795a
am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
...
Merge commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda' into froyo-plus-aosp
* commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda':
Don't check whether a specific named activity supports mp3 playback,
2010-04-07 13:33:11 -07:00
Marco Nelissen
138da33e45
Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
2010-04-07 13:28:51 -07:00
Ray Chen
083e0f4d0b
am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 12:17:57 -07:00
Ray Chen
5f6e847ad2
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
Ray Chen
34e03df4e9
am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
...
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp
* commit '25c2dd60d43298c18b9459abd6ff33046d675fe6':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:09:42 -07:00
Ray Chen
5560ff353d
Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 12:05:58 -07:00
Dianne Hackborn
f225c59376
am 7aed1e14: am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
2010-04-07 12:03:05 -07:00
Dianne Hackborn
4a8ddbd1e5
am d00fb429: am 03e352a2: am 8258fda1: Fix issue #2576268 : There is no uiMode config change constant for the manifest
2010-04-07 12:03:00 -07:00
Dianne Hackborn
291d0fb7d1
am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
...
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken
* commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
Maybe fix issue #2568615 : System server crashed in SyncStorageEngine
2010-04-07 11:58:21 -07:00
Dianne Hackborn
380126c824
am 03e352a2: am 8258fda1: Fix issue #2576268 : There is no uiMode config change constant for the manifest
...
Merge commit '03e352a2850d74cee11d3f0734938efb22cac351' into kraken
* commit '03e352a2850d74cee11d3f0734938efb22cac351':
Fix issue #2576268 : There is no uiMode config change constant for the manifest
2010-04-07 11:58:17 -07:00
Dianne Hackborn
651e63c4f7
am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
...
Merge commit '4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp
* commit '4e7cacd3e44bd222a7892113336caff571a9983a':
Maybe fix issue #2568615 : System server crashed in SyncStorageEngine
2010-04-07 11:52:21 -07:00
Dianne Hackborn
3d47856532
am 8258fda1: Fix issue #2576268 : There is no uiMode config change constant for the manifest
...
Merge commit '8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp
* commit '8258fda17741b4969b93ffbe8796c76e427a9f27':
Fix issue #2576268 : There is no uiMode config change constant for the manifest
2010-04-07 11:52:17 -07:00
Dianne Hackborn
e098fb12b8
Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
2010-04-07 11:49:37 -07:00
Andreas Huber
3110b64dfd
am 1bf6cb72: am 1e6edab6: am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
2010-04-07 11:12:15 -07:00
Andreas Huber
4879465d26
am 1e6edab6: am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
2010-04-07 11:10:09 -07:00
Andreas Huber
dd61da6deb
am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
...
Merge commit '01f78928228cd097bc6816ae03909a2b01d5c1d5' into kraken
* commit '01f78928228cd097bc6816ae03909a2b01d5c1d5':
Report the requested seek time while seek is in progress.
2010-04-07 11:05:56 -07:00
Andreas Huber
ddb4ab191d
am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
...
Merge commit '567b57b68884c68e3c95834589e5f7921f380a45' into froyo-plus-aosp
* commit '567b57b68884c68e3c95834589e5f7921f380a45':
Report the requested seek time while seek is in progress.
2010-04-07 11:02:11 -07:00
Andreas Huber
5bf9232cf2
Merge "Report the requested seek time while seek is in progress." into froyo
2010-04-07 10:58:05 -07:00
Xia Wang
0107f364d4
am 8b879b14: am 3edc3c56: am b151f48a: am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
2010-04-07 10:43:47 -07:00
Romain Guy
37700aef4a
am dddcd6e1: am 388fe1b0: am 2a9ec986: am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
2010-04-07 10:43:43 -07:00
Xia Wang
eff0007643
am 3edc3c56: am b151f48a: am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
2010-04-07 10:40:36 -07:00
Romain Guy
6ea60bc6dc
am 388fe1b0: am 2a9ec986: am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
2010-04-07 10:40:32 -07:00
Xia Wang
1a5472e812
am b151f48a: am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
...
Merge commit 'b151f48a06d9473a8ec079d928d4203d13e2568b' into kraken
* commit 'b151f48a06d9473a8ec079d928d4203d13e2568b':
Fix bug2537659
2010-04-07 10:36:31 -07:00
Romain Guy
f7610d26ea
am 2a9ec986: am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
...
Merge commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97' into kraken
* commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97':
Search for focusable views only after layout has happened when the window is first created.
2010-04-07 10:36:28 -07:00
Xia Wang
f8f27eeccc
am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
...
Merge commit 'c93386cece18b8467c69004561e8f22b6b053d24' into froyo-plus-aosp
* commit 'c93386cece18b8467c69004561e8f22b6b053d24':
Fix bug2537659
2010-04-07 10:32:38 -07:00
Romain Guy
31c09444e5
am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
...
Merge commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp
* commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
Search for focusable views only after layout has happened when the window is first created.
2010-04-07 10:32:34 -07:00
Xia Wang
9a3965f1f8
Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
2010-04-07 10:30:19 -07:00
Leon Scroggins
be6031956b
am 1fa4428b: am 84d2d10d: am efaee761: am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
2010-04-07 10:21:51 -07:00
Leon Scroggins
83f82c0471
am 84d2d10d: am efaee761: am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
2010-04-07 10:17:48 -07:00
Leon Scroggins
0f2d821d73
am efaee761: am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
...
Merge commit 'efaee761022305d74e63237d87809582514bd5e2' into kraken
* commit 'efaee761022305d74e63237d87809582514bd5e2':
Show the microphone when the search box is opened from browser
2010-04-07 10:13:28 -07:00
Leon Scroggins
3858f94f45
am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
...
Merge commit '083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp
* commit '083c715d06a99951429b38c62484f8c3caf43cd1':
Show the microphone when the search box is opened from browser
2010-04-07 10:09:06 -07:00
Leon Scroggins
e5794f17df
Merge "Show the microphone when the search box is opened from browser" into froyo
2010-04-07 10:04:50 -07:00
Adam Powell
e777f784b3
am 203cd5e0: am 85a650fe: am c696b0df: am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
2010-04-07 10:01:53 -07:00
Adam Powell
ec807dc149
am 85a650fe: am c696b0df: am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
2010-04-07 09:58:54 -07:00
Adam Powell
cfcb6a0f50
am c696b0df: am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
...
Merge commit 'c696b0df1e41f7cbd09c034e47570e6510d5a2e3' into kraken
* commit 'c696b0df1e41f7cbd09c034e47570e6510d5a2e3':
Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection
2010-04-07 09:54:32 -07:00
Adam Powell
310968f0dd
am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
...
Merge commit 'eb3d47e43ac971b7d965db9a53ca92db2ce47d77' into froyo-plus-aosp
* commit 'eb3d47e43ac971b7d965db9a53ca92db2ce47d77':
Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection
2010-04-07 09:51:48 -07:00
Adam Powell
6d1f97872e
Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
2010-04-07 09:48:48 -07:00
Scott Main
26254b16b1
am fb9815e5: am fae5961f: am 31a14585: am f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
2010-04-07 09:29:54 -07:00
Scott Main
a70885d399
am fae5961f: am 31a14585: am f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
2010-04-07 09:26:46 -07:00
Scott Main
a66778d55f
am 31a14585: am f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
...
Merge commit '31a14585819ca2aacddb539dac0084f9d81172d2' into kraken
* commit '31a14585819ca2aacddb539dac0084f9d81172d2':
docs: add a screenLayout and uiMode values for configChanges attribute
2010-04-07 09:23:24 -07:00
Scott Main
e26beedb95
am f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
...
Merge commit 'f61eade258d5274b8447c0ea936ee578b7dc063a' into froyo-plus-aosp
* commit 'f61eade258d5274b8447c0ea936ee578b7dc063a':
docs: add a screenLayout and uiMode values for configChanges attribute
2010-04-07 09:06:51 -07:00
Scott Main
befda9c6ad
Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
2010-04-07 09:02:59 -07:00