drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,147 Commits 1 Branch 0 Tags
Commit Graph

69147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
67b3a9ea61 Merge "Fix the docs" 2012-03-08 15:56:59 -08:00
Romain Guy
1e3d313c78 Fix the docs 
Change-Id: I73bcb684eac01db870936aa5e29df930b5432833
 2012-03-08 15:55:56 -08:00
Amith Yamasani
28ca8f9f95 Merge "Make SyncManager and AccountManagerService multi-user aware." 2012-03-08 15:55:20 -08:00
Romain Guy
754682e513 Merge "Fix the build." 2012-03-08 15:41:29 -08:00
Romain Guy
43e8eb1e21 Fix the build. 
That's twice today. I am ashamed.

Change-Id: I0ec7ab2b742e8054980a1ab7790c4896da9e2729
 2012-03-08 15:40:14 -08:00
Romain Guy
583fcb9175 Merge "Dispatch screen state change events to Views Bug #6120957" 2012-03-08 15:06:50 -08:00
Romain Guy
bb9908b828 Dispatch screen state change events to Views 
Bug #6120957

Using this new callback, views can interrupt and resume their
animations or other periodic tasks based on the current state
of the display.

Change-Id: I398f4abd421e9c5f207107bf1009a7b92cf45daa
 2012-03-08 15:05:12 -08:00
Ben Gruver
a0b29f5565 Merge "Fix an issue where a non-styled string could be made into a styled string" 2012-03-08 14:52:09 -08:00
Mathias Agopian
7d8775a87e Merge changes I140d291e,Id443ec5c 
* changes:
  remove files that moved to frameworks/native
  fixup hardcoded include paths for new project
 2012-03-08 14:45:51 -08:00
Dianne Hackborn
c9ab47b4fc Merge "Add new Intent API for associating a ClipData with an Intent." 2012-03-08 14:38:09 -08:00
Dianne Hackborn
21c241e061 Add new Intent API for associating a ClipData with an Intent. 
Allows applications to propagate multiple URI grants through an
Intent.

Later on, we should probably redefine the share actions to be
based on this ClipData with the old extras-based approach only
there for compatibility.  Even if we don't do that, though, this
allows you to do a multi-select share that grants multiple URI
permissions by stuffing the URIs in a ClipData.

Also add some documentation in various places telling people how
they can grant URI permissions.

Change-Id: Id4ba8e72c11caf7e1f1f438cb7af058d1586a37c
 2012-03-08 14:34:03 -08:00
Alex Sakhartchouk
c53254ec92 Merge "Enable AA in scenegraph. Minor shader work in sample." 2012-03-08 14:25:56 -08:00
Eino-Ville Talvala
ae8945ab23 Merge "Allow multiple releases to be called on MediaActionSound." 2012-03-08 14:25:35 -08:00
Eino-Ville Talvala
a4fd93751d Allow multiple releases to be called on MediaActionSound. 
Bug: 6136088
Change-Id: I80ff09a90cd65d874ae016d450c4cc8c6a56d387
 2012-03-08 14:18:06 -08:00
Megha Joshi
c8462e322b am 2126508d: am fa71583e: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '2126508d20d5ee9e5d5c8dbaf63286421fcddb38':
 2012-03-08 12:31:47 -08:00
Megha Joshi
b6c90f03c9 am b5ef90be: am e0e6612d: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit 'b5ef90bee0d8aaf61be0da705066b1f262c88873':
  A few updates for TVs.
 2012-03-08 12:31:44 -08:00
Megha Joshi
9e3f21e472 am 1994e1d1: am 702d9cbc: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '1994e1d1cb0d8e5f2a2ecdd8791005ec296ae861':
 2012-03-08 12:29:16 -08:00
Megha Joshi
2126508d20 am fa71583e: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit 'fa71583e15d1fda1b5fa51b22e0f8510082d5355':
 2012-03-08 12:29:09 -08:00
Megha Joshi
b5ef90bee0 am e0e6612d: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit 'e0e6612d30308a68c107d517582eb68f0e4caa99':
  A few updates for TVs.
 2012-03-08 12:27:41 -08:00
Megha Joshi
7ec22d33ac am 5c2fa5e5: am bb0a1602: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '5c2fa5e5c94994822e8e4b139f8db5799568240f':
  Adding TV related updates.
 2012-03-08 12:26:44 -08:00
Fabrice Di Meglio
bbd8226e97 Merge "More fixes about padding" 2012-03-08 12:26:22 -08:00
Elliott Hughes
940fcbddd3 Merge "Tracking changes to SSLParametersImpl.getDefaultTrustManager()" 2012-03-08 12:25:48 -08:00
Megha Joshi
1994e1d1cb am 702d9cbc: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '702d9cbc5d501dfa81030be2d0aec46d8f06e797':
 2012-03-08 12:25:34 -08:00
Megha Joshi
e0e6612d30 am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
  A few updates for TVs.
 2012-03-08 12:25:08 -08:00
Adam Powell
f8f0c8ea4b Merge "Fix measurement issues with Spinner and ListPopupWindow" 2012-03-08 12:24:32 -08:00
Megha Joshi
fa71583e15 am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
  A few updates for TVs.
 2012-03-08 12:24:29 -08:00
Megha Joshi
5c2fa5e5c9 am bb0a1602: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit 'bb0a160229cdfc86529517905b60d0ace2dd2172':
  Adding TV related updates.
 2012-03-08 12:24:20 -08:00
Brian Carlstrom
866666071b Tracking changes to SSLParametersImpl.getDefaultTrustManager() 
Change-Id: I0bcf2bbcd2581f6b66e08d1c6f0de24bf8d34199
 2012-03-08 12:23:53 -08:00
Megha Joshi
33372b217e Merge "A few updates for TVs." into ics-mr1 2012-03-08 12:22:49 -08:00
Megha Joshi
702d9cbc5d am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '84099f3d788974169a8ea282f9413cb399d17012':
  Adding TV related updates.
 2012-03-08 12:22:05 -08:00
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