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

87242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
5aafdeba34 am f7661eed: am 6704a48b: Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev 
* commit 'f7661eedf3a774d4ae3c3a64c9ae8f7d428847a4':
  Fixes to Starting window and Wallpaper windows.
 2012-09-19 15:21:39 -07:00
Dianne Hackborn
4786223a08 am 7788b759: am 52716deb: Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev 
* commit '7788b759726f4c3c004075ac5c5977f6e4c82fe0':
  Fix deadlock in LockPatternUtils by using local id.
 2012-09-19 15:21:35 -07:00
Craig Mautner
b74d9f8285 am 18f42668: am 8f301e66: Merge "Add debug for b/7094175." into jb-mr1-dev 
* commit '18f42668e44edf75f4cbf096966943b4a1b267b2':
  Add debug for b/7094175.
 2012-09-19 15:21:31 -07:00
Christopher Tate
7d295bdae4 am 43b69c75: am a1c46636: Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 
* commit '43b69c7580169851ef1fe84af23674ed3b54ca1a':
  Disable content observer cross-user permission checks...
 2012-09-19 15:21:28 -07:00
Dianne Hackborn
1a30458a0b am a553eeaf: am 390392ff: Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 
* commit 'a553eeaf877457cdacceb401529201a40223e64c':
  Changes to support side-loading of apps from other users.
 2012-09-19 15:21:17 -07:00
Baligh Uddin
9a7b3cf6fa am 35566f9b: (-s ours) am f8d618cb: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '35566f9b4f1a72526712986c4356141ed68db353':
  Import translations. DO NOT MERGE
 2012-09-19 15:21:12 -07:00
Adam Powell
7962fd36fc am d1f13586: am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit 'd1f135869e1e89348ea9d1ee916749e30933fe7f':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 15:21:04 -07:00
Fabrice Di Meglio
6f7f916ae6 am d02341d0: am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 
* commit 'd02341d0bd4a7a36bc7b9c991ed47d6f98a756ee':
  Fix bug #7146516 Padding can be "over" resolved
 2012-09-19 15:21:00 -07:00
Fabrice Di Meglio
ea19ae20db am eebe7df2: am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 
* commit 'eebe7df2a37520bc97f9fc8025827d46fb22b32b':
  Fix some typos in Javadoc for Accessibility APIs
 2012-09-19 15:20:57 -07:00
Raph Levien
3fb7dd4f27 am 3c9a0b11: am d79dd344: Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev 
* commit '3c9a0b11de89f9337752b3e6ed6a864198fb5d0a':
  Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family
 2012-09-19 15:20:48 -07:00
Dianne Hackborn
79c8c7a4ff am 9b4d528d: am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 
* commit '9b4d528d7edf3d55a925b79ab7ba7664a9cb7a5e':
  Switch to showing top-most thumbnail of recent apps.
 2012-09-19 15:20:41 -07:00
Scott Main
c0dbf36f9c am 7b882e36: am 5580005c: am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '7b882e36ce4a8d7a44ac07fe212f1f873f961eac':
  udpate media formats for JB
 2012-09-19 15:20:36 -07:00
Jeff Sharkey
d3800acea5 am f40a2ba1: am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'f40a2ba1469304b44097d40c526f1bc9500ded93':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-19 15:20:32 -07:00
Glenn Kasten
7958595a16 am a84ed723: am 549be8be: Merge "New API for querying audio properties" into jb-mr1-dev 
* commit 'a84ed72307c178daefcfd65a35be4ad946b421d9':
  New API for querying audio properties
 2012-09-19 15:20:24 -07:00
Baligh Uddin
9ef9de7fdb am ed6650c5: (-s ours) am 7b6ec1f6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ed6650c500bab5fcdff9f5b14c93c65267e9a250':
  Import translations. DO NOT MERGE
 2012-09-19 15:19:58 -07:00
Narayan Kamath
ec0e97fe7a am 40c5a7a6: am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 
* commit '40c5a7a6e14447bbe66e6daeca7e992bcf200012':
  Add APIs to enable SNI and session tickets on sockets.
 2012-09-19 15:19:38 -07:00
Irfan Sheriff
6ad0da54a8 am 74f4997c: am 5d4206a5: Merge "Get strings in" into jb-mr1-dev 
* commit '74f4997ca467bda930e1c270f82731e66666999c':
  Get strings in
 2012-09-19 15:19:08 -07:00
Jim Miller
bb05cb958b am a149f197: am 5d8d169b: Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev 
* commit 'a149f19742a1b7ea8a6539d1f77bbc70980c7d1c':
  Fix wrong pattern count in keyguard pattern security view.
 2012-09-19 15:19:01 -07:00
Amith Yamasani
dc5b1dd508 am 728f3193: am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev 
* commit '728f3193efbdacc81442f7cdcfc49d3c8804e5ee':
  DevicePolicyManager per user
 2012-09-19 15:18:46 -07:00
Jason Sams
f5f8ee13ed am dd2f703d: am 2d95a33d: Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev 
* commit 'dd2f703df5ecb27de07279f28bbfc7ca0dabc3a0':
  Fix build.  Missed current.txt in previous checkin.
 2012-09-19 15:18:36 -07:00
Romain Guy
5a6408c88b am deaa0701: am 4e54f930: Merge "Add test for layer updates optimizations" into jb-mr1-dev 
* commit 'deaa0701131b739310da8e75b21898209c43ed5e':
  Add test for layer updates optimizations
 2012-09-19 15:18:31 -07:00
Adam Powell
1587a6531f am 6837fc34: am 2a81fe68: Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev 
* commit '6837fc3442b552775d9a657ad943569d8221c35a':
  Further tune config_minScalingSpan for small screen devices.
 2012-09-19 15:18:26 -07:00
Jason Sams
9cb3f96e39 am c7b20e5c: am 55db6865: Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev 
* commit 'c7b20e5cd4abfbdae8ab615a6a6d78ecb12a4b40':
  Clean up and publish the YUV to RGB intrinsic.
 2012-09-19 15:18:21 -07:00
Adam Powell
5b76cede6b am 3179154c: am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 
* commit '3179154c367ace1deb56340a641a7ebc53ba5e82':
  Make invalidateOptionsMenu asynchronous
 2012-09-19 15:18:17 -07:00
Jeff Sharkey
daa57e8d18 Migrate network stats from removed users. 
When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket.  Also removes those stats from
kernel to avoid double-counting if another user is created.

Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9
 2012-09-19 14:54:05 -07:00
Jeff Sharkey
4046e01288 Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 2012-09-19 14:52:34 -07:00
John Spurlock
f4f6b4c8b0 Fire "dreaming started" and "dreaming stopped" broadcasts. 
Dream manager now fires broadcast intents when entering + exiting
dreamland (except when testing).

Power manager can now listen for dreams ending, using polling only
as a backstop.

Also:
 - Bullet-proof dream-manager/dream against known failure modes
 - Add new read/write dream permissions
 - Refactor dream-manager to delegate work + state management into
   a new DreamController class, via a handler

Bug:6999949
Bug:7152024
Change-Id: I986bb7812209d8c95ae1d660a5eee5998a7b08b1
 2012-09-19 17:36:50 -04:00
Kenny Root
55552094a2 Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev 2012-09-19 14:32:21 -07:00
John Reck
55bc7efaf9 Revert "Test aggressive throttling" 
Bug: 7182109
This reverts commit c7c85b34dad5ee722bd9f14318c1e0e4237d529e.

Change-Id: Ibc8837b97450ec6e77a0e9dd509280ff780bb22b
 2012-09-19 14:26:48 -07:00
Eric Laurent
bc0fab1fc2 Add multi user volume management 
Notification and Alarm volumes are per user: they are saved and restored
when the foreground user changes.
Media volume is global: it is still saved and restored per user for
implentation reasons but is copied from one user to the next to ensure
media playback volume continuity when switching users.

Ringer mode (silent, vibrate...) is now a global setting.

Bug 7128886.

Change-Id: I9f4f5a0a3985552bca61c2cc3bbe5a144db755a6
 2012-09-19 14:16:08 -07:00
Craig Mautner
f7661eedf3 am 6704a48b: Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev 
* commit '6704a48bd06f01d2933f83e9b5eda4ed9846bab7':
  Fixes to Starting window and Wallpaper windows.
 2012-09-19 14:09:01 -07:00
Dianne Hackborn
7788b75972 am 52716deb: Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev 
* commit '52716deb4008da1d566dfd711edc0a9c6de5f79f':
  Fix deadlock in LockPatternUtils by using local id.
 2012-09-19 14:08:57 -07:00
Craig Mautner
18f42668e4 am 8f301e66: Merge "Add debug for b/7094175." into jb-mr1-dev 
* commit '8f301e666873e4a9feaace38a0b184a5f3ce7003':
  Add debug for b/7094175.
 2012-09-19 14:08:51 -07:00
Christopher Tate
43b69c7580 am a1c46636: Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 
* commit 'a1c46636dd533e889e1f3b3326fa0d851928df4f':
  Disable content observer cross-user permission checks...
 2012-09-19 14:08:43 -07:00
Kenny Root
dbf30edf76 Update preloaded-classes for JB-MR1 
Bug: 5213043
Change-Id: I13fa58fded8e47d2f11d1fbe6724bd81ce35276a
 2012-09-19 13:32:21 -07:00
Craig Mautner
6704a48bd0 Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev 2012-09-19 13:29:44 -07:00
Dianne Hackborn
52716deb40 Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev 2012-09-19 13:28:11 -07:00
Craig Mautner
f1b6741975 Fix deadlock in LockPatternUtils by using local id. 
Activity manager now updates window manager's current user id
directly and immediately rather than waiting for a broadcast
update. Window manager passes this through policy to the
KeyguardViewMediator and into LockPatternUtils. LockPatternUtils
no longer goes to Activity to get the current user id if it finds
that its local id is non-default.

Fixes bug 7193726.

Change-Id: Id5613e7a9fe9e5b49e83c26b74504f587c3998c2
 2012-09-19 13:18:29 -07:00
Jeff Sharkey
4673e7ea8d Migrate UI to supportsMultipleUsers(). 
Bug: 7194531
Change-Id: Ifbbe3b4d954f8d11fb1c94674e5e7f8e21264c75
 2012-09-19 13:14:30 -07:00
Craig Mautner
8f301e6668 Merge "Add debug for b/7094175." into jb-mr1-dev 2012-09-19 13:07:53 -07:00
Christopher Tate
a1c46636dd Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 2012-09-19 13:01:32 -07:00
Dianne Hackborn
a553eeaf87 am 390392ff: Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 
* commit '390392ff3ef0114544eab3db4093c1c7aba825da':
  Changes to support side-loading of apps from other users.
 2012-09-19 12:58:36 -07:00
Dianne Hackborn
390392ff3e Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 2012-09-19 12:52:32 -07:00
Christopher Tate
e6c660ab35 Disable content observer cross-user permission checks... 
... until we have a solid fix for the singleton ContentProvider
problem cases in place.

Bug 7190837

Change-Id: Ibbef2ddc594896ba7b9217e2856c3e393f525af6
 2012-09-19 12:51:35 -07:00
Dianne Hackborn
eba784ff4a Changes to support side-loading of apps from other users. 
Change-Id: I5b7c0aa0dc9566b29d5980dc7f42a508a61a58d3
 2012-09-19 12:42:37 -07:00
Baligh Uddin
35566f9b4f am f8d618cb: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f8d618cb6e634c158efbbf93dad74edd3090559c':
  Import translations. DO NOT MERGE
 2012-09-19 12:37:16 -07:00
Baligh Uddin
5d90374016 Merge "Import translations. DO NOT MERGE" 2012-09-19 12:36:48 -07:00
Baligh Uddin
f8d618cb6e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-19 12:34:40 -07:00
Adam Powell
d1f135869e am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit '10bd4106efc22efd57875a2fb914110475c91856':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 12:31:39 -07:00
Adam Powell
10bd4106ef am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit 'baed0a8f0b43191c8f001e064ff42cf27a305d87':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 12:26:06 -07:00