Commit Graph

14662 Commits

Author SHA1 Message Date
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
Daniel Sandler
e56d7f1b57 am 03e96acb: am aea1443b: am 93720cad: am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:52:35 -07:00
Daniel Sandler
7cbfdedc90 am aea1443b: am 93720cad: am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:50:34 -07:00
Daniel Sandler
dd0b19f205 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
282a96c3ef 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
b033f112e5 Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:40:26 -07:00
Daisuke Miyakawa
1e5b135ada Merge "Add FLAG_REPRAIN_PHONE_NUMBER_FORMATTING." 2010-04-07 01:40:43 -07:00
Wu-cheng Li
05818f9eac am e624acc4: am 1bab46c6: am 14111d14: am cae57d62: Fix SDK build. 2010-04-06 23:53:27 -07:00
Dan Egnor
c2c80cc3f1 am 7f903d3e: am 7da9fc2f: am aa94842c: am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 23:48:07 -07:00
Joe Onorato
0dfa1a0f68 am 02d8d1e0: am a240ce20: Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken 2010-04-06 23:47:52 -07:00
Wu-cheng Li
003e6c03ed am 1bab46c6: am 14111d14: am cae57d62: Fix SDK build. 2010-04-06 23:17:00 -07:00
Wu-cheng Li
69b790c543 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
b30575d4eb 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
Dan Egnor
82efc3a346 am 7da9fc2f: am aa94842c: am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 22:11:01 -07:00
Dan Egnor
7d3a3e932d 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
bd28a683b1 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
Joe Onorato
3363c5219b am a240ce20: Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken 2010-04-06 22:02:18 -07:00
Dan Egnor
86acf64c14 Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 20:50:25 -07:00
Joe Onorato
685c7696b7 Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken 2010-04-06 18:26:39 -07:00
Gilles Debunne
5d07e809b1 Merge "ExpandableListView tests moved to CTS." 2010-04-06 18:03:19 -07:00
Brett Chabot
18635b14fb am 76194fd6: am 7f41a992: am f6d41580: am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo 2010-04-06 18:00:11 -07:00
Brett Chabot
54dcf4ff09 am 7f41a992: am f6d41580: am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo 2010-04-06 17:56:34 -07:00
Brett Chabot
679d87e022 am f6d41580: am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Merge commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb' into kraken

* commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb':
  Add makefile so package manager test apks can get buitl from root.
2010-04-06 17:44:33 -07:00
Brett Chabot
68095b935d am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Merge commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp

* commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6':
  Add makefile so package manager test apks can get buitl from root.
2010-04-06 17:36:49 -07:00
Jean-Baptiste Queru
717813a0e3 merge from kraken-plus-aosp
Change-Id: Ice8381ca0386c01253be0fa6f9f91b993cac500d
2010-04-06 16:38:00 -07:00
Jean-Baptiste Queru
2f958d65a7 merge from kraken
Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0
2010-04-06 16:36:09 -07:00