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

83255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rich cannings
7646c773fa Merge "Allow verifiers to extend timeout" into jb-mr1-dev 2012-08-23 15:56:04 -07:00
Jean-Baptiste Queru
f1d9f892f1 am 79f6c5f5: am 1e739c96: am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app" 
* commit '79f6c5f5673c76c359f9f4b38539cfdb0251efee':
  Properly handle quick switch between Home button and Gallery app
 2012-08-23 15:54:05 -07:00
Katie McCormick
67de61b060 Merge "resolved conflicts for merge of 9447af12 to jb-mr1-dev" into jb-mr1-dev 2012-08-23 15:50:29 -07:00
rich cannings
d9ef3e5495 Allow verifiers to extend timeout 
Create a new verifier API to extend the timeout for a giving package,
including the resulting action (allow or deny) upon the timeout occuring.

Bug: 6901038
Change-Id: I351f7944327f863aff1d7dd1227be74652fa1511
 2012-08-23 15:39:02 -07:00
Katie McCormick
03a429ddcd resolved conflicts for merge of 9447af12 to jb-mr1-dev 
Change-Id: I5b5f086dd27a8c567b27fb9a7799b0552a8e0ae4
 2012-08-23 14:47:51 -07:00
Jeff Sharkey
2e9aa74127 Merge "Make USER_PRESENT broadcast per-user." into jb-mr1-dev 2012-08-23 14:44:22 -07:00
Jeff Sharkey
6a25cbdd94 Make USER_PRESENT broadcast per-user. 
Bug: 7029707
Change-Id: Ic4671b96525dc2fb4d58ce3fca0a4627598a6cae
 2012-08-23 14:43:44 -07:00
Adam Powell
11a03afaad Merge "Properly respect divider settings for TableLayout" into jb-mr1-dev 2012-08-23 14:18:22 -07:00
Victoria Lease
865a1756b6 Merge "Set text locale in language settings panel." into jb-mr1-dev 2012-08-23 14:14:38 -07:00
Adam Powell
c3c0e39ab5 Properly respect divider settings for TableLayout 
Make sure that TableLayout always knows it's in VERTICAL orientation.

Bug 7041351

Change-Id: I9935891a58e558840ac7956a0ffe8448e21de799
 2012-08-23 14:13:10 -07:00
Roman Nurik
1caca0a1f2 am 2b4b1afc: am 6d672214: Merge "Update TabCompat training sample code download." into jb-dev 
* commit '2b4b1afcfa75dc2a3d9436bcde5538a49c56d124':
  Update TabCompat training sample code download.
 2012-08-23 14:11:45 -07:00
Jean-Baptiste Queru
013ff81961 am 0a72b3e1: ignore merge of 2e2849a5 to jb-dev-plus-aosp 
* commit '0a72b3e12ca96d830ce6639f045d1f4decf9e748':
  Empty DC's apnList when the DC is free.
 2012-08-23 14:11:38 -07:00
Dianne Hackborn
5d1122a3f8 Merge "Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev 2012-08-23 14:00:22 -07:00
Dianne Hackborn
f1c26e2fd0 Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action. 
Change-Id: I0c9336bb072b4622a5eab6d3ec104c4cc38e367a
 2012-08-23 13:59:40 -07:00
John Spurlock
156c9cc2bf Merge "Disable screensavers if below first battery warning level." into jb-mr1-dev 2012-08-23 13:34:05 -07:00
John Spurlock
10fb224623 Disable screensavers if below first battery warning level. 
Don't activate on sleep if below the threshold, and quit any currently
running dream when the threshold is reached.

Bug:6999949
Change-Id: I961b350d24ee6f95e502228aaa57312b0ffbadc1
 2012-08-23 16:23:18 -04:00
Doug Zongker
d8b6fa2931 Merge "pass --locale argument to recovery" into jb-mr1-dev 2012-08-23 13:17:25 -07:00
Stephen Hines
bb121d569c am 7cb7292f: (-s ours) am 56c6392f: (-s ours) am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit '7cb7292f046bb860069a0881fc45753872551079':
  DO NOT MERGE - Fix readback lengths
 2012-08-23 12:34:40 -07:00
Justin Ho
fd9619f647 am 3bc03666: am 72404a82: Merge "Update Back softkey icon Bug: 6020915" into jb-dev 
* commit '3bc03666ccd322f8ebc0c303dabe920b2ae6944c':
  Update Back softkey icon Bug: 6020915
 2012-08-23 12:34:37 -07:00
Irfan Sheriff
b25617e72e am 46b29d8d: (-s ours) am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer" 
* commit '46b29d8dd558c734f058b3806a0b56a2a23b33fd':
  WifiWatchdog: handle exception from ArpPeer
 2012-08-23 12:34:19 -07:00
John Spurlock
21b53df7c3 Merge "Add framework support for multiple dreams." into jb-mr1-dev 2012-08-23 10:44:05 -07:00
Amith Yamasani
41d4332ab0 Merge "Handle null cache directory" into jb-mr1-dev 2012-08-23 10:13:42 -07:00
Amith Yamasani
92d570529c Handle null cache directory 
data/android directory doesn't exist sometimes, and hence cache
directory creation fails. Don't crash the process due to that.

Change-Id: I22d7ed5df9c70f021a87029e89a13a11b4b0303b
 2012-08-23 10:07:52 -07:00
Doug Zongker
e33b4007ee pass --locale argument to recovery 
When RecoverySystem boots into recovery (to install an update or wipe
data and/or cache), pass the --locale argument with the currently
selected locale.

Change-Id: Ib280330932a402be2011207bff8f05caa9b999cd
 2012-08-23 09:52:14 -07:00
Craig Mautner
6715d1effa Merge "Clean up displayId and layerStack usage." into jb-mr1-dev 2012-08-23 08:44:53 -07:00
Craig Mautner
b47bbc3d80 Clean up displayId and layerStack usage. 
Make better use of Display object by saving it in DisplayContent.
Only use layerStack when referring to Surfaces. Get displayId from
default Display or default DisplayContent. Remove warnings.

Fixes bug 7038151.

Change-Id: Ie493f0f5e755dc9b91ee969ff561c2a098283ead
 2012-08-23 08:43:54 -07:00
Jean-Baptiste Queru
79f6c5f567 am 1e739c96: am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app" 
* commit '1e739c96246ca7f0991bb783452b405ffd57cad7':
  Properly handle quick switch between Home button and Gallery app
 2012-08-23 08:41:55 -07:00
Jean-Baptiste Queru
1e739c9624 am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app" 
* commit 'a4e34ae82f2ccf037875462809be6e5139807b44':
  Properly handle quick switch between Home button and Gallery app
 2012-08-23 08:40:03 -07:00
Jean-Baptiste Queru
a4e34ae82f Merge "Properly handle quick switch between Home button and Gallery app" 2012-08-23 08:04:46 -07:00
Michael Jurka
03f482c34d Merge "Recents: apps scale down to thumbnails now" into jb-mr1-dev 2012-08-23 04:57:55 -07:00
Michael Jurka
cb2522c86d Recents: apps scale down to thumbnails now 
As a part of this change, Recents is now an
activity.

Known issues:
* Jank: jump-cut as app icon appears suddenly
  after the aniamtion
* Preloading recents is broken on phones without
  soft nav bar and on tablets
* Thumbnail window from animation lingers/flashes
  sometimes

Change-Id: Ie6f991f3c2e1e67f9ed84eb6adba9174ed957248
 2012-08-23 04:53:53 -07:00
Ben Murdoch
ed965a2cd1 Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev 2012-08-23 02:17:34 -07:00
Kenny Root
618641f266 Merge "Add ability to replace chain for PrivateKeyEntry" into jb-mr1-dev 2012-08-22 22:55:21 -07:00
Baligh Uddin
12850a93ca Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-22 20:23:55 -07:00
Baligh Uddin
48df87298a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-22 19:50:06 -07:00
Amith Yamasani
2c1dfa29b4 Merge "Fix deadlock in removing a user" into jb-mr1-dev 2012-08-22 18:19:20 -07:00
Jeff Sharkey
3451dc9064 Merge "Iteration on multi-user external storage." into jb-mr1-dev 2012-08-22 18:17:30 -07:00
Amith Yamasani
0cd867c83e Fix deadlock in removing a user 
Cleanup PackageManager settings after the package directories are removed.

Change-Id: I264bc95ea21da653a234d7c81df5b25d4de7aa9e
 2012-08-22 16:45:47 -07:00
Victoria Lease
0203341a0b Set text locale in language settings panel. 
This results in the CJK locales displaying locale-appropriate glyphs
regardless of the device's locale.

Change-Id: I1564b0b63597f068f4680d0a59fc82dea2dbbba3
 2012-08-22 16:27:38 -07:00
Katie McCormick
9447af12e2 am 645eab64: Merge "Doc update: client javadoc fix for @value." into jb-dev 
* commit '645eab640e9c139b7a4e99c6c4d4f3bb2a86f092':
  Doc update: client javadoc fix for @value.
 2012-08-22 16:21:46 -07:00
Roman Nurik
2b4b1afcfa am 6d672214: Merge "Update TabCompat training sample code download." into jb-dev 
* commit '6d672214ae04e7d8d239c322ec4c79f9ee1feea9':
  Update TabCompat training sample code download.
 2012-08-22 16:21:40 -07:00
Jean-Baptiste Queru
0a72b3e12c ignore merge of 2e2849a5 to jb-dev-plus-aosp 
Change-Id: Ie13c209a6646a08107ffecc9e63610fd5b9fab55
 2012-08-22 15:36:27 -07:00
Ying Wang
9f814ac5fc Merge "Remove obsolete variables." into jb-mr1-dev 2012-08-22 15:19:44 -07:00
Chet Haase
5f9e92f46f Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev 2012-08-22 15:06:56 -07:00
James Dong
d78fc5b94d Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev 2012-08-22 14:50:27 -07:00
Katie McCormick
645eab640e Merge "Doc update: client javadoc fix for @value." into jb-dev 2012-08-22 14:33:27 -07:00
Stephen Hines
7cb7292f04 am 56c6392f: (-s ours) am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit '56c6392fefba53e72c9effb7b5c92c64e03ecfd5':
  DO NOT MERGE - Fix readback lengths
 2012-08-22 14:24:39 -07:00
Stephen Hines
56c6392fef am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit '9f7fa4c4177c405566445760ec7f4c27e812cd7f':
  DO NOT MERGE - Fix readback lengths
 2012-08-22 14:23:01 -07:00
Craig Mautner
b9b56954ec Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev 2012-08-22 14:14:54 -07:00
Stephen Hines
9f7fa4c417 Merge "DO NOT MERGE - Fix readback lengths" 2012-08-22 14:06:37 -07:00