59328 Commits

Author SHA1 Message Date
Eric Fischer
b23e99c924 am 2fc826ec: (-s ours) Import translations for late permission additions.
* commit '2fc826ec944cf85d1c3e65011091c58dc94110c0':
  Import translations for late permission additions.
2011-10-06 11:03:18 -07:00
Wink Saville
43ce9b204e Merge "Set mGotCountryCode properly." 2011-10-06 10:52:13 -07:00
Steve Block
1672124255 Merge "Improve a warning message in WebViewCore's EventHub" 2011-10-06 10:35:33 -07:00
Eric Fischer
2fc826ec94 Import translations for late permission additions.
Change-Id: I80c968b0f6fd74cc52443a3729d02490c77aef30
2011-10-06 10:28:28 -07:00
Wink Saville
b166bc81ac Set mGotCountryCode properly.
mGotCountryCode needs to be set to false when we don't know
the country code and to true only when we do.

Bug: 2578334
Change-Id: I7cb21e627ae115880df5f9b2095cb4ba094ab751
2011-10-06 10:23:32 -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
Roman Nurik
526c2264d8 Merge "Mark random music player sample as updated in the resource TOC" 2011-10-06 10:11:32 -07:00
Andreas Huber
beedd8627a Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files." 2011-10-06 09:17:14 -07:00
Andreas Huber
90ba107fcf Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.
Change-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749
related-to-bug: 5418914
2011-10-06 09:07:12 -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
Justin Ho
11a670531f Merge "primary progress updated to fix clipping problem" 2011-10-06 07:39:11 -07:00
Justin Ho
ab72e95ed3 Merge "scrubber assets updated to larger size" 2011-10-06 07:39:03 -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
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
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
Michael Jurka
093f9b79c9 Merge "Adding logging to debug widget deletions" 2011-10-05 22:11:19 -07:00
Jeff Brown
26ae7db48d Merge "Fix build." 2011-10-05 19:11:04 -07:00
Jeff Brown
3b2faf68e5 Fix build.
Change-Id: I01dbb8747f81c83d86e089762b2d34d8bba2bffd
2011-10-05 19:08:31 -07:00
Jim Miller
22f3d9fab0 Merge "Fix 5396647: Move lock slider up by 10dip on lock screen." 2011-10-05 19:08:28 -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
Roman Nurik
3eb4527a00 Merge "Add ActionBarCompat sample (CL 2 of 2)" 2011-10-05 18:24:42 -07:00
Adam Cohen
7bb9883d05 Adding logging to debug widget deletions
Change-Id: I15a943650f930fd3fb6163c60af85abc2865e684
2011-10-05 18:18:40 -07:00
Jim Miller
f67f8b4ee4 Fix 5396647: Move lock slider up by 10dip on lock screen.
Change-Id: I32d5b8bc784e2171b4880c08eeabfda7c58238db
2011-10-05 18:12:04 -07:00
Jeff Brown
1a7ae63490 Merge "Fix build." 2011-10-05 18:09:41 -07:00
Jeff Brown
2447871b99 Fix build.
Change-Id: I7bb00b8ee0da952f3697b23dccf32dde55733b7a
2011-10-05 18:04:48 -07:00
Eric Laurent
3c89228883 Merge "Fix issue 5381089: problem with A2DP music volume" 2011-10-05 18:02:54 -07:00
Eric Laurent
6fccbd04fc Fix issue 5381089: problem with A2DP music volume
This problem only occurs when audio effects are present and
the music volume is applied by one effect engine.
When connecting or disconnecting A2DP, audio effects are moved from
one mixer thread to another. When removed from the source thread,
the effect is stopped but it is not restarted when added to the
destination thread.
This regression was introduced by commit 21b5c47e.

Change-Id: I4cc578d8d760ec65b185032b6fda98c739d331bc
2011-10-05 17:42:25 -07:00
Jeff Brown
219f3c7126 Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750" 2011-10-05 17:24:29 -07:00
Richard Ngo
39382aa77a Merge "updated blue border for stackviews to new holo blue" 2011-10-05 17:23:33 -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
Irfan Sheriff
953dd38201 Merge "Add a time threshold for re-enabling networks" 2011-10-05 16:34:40 -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
The Android Open Source Project
2c92d46626 Reconcile with ics-factoryrom-release
Change-Id: I656e0ea68c6bf350f391a3922884216955997686
2011-10-05 16:16:03 -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
Roman Nurik
f4b2ba1894 Add ActionBarCompat sample (CL 2 of 2)
Change-Id: Ie64eaad0c5cd148288ee48c524ff3516522fc10f
2011-10-05 15:59:23 -07:00
Richard Ngo
e0696a73ac updated blue border for stackviews to new holo blue
Change-Id: I1dc52fa0b089e52afb2213b106aea049c861c1ea
2011-10-05 15:37:35 -07:00
George Mount
67f9d32e5e Merge "Fix monkey NullPointerException" 2011-10-05 15:33:46 -07:00
Mathias Agopian
1302d32996 Merge "Force a repaint when hwc invalidate hook is called" 2011-10-05 15:09: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
Mathias Agopian
edaab94c2b Force a repaint when hwc invalidate hook is called
without this prepare() would be called but not set() since the
dirty region is empty.

Change-Id: I038acfbdad4c16015357ccde4d1949391d6f989d
2011-10-05 15:00:22 -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
Dirk Dougherty
63d8b0c8b5 Merge "Doc change: add diffs for API level 14." 2011-10-05 14:09:49 -07:00
Brian Colonna
fe7fcd23d5 Merge "Added callback for Face Unlock service to poke the wakelock" 2011-10-05 13:58:59 -07:00
Brian Colonna
0c422a72ed Added callback for Face Unlock service to poke the wakelock
Change-Id: I76a4e0f8ac0fe17e39195f4593fac7e36d7281f0
2011-10-05 16:13:18 -04:00
Scott Main
2950b1b234 add spell checker sample to build
Change-Id: Id03246e140ee6676810fcefebff0ba73115987ec
2011-10-05 13:08:18 -07:00
Irfan Sheriff
0f43161150 Add a time threshold for re-enabling networks
Reconnecting to a bad network can be expensive (network down time wise and for the device as well).

Add a minimum threshold.

Bug: 5234206
Change-Id: I5ef1fe06038db73c29a3e95b6229506555f36c77
2011-10-05 12:49:13 -07:00
Steven Ross
94d2f366f9 Merge "Killing Facelock when a phonecall comes in" 2011-10-05 12:46:27 -07:00