Jeff Sharkey
b35f1c7ea6
am ad9c5718: am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
...
* commit 'ad9c5718daa556fb6907c3f600ea505c1ec3aca0':
Hide quota APIs until finalized.
2011-10-06 15:17:46 -07:00
Jeff Sharkey
ad9c5718da
am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
...
* commit 'a50d0f8985d811a6a2f49aa65e31892048e96ccf':
Hide quota APIs until finalized.
2011-10-06 11:22:40 -07:00
Jeff Sharkey
44a3e0d497
Hide quota APIs until finalized.
...
Bug: 5383656
Change-Id: Ia2a978a6ff2ee642b0ea4d7d6b8857b7efffd612
2011-10-06 10:50:09 -07:00
Steve Block
73a4ea021b
am 16721242: Merge "Improve a warning message in WebViewCore\'s EventHub"
...
* commit '16721242556a5e41b81ae07bdd212bff066d50ee':
Improve a warning message in WebViewCore's EventHub
2011-10-06 10:37:51 -07:00
Steve Block
1672124255
Merge "Improve a warning message in WebViewCore's EventHub"
2011-10-06 10:35:33 -07:00
Ben Murdoch
114d0762b0
am 92315491: Merge "Pass correct units for text size in autocomplete drop down."
...
* commit '923154914d7afa5b434d10daa3da10353109754c':
Pass correct units for text size in autocomplete drop down.
2011-10-06 10:27:23 -07:00
John Reck
12f4780e6e
am 68b9074a: Merge "Prevent adapter flickering"
...
* commit '68b9074a60a8b20235c1887c09eb7073d48c9902':
Prevent adapter flickering
2011-10-06 10:25:15 -07:00
Ben Murdoch
923154914d
Merge "Pass correct units for text size in autocomplete drop down."
2011-10-06 10:23:20 -07:00
John Reck
68b9074a60
Merge "Prevent adapter flickering"
2011-10-06 10:22:03 -07:00
Steve Block
37a7485333
am 3475ebfa: Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty"
...
* commit '3475ebfab28fbecc22841c692dbd0cbdba48417d':
Fix SslError.getPrimaryError() to return -1 if the set of errors is empty
2011-10-06 08:50:43 -07:00
Steve Block
3475ebfab2
Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty"
2011-10-06 08:48:52 -07:00
Steve Block
7b65a3eb29
Improve a warning message in WebViewCore's EventHub
...
These warnings appear occasionally and this will help track them down.
Also removes an unused method.
Bug: 5421676
Change-Id: I5ba3f146449623e3457aafc91fd2e7edc367a9d9
2011-10-06 14:54:31 +01:00
Luca Zanolin
2b99e1b088
am 535698c5: Remove the mic from the keyboard in SearchView
...
* commit '535698c57dbbd0d0eef79223293526748a07dfec':
Remove the mic from the keyboard in SearchView
2011-10-06 05:42:59 -07:00
Luca Zanolin
535698c57d
Remove the mic from the keyboard in SearchView
...
Bug: 5357750
Change-Id: I20c87a25e95222772c6b5154d09dd681b966fd9a
2011-10-06 13:36:15 +01:00
Ben Murdoch
f88a56e2b1
Pass correct units for text size in autocomplete drop down.
...
We need to set the size of the text used in the autocomplete
drop down in pixels, as we do when setting the size of the
EditText itself.
Bug: 5420125
Change-Id: Ife6d8c108c57106ffaa8706fa9e4e537a73a1733
2011-10-06 12:10:31 +01:00
Jeff Sharkey
60e79c4536
am ca35bc5a: Merge "Refine random stats generation."
...
* commit 'ca35bc5acc80ad1380a9631770f13448677d0d34':
Refine random stats generation.
2011-10-05 23:40:47 -07:00
Jeff Sharkey
ca35bc5acc
Merge "Refine random stats generation."
2011-10-05 23:38:44 -07:00
Jeff Sharkey
293779f9c6
Refine random stats generation.
...
Offer parameters to pick out specific list of packages, and to change
duration and total data.
Bug: 5416742
Change-Id: I6970a5e76f3198ef23a400c079037212b000ca6b
2011-10-05 23:31:57 -07:00
John Reck
a607060bbd
Prevent adapter flickering
...
Bug: 5403763
Prevent rapidly switching between a null adapter and a valid
adapter by only clearing if the node pointer changes or the text view
is no longer autocompletable.
Change-Id: Ie594396db807b5ad5e1a5a0e68ec0c7677364aaf
2011-10-05 18:26:57 -07:00
Jeff Brown
b070aff670
am 219f3c71: Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750"
...
* commit '219f3c71269ff0bd8949b88af07f92c4e4eddc67':
Make SENSOR orientation modes trump rotation lock. Bug: 5371750
2011-10-05 17:27:49 -07:00
Jeff Brown
219f3c7126
Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750"
2011-10-05 17:24:29 -07:00
Fabrice Di Meglio
112fc493a8
am 610c2d25: Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
...
* commit '610c2d25edb2aa87623e969cbc24efeaf8555469':
Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
2011-10-05 17:14:17 -07:00
Fabrice Di Meglio
610c2d25ed
Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-10-05 17:12:17 -07:00
Fabrice Di Meglio
764041d213
Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
...
- make VERY_WIDE bigger ... 64 times actually
Change-Id: I1a177ef5821d9341abb77ea69a50e05a5bfc97b5
2011-10-05 16:28:18 -07:00
Jeff Brown
4dfce20cac
Make SENSOR orientation modes trump rotation lock.
...
Bug: 5371750
Change-Id: I4d18b6c8ba1de0afd5929ddb8d7123272e35fbe2
2011-10-05 16:12:07 -07:00
George Mount
90d13a3d4b
am 67f9d32e: Merge "Fix monkey NullPointerException"
...
* commit '67f9d32e5ed55b15b84be4d0bdff828d48abe2eb':
Fix monkey NullPointerException
2011-10-05 15:35:37 -07:00
George Mount
67f9d32e5e
Merge "Fix monkey NullPointerException"
2011-10-05 15:33:46 -07:00
Steve Block
518f72ca38
Fix SslError.getPrimaryError() to return -1 if the set of errors is empty
...
Also fix a couple of buggy asserts.
Bug: 5416594
Change-Id: I0e7e2548886af5fc0b8c20f70a3040d2c5bc68ea
2011-10-05 23:09:23 +01:00
Steve Block
489ff9a482
am cfb753a6: Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision"
...
* commit 'cfb753a641781425b6ef04a503271108fbce8bd0':
Fix SslCertLookupTable to correctly determine whether we have a valid cached decision
2011-10-05 14:58:54 -07:00
Steve Block
cfb753a641
Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision"
2011-10-05 14:56:21 -07:00
Nicolas Roard
e5e9798484
am f270a152: Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work."
...
* commit 'f270a1521c39bb6f47ebd29c1a14d9a33f14d87f':
Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work.
2011-10-05 11:38:01 -07:00
Nicolas Roard
f270a1521c
Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work."
2011-10-05 11:35:29 -07:00
Dianne Hackborn
e68ead5e3b
am 30c845f9: Turn off logging.
...
* commit '30c845f9ca9e504d4d76099a8be111c99ac669f4':
Turn off logging.
2011-10-05 11:34:09 -07:00
Dianne Hackborn
30c845f9ca
Turn off logging.
...
Change-Id: I5b050e33fe918c08b24091c6ccb9c5fe2b01d496
2011-10-05 11:30:55 -07:00
Dianne Hackborn
ee806f9fc7
am 01017cdf: Merge "Some new ICS target SDK changes."
...
* commit '01017cdf7452baa13908cba6aa26632114544b33':
Some new ICS target SDK changes.
2011-10-05 11:26:48 -07:00
Dianne Hackborn
01017cdf74
Merge "Some new ICS target SDK changes."
2011-10-05 11:25:02 -07:00
Dianne Hackborn
4775c0c95c
am 668f7c3e: Merge "Fix issue #5348948 : Third Party app "Byki Turkish" shows..."
...
* commit '668f7c3ec91d16c61f684b23cb55aa2530684b5f':
Fix issue #5348948 : Third Party app "Byki Turkish" shows...
2011-10-05 11:18:21 -07:00
Dianne Hackborn
668f7c3ec9
Merge "Fix issue #5348948 : Third Party app "Byki Turkish" shows..."
2011-10-05 11:15:13 -07:00
Steve Block
a93d89d1df
am 4198627a: Merge changes I447cd196,I0c6cdae4
...
* commit '4198627a284a9dbdd7a16f98c4fbcf5032c6020f':
SSL-related cleanup in BrowserFrame and SslCertLookupTable
Clean up SslErrorHandlerImpl
2011-10-05 10:02:22 -07:00
Steve Block
f219f23aec
Fix SslCertLookupTable to correctly determine whether we have a valid cached decision
...
We should only re-use a cached 'allow' decision if the decision ...
- is for the same host
- is for an error which is at least as severe as the current error
Bug: 5409251
Change-Id: Id8516f58c8d23de44e80539ffeaf945be3d2914a
2011-10-05 18:01:54 +01:00
Steve Block
4198627a28
Merge changes I447cd196,I0c6cdae4
...
* changes:
SSL-related cleanup in BrowserFrame and SslCertLookupTable
Clean up SslErrorHandlerImpl
2011-10-05 10:00:59 -07:00
Steve Block
34473bca2c
am 7897fdd6: Merge "Fix BrowserFrame to construct SslError using the full URL, rather than the host"
...
* commit '7897fdd6a65499d76ac8573e5b428d07675b98f4':
Fix BrowserFrame to construct SslError using the full URL, rather than the host
2011-10-05 09:47:49 -07:00
Steve Block
7897fdd6a6
Merge "Fix BrowserFrame to construct SslError using the full URL, rather than the host"
2011-10-05 09:46:27 -07:00
Joe Fernandez
fb6b4d96da
am 1d4a2555: Merge "docs: Camera class JavaDoc FixIts for ICS"
...
* commit '1d4a25556a9fca40f08b908c2d146664eab5aac2':
docs: Camera class JavaDoc FixIts for ICS
2011-10-05 09:24:42 -07:00
Joe Fernandez
1d4a25556a
Merge "docs: Camera class JavaDoc FixIts for ICS"
2011-10-05 09:23:03 -07:00
Narayan Kamath
f78cff74d4
am b4e7d4ca: Merge "Allow listeners to be set before the service connects."
...
* commit 'b4e7d4ca7502bb8ff599229ec90c1bf5b481f2f7':
Allow listeners to be set before the service connects.
2011-10-05 06:54:18 -07:00
Narayan Kamath
b4e7d4ca75
Merge "Allow listeners to be set before the service connects."
2011-10-05 06:52:24 -07:00
Steve Block
918d361ece
am ea54b170: Merge "Clean up SslError"
...
* commit 'ea54b17038a6631f9e911a084c6138a57647915c':
Clean up SslError
2011-10-05 06:37:35 -07:00
Fabrice Di Meglio
645b7fa5b6
am e921572b: Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)""
...
* commit 'e921572bda621b75a217bce115c2b605caf9b26a':
Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-10-05 06:36:45 -07:00
Svetoslav Ganov
97e1af548e
am 63f5e09c: Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose."
...
* commit '63f5e09c8cce112b0945190da7d4a108b92a6c52':
Make prompt for headset while typing a password if accessibilbity is on less verbose.
2011-10-05 06:36:43 -07:00