Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,567 Commits 3 Branches 0 Tags
3b045eb0354d322886bad3cd10e49c73bce5fd3b
Commit Graph

21567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
3b045eb035 am 560607ca: am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo 
Merge commit '560607ca530d88869ac87e5875de7efdcd0f7b85' into kraken

* commit '560607ca530d88869ac87e5875de7efdcd0f7b85':
  Add Backup/Restore sample to the SDK docs
 2010-04-07 14:24:48 -07:00
Christopher Tate
560607ca53 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
98e2657537 Merge "Add Backup/Restore sample to the SDK docs" into froyo 2010-04-07 14:19:44 -07:00
Marco Nelissen
724f30083d 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
Christopher Tate
e779bdc9b4 Add Backup/Restore sample to the SDK docs 
Part of bug #2545514

Change-Id: I235d33b839924d4bc574fd1e6762d169902e1c8b
 2010-04-07 13:37:00 -07:00
Marco Nelissen
ca9a083bcf 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
e43e563e73 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
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
Ray Chen
dbad286c46 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
25c2dd60d4 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
7aed1e14b5 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
d00fb429c1 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
d66e2b23a5 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
03e352a285 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
4e7cacd3e4 Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo 2010-04-07 11:49:37 -07:00
Dianne Hackborn
4e80820ab5 Maybe fix issue #2568615: System server crashed in SyncStorageEngine 
Ack, we were acquiring the wrong lock at some points when
accessing the data structure!

Change-Id: I8bbc8e1ffa2e3e8a94bf7625e3d7f020c458eea2
 2010-04-07 11:14:15 -07:00
Dianne Hackborn
8258fda177 Fix issue #2576268: There is no uiMode config change constant for the manifest 
Change-Id: Id0fa812048244ae408ea54c746266a88c6c214d9
 2010-04-07 11:13:38 -07:00
Andreas Huber
1e6edab620 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
01f7892822 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
567b57b688 Merge "Report the requested seek time while seek is in progress." into froyo 2010-04-07 10:58:05 -07:00
Marco Nelissen
97a9c6a7bb 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
 2010-04-07 10:40:39 -07:00
Xia Wang
3edc3c56c6 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
388fe1b040 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
Andreas Huber
ddb709c45e Report the requested seek time while seek is in progress. 
Change-Id: I862bfb801701f9ce54dede51c492e4eb37591894
related-to-bug: 2576102
 2010-04-07 10:35:18 -07:00
Xia Wang
b151f48a06 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
2a9ec9869e 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
c93386cece 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
Romain Guy
7b70f65892 Search for focusable views only after layout has happened when the window is first created. 
Bug #2565564

Change-Id: I9eb58bbcba873ac1d6dc0b60b0de99e0e9979398
 2010-04-07 10:15:18 -07:00
Ray Chen
b7c8c76180 Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener 
http://2553871

Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
 2010-04-07 10:14:04 -07:00
Leon Scroggins
84d2d10d36 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
efaee76102 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
083c715d06 Merge "Show the microphone when the search box is opened from browser" into froyo 2010-04-07 10:04:50 -07:00
Adam Powell
85a650fedf 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
c696b0df1e 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
eb3d47e43a Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo 2010-04-07 09:48:48 -07:00
Scott Main
fae5961f57 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
Leon Scroggins
e7501c17e6 Show the microphone when the search box is opened from browser 
Fix for http://b/issue?id=2549036

Also required moving the call to updateWidgetState to after the
update of mUserQuery so mUserQuery could be used as a comparison.

Change-Id: I4996f09c02751a6d74e8f517669025e4bdd709d8
 2010-04-07 12:22:01 -04:00
Scott Main
31a1458581 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
f61eade258 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
Daniel Sandler
aea1443b0d am 93720cad: am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo 
Merge commit '93720cad0c2905e7d0a80aee154684396d8b0ed1' into kraken

* commit '93720cad0c2905e7d0a80aee154684396d8b0ed1':
  Add more WindowManager flags to ViewDebug.
 2010-04-07 06:48:07 -07:00
Daniel Sandler
93720cad0c am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo 
Merge commit 'c957ebef9755d15f92c27d690641995587c0ba2f' into froyo-plus-aosp

* commit 'c957ebef9755d15f92c27d690641995587c0ba2f':
  Add more WindowManager flags to ViewDebug.
 2010-04-07 06:44:04 -07:00
Daniel Sandler
c957ebef97 Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:40:26 -07:00
Wu-cheng Li
1bab46c648 am 14111d14: am cae57d62: Fix SDK build. 
Merge commit '14111d1444ad5f5f5beb914e51eed32cfaab75cf' into kraken

* commit '14111d1444ad5f5f5beb914e51eed32cfaab75cf':
  Fix SDK build.
 2010-04-06 23:12:29 -07:00
Wu-cheng Li
14111d1444 am cae57d62: Fix SDK build. 
Merge commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8' into froyo-plus-aosp

* commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8':
  Fix SDK build.
 2010-04-06 23:08:51 -07:00
Wu-cheng Li
cae57d6205 Fix SDK build. 
Change-Id: I2d816f8e765678fa1dc07c1f50cef51026e66a10
 2010-04-07 13:54:49 +08:00
Dan Egnor
7da9fc2f4f am aa94842c: am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 
Merge commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken

* commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51':
  Comment-only change to clarify the role and use of IntentService
 2010-04-06 22:06:48 -07:00
Dan Egnor
aa94842c1a am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 
Merge commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp

* commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
  Comment-only change to clarify the role and use of IntentService
 2010-04-06 22:03:04 -07:00
Dan Egnor
9807d6a5b7 Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 20:50:25 -07:00
Adam Powell
91f234fe4d Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection 
Change-Id: I0fc6d2b8547ab56937eeb5ef3438003a06b966ec
 2010-04-06 19:35:32 -07:00
Dan Egnor
6e3d9884e4 Comment-only change to clarify the role and use of IntentService 
Change-Id: I0adb26daccc8d1559f96892cc31694fbf6ab4583
 2010-04-06 19:19:43 -07:00