69169 Commits

Author SHA1 Message Date
Megha Joshi
bb0a160229 am 84099f3d: Merge "Adding TV related updates." into ics-mr1
* commit '84099f3d788974169a8ea282f9413cb399d17012':
  Adding TV related updates.
2012-03-08 12:21:55 -08:00
Megha Joshi
84099f3d78 Merge "Adding TV related updates." into ics-mr1 2012-03-08 12:20:21 -08:00
Adam Powell
7507d3d31c Fix measurement issues with Spinner and ListPopupWindow
Bug 6132826 - make sure that our speculative measurement of list items
uses an accurate width MeasureSpec. This bug would sometimes affect
window sizing when measuring height if content could wrap in the
presence of restricted width.

Change-Id: Ie28573e952cac3dfa2b95e4691758c72f26b8fd9
2012-03-08 12:19:31 -08:00
Megha Joshi
500cc4be2f A few updates for TVs.
Change-Id: I2465cbfdfd3a5b9e22f94bd1c678aec33ab216d9
2012-03-08 12:18:00 -08:00
Fabrice Di Meglio
bf923ebb25 More fixes about padding
- take care of overridig setPaddingRelative() too in TextView subclasses

Change-Id: If2057247cfcac919d777846def4adfeb5a682d51
2012-03-08 12:12:34 -08:00
Stephen Hines
ebc34f820c Merge "Check in older versions of RS tests." 2012-03-08 11:41:34 -08:00
Fabrice Di Meglio
3bef5e9f3a Merge "Fix View padding resolution" 2012-03-08 11:14:11 -08:00
Fabrice Di Meglio
0c245fb201 Merge "Make more TextView RTL APIs public" 2012-03-08 11:13:27 -08:00
Romain Guy
731f018928 Merge "Fix the build" 2012-03-08 11:09:49 -08:00
Romain Guy
e0cf12fc4d Fix the build
Change-Id: Ia86ba9b1c432ab3f8107557e95b12c9eedc4d9f7
2012-03-08 11:08:31 -08:00
Amith Yamasani
04e0d265e3 Make SyncManager and AccountManagerService multi-user aware.
AccountManagerService
- Maintain multiple account lists, one per user
- Keep multiple databases of accounts
- Account db moved to /data/system/users/<userid>/

SyncManager
- SyncStorageEngine keeps track of multiple users' accounts.
- SyncQueue maintained as a single instance, queueing requests from
  multiple users.
- Changed some methods to take userId arguments
- Removed some deadc0de
- Store the userId in the SyncOperation, so we know which provider
  instance to bind to when queued operations are processed.

ContentService
- Pass along the userid to sync manager calls.

ActivityManagerService:
- Fixed a bug in cancelIntentSender
- Don't bring other user's task forward when resetting tasks.

Updated tests

Change-Id: If317340ef68e902787aa3f5ceb4cf96f14aea695
2012-03-08 10:52:36 -08:00
Michael Kolb
5ec9193a9d Merge "Fix webview dropdown item resource" 2012-03-08 10:48:27 -08:00
Romain Guy
250069bf6b Merge "Ignore draw requests when the display is off" 2012-03-08 10:47:02 -08:00
Michael Kolb
635ba36bf9 Fix webview dropdown item resource
Bug: 5521715

Change-Id: I9818beb0f477eb405e4156bafb7ecbfb2a5986c0
2012-03-08 10:41:14 -08:00
Andreas Huber
cd40f4a062 Merge "Added better codec statistics to evaluate performance." 2012-03-08 09:07:10 -08:00
Glenn Kasten
263aa1ebe0 Merge "Mixer status cleanup" 2012-03-08 08:54:57 -08:00
Scott Main
0cfec99ed5 am f8ee2ebd: am 3e29de0e: am 99e790de: docs: add troido adk link
* commit 'f8ee2ebd0bd4a0fb92dad656af9b06034c20ab61':
2012-03-08 08:08:46 -08:00
Scott Main
efda0aed4f am f2c57b31: am 5e75bca9: am 99e790de: docs: add troido adk link
* commit 'f2c57b31424c5395d0ed1d23b1f5e00f274a2774':
  docs: add troido adk link
2012-03-08 08:08:42 -08:00
Glenn Kasten
a13446a8e2 Mixer status cleanup
Use mPrevMixerStatus for DirectOutputThread also.
Remove the MIXER_CONTINUE logic and use MIXER_IDLE instead.
Rename the field mixerStatus to mMixerStatus.
Rename local variable back to mixerStatus.

Change-Id: I0a8145fc856c6c5ff8b784b6176ef3c4d8eb7408
2012-03-08 07:52:57 -08:00
Glenn Kasten
59b86843dc Merge "Cleanup DirectOutputThread::mActiveTrack" 2012-03-08 07:14:45 -08:00
satok
a4fb0cb1fe Merge "Optimization of the request of the sentence level spell check" 2012-03-08 06:12:59 -08:00
satok
fe5a51ee04 Optimization of the request of the sentence level spell check
Change-Id: Ic89b0dd027bf0af6e8f1877043ae40baed48b2a4
2012-03-08 21:40:53 +09:00
Jonathan Dixon
ffb66ec254 Merge "Remove duplicated comments from WebViewClassic" 2012-03-08 04:23:34 -08:00
satok
3154fc45e5 Merge "Fix spell checker framework" 2012-03-08 02:31:08 -08:00
satok
2428ccbbde Fix spell checker framework
Change-Id: I281d031259dd220936832668e7a4556473ccb2ce
2012-03-08 18:52:21 +09:00
satok
792ee0cc4d Fix possible NPE in SpellChecker
Change-Id: Ib3c9fe7189c8f31a460149add857e9855919f386
2012-03-08 17:03:48 +09:00
Ben Gruver
db6e67d8ec Fix an issue where a non-styled string could be made into a styled string
If a styled version of an otherwise identical string is encountered before
a non-styled version, aapt merges the two, effectively making the
non-styled string have a spurious style.

Change-Id: I424a61c0c83c59e0b9c8939e457402efd06a7a4f
2012-03-07 21:19:16 -08:00
Mathias Agopian
8c79817dc6 remove files that moved to frameworks/native
Change-Id: I140d291e520097b1148930f736823650e08488f7
2012-03-07 19:36:08 -08:00
Mathias Agopian
08965ec67a fixup hardcoded include paths for new project
Change-Id: Id443ec5c99bb4d7653905f1be1f72a029e0cf087
2012-03-07 19:34:36 -08:00
Jeff Brown
7ae9d5faad Use the Choreographer for Drawable animations.
Change-Id: Ifcbf33434bf3c32d1900fd0b3f5bde004604ce8a
2012-03-07 19:02:51 -08:00
Fabrice Di Meglio
509708deb8 Fix View padding resolution
- make setPadding() and setPaddingRelative() share same code

Change-Id: Iaefa82deb29d9efd6b3f88c751daf503c6b8f774
2012-03-07 18:01:14 -08:00
Stephen Hines
41f1e5edee Check in older versions of RS tests.
This change adds a v11 version of Fountain, as well as v11 and v14 versions of
RSTest. All tests currently build and pass on the required platforms.

This also fixes an initialization bug for RSTest running on older devices.
If we don't directly initialize "each" component of the vector types, it can
result in uninitialized memory (or zero) being used for divisors (particularly
with the char vector types). This triggers SIGFPE with the latest pending
Clang/LLVM rebase.

Change-Id: I92a70c2aeed4e20f110b1cb24ee926fc27be9dbb
2012-03-07 17:47:53 -08:00
James Dong
0de2ed3bf3 Merge "Changed 480p and 1080p resolution documentation" 2012-03-07 17:27:55 -08:00
Scott Main
f8ee2ebd0b am 3e29de0e: am 99e790de: docs: add troido adk link
* commit '3e29de0ed097e283718ddaebbf3c0654a6b630ce':
2012-03-07 17:22:43 -08:00
Scott Main
f2c57b3142 am 5e75bca9: am 99e790de: docs: add troido adk link
* commit '5e75bca9273b9656291192e13c83799f9300d486':
  docs: add troido adk link
2012-03-07 17:21:50 -08:00
Megha Joshi
87e32816c4 Adding TV related updates.
Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77
2012-03-07 17:19:44 -08:00
Scott Main
5e75bca927 am 99e790de: docs: add troido adk link
* commit '99e790de9ea23f59933fd695ca35bb6d1033b4e9':
  docs: add troido adk link
2012-03-07 17:19:22 -08:00
Scott Main
3e29de0ed0 am 99e790de: docs: add troido adk link
* commit '99e790de9ea23f59933fd695ca35bb6d1033b4e9':
  docs: add troido adk link
2012-03-07 17:19:06 -08:00
Adam Powell
1881f27b9d Merge "Fix bug 6029592 - font size setting causes clipped icon menu items" 2012-03-07 17:08:08 -08:00
Glenn Kasten
b8f96760dc Cleanup DirectOutputThread::mActiveTrack
Rename activeTrack to mActiveTrack.
Release the reference earlier, at the end of threadLoop_mix().
This allows the field to be made private and to
  move the declaration from PlaybackThread to DirectOutputThread.

Change-Id: I02be7a254638f7d85e92aaf0002d20ca0092a5c3
2012-03-07 17:05:59 -08:00
Roman Nurik
1a30d4ab42 am 23b39217: am ce8697f8: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '23b39217a5132bcf2cce94e98fbd486744f69958':
2012-03-07 17:05:32 -08:00
Android Git Automerger
6063f7965d am 30e9f880: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '30e9f8807e6c7fd7f450b2d4ee91badb1afa4d77':
2012-03-07 17:05:28 -08:00
Scott Main
b2924f66ff am 30f954dd: am bf03ee12: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '30f954dd2d0c44f3dcf542e42262cbd68353f34e':
2012-03-07 17:05:25 -08:00
Roman Nurik
8398f19f5c am f4d8fa60: am c4b44be6: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit 'f4d8fa6090f88ad84a543feba7fc74806af47ef4':
  docs: move Android Design from static HTML to JD
2012-03-07 17:05:19 -08:00
Scott Main
75de60c018 am 842b4e22: am fff19ee8: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '842b4e22e31f0fd976fa1b92620d680b7c37e78a':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-07 17:05:13 -08:00
Scott Main
d9ea892340 am 3f6912e5: am f3cbcf43: am 97b94e78: docs: a few more Market -> Play strings
* commit '3f6912e5e8e821b75c401b6ca44e6080e9cc388b':
2012-03-07 17:05:10 -08:00
Scott Main
a56d9b9d3f am 15b7481d: am 40dbc3db: am 97b94e78: docs: a few more Market -> Play strings
* commit '15b7481d34a2c9a154cd68811860b1f4e1d41962':
  docs: a few more Market -> Play strings
2012-03-07 17:05:07 -08:00
Xavier Ducrohet
c3b3e0dad1 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2012-03-07 17:05:06 -08:00
Dirk Dougherty
cd9bbc7a37 am 20d28a82: am 2ef5d3fd: am 9ad3d0ee: Update build-a-button to use new assets.
* commit '20d28a82650cd6750649fd74da1031911c99ae9f':
2012-03-07 17:04:52 -08:00
Selim Gurun
09ec58ea0f Merge "Prevent potential stall in dns proxy." 2012-03-07 17:04:52 -08:00