Leon Scroggins
1fa4428bb8
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
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
203cd5e022
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
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
fb9815e5fa
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
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
03e96acbe1
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
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
e624acc45c
am 1bab46c6: am 14111d14: am cae57d62: Fix SDK build.
2010-04-06 23:17:00 -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
7f903d3e6c
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
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
Joe Onorato
02d8d1e036
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
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
Joe Onorato
a240ce208c
Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken
2010-04-06 18:26:39 -07:00
Joe Onorato
a5c51373d4
Finish moving the policies out of frameworks/policies/base and into frameworks/base.
...
Change-Id: Id3a0c06202b0f6f2206acf490c8655d340ee0556
2010-04-06 20:21:30 -05:00
Brett Chabot
76194fd633
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
7f41a9922a
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
f6d4158055
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
Scott Main
e756b21636
docs: add a screenLayout and uiMode values for configChanges attribute
...
add note that this should be avoided and point to dev guide
Change-Id: I977660c14da71eaf8beb1d630cbb4f6a2f26bb50
2010-04-06 17:19:43 -07:00
Jean-Baptiste Queru
7851b5402b
merge from kraken
...
Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0
2010-04-06 16:36:09 -07:00
Brett Chabot
0990511f3f
Merge "Add makefile so package manager test apks can get buitl from root." into froyo
2010-04-06 16:31:14 -07:00
Brett Chabot
5a2190877c
Add makefile so package manager test apks can get buitl from root.
...
Change-Id: I89e3d50793a48a404c7d8e5699baea8b195b7684
2010-04-06 16:23:44 -07:00
Jean-Baptiste Queru
b1b28e26d7
Merge policy from frameworks/policies/base
...
Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662
2010-04-06 15:44:22 -07:00
Jean-Baptiste Queru
cf37559e3f
Merge policy from frameworks/policies/base
...
Change-Id: I55bd6b5078290aa7cdeaae8d8b4141d744ccf152
2010-04-06 15:44:11 -07:00
Jean-Baptiste Queru
6e251d7d66
de-activate makefile
...
Change-Id: I6def51dea7aab002f7dbbe1e2573f52a2caa94fe
2010-04-06 15:43:25 -07:00
Andreas Huber
b93ae7ea24
am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
...
Merge commit '3e8b89bd8d35525019080205e7221063748a3f0a' into kraken
* commit '3e8b89bd8d35525019080205e7221063748a3f0a':
Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
2010-04-06 14:50:05 -07:00
Andreas Huber
3e8b89bd8d
am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
...
Merge commit '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7' into froyo-plus-aosp
* commit '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7':
Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
2010-04-06 14:46:14 -07:00
Andreas Huber
2be77a22a4
Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
2010-04-06 14:43:05 -07:00
Kenny Root
62057cddfa
am 266bb3c5: am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo
...
Merge commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3' into kraken
* commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3':
Fix last character of password field being visible after rotation
2010-04-06 14:38:59 -07:00
Kenny Root
266bb3c5de
am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo
...
Merge commit 'f1b256f5198d12952302ef2b6214a79927918866' into froyo-plus-aosp
* commit 'f1b256f5198d12952302ef2b6214a79927918866':
Fix last character of password field being visible after rotation
2010-04-06 14:36:36 -07:00
Andreas Huber
548b7999fe
Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
...
Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491
2010-04-06 14:36:23 -07:00
Kenny Root
f1b256f519
Merge "Fix last character of password field being visible after rotation" into froyo
2010-04-06 14:33:24 -07:00
Daniel Lehmann
ba3147d157
am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
...
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken
* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
2010-04-06 14:17:57 -07:00
Daniel Lehmann
140d040b6a
am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
...
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp
* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
2010-04-06 14:14:21 -07:00
Daniel Lehmann
d8b9b51182
Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
2010-04-06 14:10:04 -07:00