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

158183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
3765ae9ff1 am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ef8c3cc4f663875f6b5c62364d4bc61080d3a23d':
  Import translations. DO NOT MERGE
 2014-11-03 17:54:25 +00:00
Geoff Mendal
2d7e612ed1 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-03 17:53:12 +00:00
Geoff Mendal
6bdbebadad Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-03 17:52:57 +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
73d5b5f2e3 am d68bdd6b: am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit 'd68bdd6bfa720a2837161bd66a456a07a640a774':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:46:17 +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
Scott Rowe
aa3be67032 am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit '1117098b6186de95d98f649e4cd1b56debb3efbd':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:27:27 +00:00
Casey Burkhardt
fb80a3b2fd am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 
* commit '5e2986ef2067fd24c10f100858d166353a46caba':
  Disable circular display mask with color inversion
 2014-11-03 17:27:20 +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
Geoff Mendal
b47c651ef7 Import translations. DO NOT MERGE 
Change-Id: Ic1fb3518c1b06345d69abacb9164ae4a52dcf270
Auto-generated-cl: translation import
 2014-11-03 09:07:58 -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
Bryce Lee
5c13832eee [Theater Mode] Add framework support for screen double tapping out of theater mode. 
Bug: 18120031
Change-Id: Ia70d62b26d63e3d6708e44239c9a33001548207d
 2014-11-03 08:28:29 -08: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
fcad9e1741 am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev 
* commit '808fe6f99fba753e0ec4c5e90de0ff7a2140e8a6':
  Fix colored status bar panning issues
 2014-11-03 15:47:01 +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
c35e9620ed am dde49a4f: (-s ours) am c95236de: (-s ours) Import translations. DO NOT MERGE 
* commit 'dde49a4fe8ae9a4736d171efbadb067e7d4cc81d':
  Import translations. DO NOT MERGE
 2014-11-03 15:12:00 +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
Adrian Roos
8af07f4717 am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev 
* commit '862d72e2f4e600d6188f5a21a906d5374ab4f123':
  Improve dump of status bar service
 2014-11-03 15:00:43 +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
d99ae19303 am f3aa1c8d: Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev 
* commit 'f3aa1c8d7915afd51d21bf79feb2285dffcc3827':
  SysUI: Use mScreenOnFromKeyguard for panel visibility
 2014-11-03 14:55:06 +00:00
Geoff Mendal
feb14d20de Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-03 14:54:06 +00:00
Geoff Mendal
d2a6bd52d6 am 7ed62e4e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '7ed62e4e947df28175d71a637d74d590f36dcb24':
  Import translations. DO NOT MERGE
 2014-11-03 14:50:47 +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
71cb50e269 Import translations. DO NOT MERGE 
Change-Id: Ia57971f3a657a338508d7d51c727cb0df25ae106
Auto-generated-cl: translation import
 2014-11-03 06:48:47 -08: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
5c69f5b276 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 
* commit '2e647efe01dcdb82d2d7f8a23540ba6b690a95d6':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:41:07 +00: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
726e9ea732 am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 
* commit '9301eafbcc39f9cf6980f937f78886f35dec9d9f':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:50:46 +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
04f3eebe0d am 27be7b35: Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 
* commit '27be7b3586dcf87da4badd55693de4fc1c0bfaa7':
  Split Telecom PhoneAccount registration permissions.
 2014-11-03 07:59:16 +00:00
Santos Cordon
a79cf3c12d am 58ef48cb: Merge "Even, Even more telecom javadoc." into lmp-mr1-dev 
* commit '58ef48cb2b8eb44766bc32b9fe41e86596a5ae74':
  Even, Even more telecom javadoc.
 2014-11-03 07:59:11 +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
79d2b4c810 TIF: Fix a typo and remove an unused method in TvInputService 
Change-Id: I2c0233678c08a7070ffe507d9671e1ab669fdfd8
 2014-11-03 16:04:12 +09:00
Dongwon Kang
664eddfdc7 am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program 
* commit '4dd56c93e363aeb10ce94a57a33e8fe4f60e226a':
  TIF: Add more documentation on start/end time of TvContract.Program
 2014-11-03 04:16:34 +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
4e439d0312 am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit '8d262c3a033b9123f42a8ad1a3925684264b8450':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:47:16 +00: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