Merge commit 'ffb4eeb54b90659cd95f89268eec47a509690d4c'
* commit 'ffb4eeb54b90659cd95f89268eec47a509690d4c':
Do not update the progress if it is the same as the last given progress.
Merge commit '3613385fbc5368715e7af1a6676b7bb63fafcf09' into eclair-mr2-plus-aosp
* commit '3613385fbc5368715e7af1a6676b7bb63fafcf09':
Do not update the progress if it is the same as the last given progress.
Merge commit 'b1c9068fa4763547ac35e632077ac40456361065'
* commit 'b1c9068fa4763547ac35e632077ac40456361065':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit '1503f739f8a22822fa969c516564063ef46db52a' into eclair-mr2-plus-aosp
* commit '1503f739f8a22822fa969c516564063ef46db52a':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-mr2
* commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934'
* commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934':
Make test compontent support multiple vCard input.
Merge commit 'f035b47774aabf7397aec5c5459ac9860ad63bab' into eclair-mr2-plus-aosp
* commit 'f035b47774aabf7397aec5c5459ac9860ad63bab':
Make test compontent support multiple vCard input.
Merge commit '91fc33004b4c39c736b3b2def79e64cf2b3eb057'
* commit '91fc33004b4c39c736b3b2def79e64cf2b3eb057':
Do not scroll the title bar off screen until the page finishes loading.
Merge commit '925347688d946d9782bc1cfaa95baacd5b630e38' into eclair-mr2-plus-aosp
* commit '925347688d946d9782bc1cfaa95baacd5b630e38':
Do not scroll the title bar off screen until the page finishes loading.
Merge commit 'c4bbb9144d1955340d69548e7245417cbe862d3c'
* commit 'c4bbb9144d1955340d69548e7245417cbe862d3c':
Rename the term "attribute"/"attr" to "parameter"/param".
Merge commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5' into eclair-mr2-plus-aosp
* commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5':
Rename the term "attribute"/"attr" to "parameter"/param".
We had been using "parameter"/"param" by mistake, while both vCard
formats uses theterm "attribute"/"attr". This is confusing.
Internal issue number: 2233884
Merge commit '0d8aa05d306205850e3014550bce34735ac78660'
* commit '0d8aa05d306205850e3014550bce34735ac78660':
Add a privateImeOption to represent that the IME should not show
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'
* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
Revert the channge where channels were not selected randomly.
Merge commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef' into eclair-mr2-plus-aosp
* commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef':
Add a privateImeOption to represent that the IME should not show
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2
* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
Add a privateImeOption to represent that the IME should not show
* changes:
Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).
The IME will respect this shortly.
http://b/2228562
Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp
* commit 'bf2efbc0642d07acee1a83c17987abb380e5243a':
Revert the channge where channels were not selected randomly.
