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

156364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
ec705c2c58 Only hide sensitive content when Keyguard is showing 
isOccluded is set delayed when unlocking the phone from a
notification, so updatePublicMode used a stale state. Now, only
the fact whether the Keyguard is showing (no matter if occluded or
not) is used to determine the public mode, which is set in a
synchronous manner.

Bug: 18026898
Change-Id: I3e4988f3e806cf15616ee5aa452f81f19d4aa716
 2014-11-03 22:08:05 +01:00
Mike Lockwood
946863b63c Merge "Fix USB audio disconnect logic" into lmp-mr1-dev 2014-11-03 18:38:14 +00:00
John Reck
541641d033 Merge "Fix counting" into lmp-mr1-dev 2014-11-03 18:35:59 +00:00
Adrian Roos
698078a7e9 Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 2014-11-03 18:33:54 +00:00
John Reck
88f5fc7c5a Fix counting 
Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
 2014-11-03 10:32:24 -08:00
John Reck
1787b4ea43 Merge "Fix cancel crash" into lmp-mr1-dev 2014-11-03 18:27:41 +00:00
Geoff Mendal
188416bf38 am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2d7e612ed1df3580d35cfc94bbcba660f0f058e2':
  Import translations. DO NOT MERGE
 2014-11-03 18:01:46 +00:00
John Reck
55b46eff39 Fix cancel crash 
Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
 2014-11-03 10:00:33 -08:00
Geoff Mendal
2d7e612ed1 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-03 17:53:12 +00:00
Geoff Mendal
ef8c3cc4f6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-03 17:52:11 +00:00
Ricardo Cervera
d68bdd6bfa am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit '6ff586f71b03b658096e51fdbc17274044341713':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:41:45 +00:00
Ricardo Cervera
6ff586f71b am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit 'fa37321f05ad96a1de6863bc08fe1e496cceea9e':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:36:56 +00:00
Ricardo Cervera
fa37321f05 am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit '3e621914cacf692700dce007ec7d7893fcc12a8c':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:31:32 +00:00
Ricardo Cervera
3e621914ca Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 2014-11-03 17:27:09 +00:00
Scott Rowe
1117098b61 am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit 'd4e3825a83764f9692f833c73915c310f83e38eb':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:22:26 +00:00
Casey Burkhardt
5e2986ef20 am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 
* commit '2997285f362349097882d1b31eb23cb867227192':
  Disable circular display mask with color inversion
 2014-11-03 17:22:13 +00:00
Geoff Mendal
a958819b73 Import translations. DO NOT MERGE 
Change-Id: Ia68d4e853864dd44c7531374c30794d4a0bbd8a3
Auto-generated-cl: translation import
 2014-11-03 09:10:40 -08:00
Adrian Roos
cbe614ff7d Improve TrustManagerService user lifecycle 
- Only bind agents of running users
- Explicitly clean up state when users are removed
- Delay binding until third-party apps can actually run

Bug: 18102460
Change-Id: I5017adc1634b249068099fc5779ba95904312438
 2014-11-03 18:07:11 +01:00
Geoff Mendal
d2c26c9d7f Import translations. DO NOT MERGE 
Change-Id: I21e1890c7ff4490469fb0243df69b560db9b29b6
Auto-generated-cl: translation import
 2014-11-03 09:06:30 -08:00
Scott Rowe
d4e3825a83 am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit '1b2cf3f8f64013441fc021db45e00381d4b2d19b':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:00:31 +00:00
Casey Burkhardt
2997285f36 Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 2014-11-03 16:55:27 +00:00
Scott Rowe
1b2cf3f8f6 am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit 'cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 16:54:29 +00:00
Scott Rowe
cd796536ce Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 2014-11-03 16:24:38 +00:00
Adrian Roos
808fe6f99f Merge "Fix colored status bar panning issues" into lmp-mr1-dev 2014-11-03 15:44:08 +00:00
Geoff Mendal
dde49a4fe8 am c95236de: (-s ours) Import translations. DO NOT MERGE 
* commit 'c95236deadfed31966661c7ed5c5db7422b3d0dc':
  Import translations. DO NOT MERGE
 2014-11-03 15:07:50 +00:00
Geoff Mendal
c95236dead Import translations. DO NOT MERGE 
Change-Id: Ic1ed8ade48ee37210f335564cc5640675db47290
Auto-generated-cl: translation import
 2014-11-03 06:58:11 -08:00
Adrian Roos
862d72e2f4 Merge "Improve dump of status bar service" into lmp-mr1-dev 2014-11-03 14:56:48 +00:00
Christoph Studer
f3aa1c8d79 Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev 2014-11-03 14:49:17 +00:00
Geoff Mendal
7ed62e4e94 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-03 14:46:11 +00:00
Geoff Mendal
6733743d6e Import translations. DO NOT MERGE 
Change-Id: I93f51ef821e604f91d7323c953a98bea7ef8204c
Auto-generated-cl: translation import
 2014-11-03 06:43:47 -08:00
Jason Monk
2e647efe01 Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 2014-11-03 14:36:02 +00:00
Narayan Kamath
9301eafbcc Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 2014-11-03 12:45:16 +00:00
Santos Cordon
27be7b3586 Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 2014-11-03 07:54:05 +00:00
Santos Cordon
58ef48cb2b Merge "Even, Even more telecom javadoc." into lmp-mr1-dev 2014-11-03 07:53:40 +00:00
Dongwon Kang
4dd56c93e3 TIF: Add more documentation on start/end time of TvContract.Program 
Bug: 18163685
Change-Id: Ifcd57330eb341adfbcb7fcf3482a701471bf729f
 2014-11-03 10:58:00 +09:00
Scott Rowe
8d262c3a03 am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit '20ee9f122da1572ffb4e9a76eddc71180a4e608d':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:42:02 +00:00
Scott Rowe
20ee9f122d am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit 'de7409859315de19f081325a82a9c3ef99f28f26':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:33:50 +00:00
Scott Rowe
de74098593 am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit 'aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:28:23 +00:00
Scott Rowe
aa275bf989 Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 2014-11-01 16:23:12 +00:00
Jeff Brown
a71601a98c am 13f00f07: Implement multi-press behavior for power key. 
* commit '13f00f07d69f087cf186c23ae6c6fc938e2be561':
  Implement multi-press behavior for power key.
 2014-11-01 14:10:50 +00:00
Jeff Brown
0ed053ef53 am e333e674: Add a function to boost screen brightness temporarily. 
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
  Add a function to boost screen brightness temporarily.
 2014-11-01 14:10:46 +00:00
Joe Fernandez
f16f6d9ed2 am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references 
* commit '84045506140d895aaf4fdc5a090e89d657add120':
  docs: multidex - building apps with over 65K method references
 2014-11-01 14:10:43 +00:00
Joe Fernandez
a1caad91c7 am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs 
* commit '0e4ef673696c0a2c352379b325ed281478512da3':
  docs:studio-updates-814v2
 2014-11-01 14:09:34 +00:00
smain@google.com
f417409eb2 am 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page 
* commit '515daeead864ba47e04a1ca4c41b8f1cacaef95b':
  revise helpouts tags to use just one on each page
 2014-11-01 14:09:09 +00:00
smain@google.com
b2b3b37e2f am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page 
* commit '9b00d795d18b8a52b54f919e53b094e689bfc92e':
  revise helpouts tags to use just one on each page
 2014-11-01 14:09:05 +00:00
Alex Klyubin
2f1c76f074 am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs 
* commit 'dcf5af38bfd306af77613aa051393bf7d8e8fb44':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 14:08:40 +00:00
Ricardo Cervera
84a48b0a4a am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev 
* commit '84ca5ddb0844146408e241e7022c78477d9c4a6f':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 14:08:31 +00:00
Joe Fernandez
ed47742ff0 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
* commit '43fda072c227e7a98dbcb993dc20fb391c1f11fc':
  docs:studio-update-814
 2014-11-01 14:08:18 +00:00
Mark Renouf
024bc87645 am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
* commit '2182bf5ac836fcc740fd5c65e76890ca53dce1b7':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-11-01 14:08:13 +00:00
Scott Rowe
0948545e30 am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 
* commit 'dfeb60558e87879c9575b32281e9c22fec623198':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-11-01 14:07:41 +00:00