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

166335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
1814f14c7d am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev 
automerge: fcad9e1

* commit 'fcad9e17413da20db95a2cccbfc8641d2f30a4e6':
  Fix colored status bar panning issues
 2014-11-03 15:48:21 +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
d5334e9f0e am dde49a4f: (-s ours) am c95236de: (-s ours) Import translations. DO NOT MERGE 
automerge: c35e962  -s ours

* commit 'c35e9620edd2a214185ecd208ae58ee3a18d4678':
  Import translations. DO NOT MERGE
 2014-11-03 15:13:16 +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
670edcb535 am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev 
automerge: 8af07f4

* commit '8af07f4717359c8421bc91c8171fcf749714b08f':
  Improve dump of status bar service
 2014-11-03 15:02:09 +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
Christoph Studer
635d36fd49 am f3aa1c8d: Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev 
automerge: d99ae19

* commit 'd99ae19303105ab7ba3df1907e1537157d6889e1':
  SysUI: Use mScreenOnFromKeyguard for panel visibility
 2014-11-03 14:57:39 +00: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
31efe43848 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: feb14d2  -s ours

* commit 'feb14d20de922631b04b6ed5f9e9a93847bac3a8':
  Import translations. DO NOT MERGE
 2014-11-03 14:55:03 +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
3946c7ab46 am 7ed62e4e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: d2a6bd5  -s ours

* commit 'd2a6bd52d650ecfe0b2c39630568b434a82e3ee0':
  Import translations. DO NOT MERGE
 2014-11-03 14:51:49 +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
8efeae7eb4 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 
automerge: 5c69f5b

* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:42:18 +00: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
Narayan Kamath
cd4910ef60 am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:38:02 +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
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:31:11 +00:00
Narayan Kamath
ef5d43a7cf Merge "Revert "Revert "Remove unused apache related API.""" 2014-11-03 14:24:17 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API."" 
This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 2014-11-03 13:32:10 +00:00
Narayan Kamath
4a51d06402 am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 
automerge: 726e9ea

* commit '726e9ea7322d5122a22a0077d58ae92870962df4':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:52:14 +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
082f49786e am 04f3eebe: am 27be7b35: Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 
* commit '04f3eebe0de60f6d1ac7e64eb04136734aeb1d34':
  Split Telecom PhoneAccount registration permissions.
 2014-11-03 08:05:00 +00:00
Santos Cordon
488ceaa0a9 am a79cf3c1: am 58ef48cb: Merge "Even, Even more telecom javadoc." into lmp-mr1-dev 
* commit 'a79cf3c12dc0acb1d489457cd6b79f4899fa5491':
  Even, Even more telecom javadoc.
 2014-11-03 08:04:54 +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
099003bd20 am 664eddfd: am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program 
* commit '664eddfdc76cbe17f8b26d65528335d5430a6874':
  TIF: Add more documentation on start/end time of TvContract.Program
 2014-11-03 04:19:40 +00: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
201805a49f am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
automerge: 4e439d0

* commit '4e439d0312b753b1162519baa473e5358c842069':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:54:34 +00: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
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
e05fb136cd am 13f00f07: Implement multi-press behavior for power key. automerge: a71601a 
automerge: 634ffc4

* commit '634ffc4211de6bfbc06d6f67084b2d664c2f4f2a':
  Implement multi-press behavior for power key.
 2014-11-01 15:05:45 +00:00
Jeff Brown
5177979bbd am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e 
automerge: a80162f

* commit 'a80162f0d124e7400e268440c864289a9a7be11e':
  Add a function to boost screen brightness temporarily.
 2014-11-01 15:04:52 +00:00
Joe Fernandez
ae59e01ccc am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references automerge: f16f6d9 
automerge: 93a954b

* commit '93a954b46b1d07bf1ca50790a62893f7bc123aeb':
  docs: multidex - building apps with over 65K method references
 2014-11-01 15:03:56 +00:00
Joe Fernandez
12e76b995d am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs automerge: a1caad9 
automerge: c312071

* commit 'c312071f4eab1906aab01ec91fdc65b84d57913f':
  docs:studio-updates-814v2
 2014-11-01 15:03:02 +00:00
smain@google.com
f1c86b51ca am 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page automerge: f417409 
automerge: 8788850

* commit '87888502db298ad786254c63a2202001b47622b4':
  revise helpouts tags to use just one on each page
 2014-11-01 15:02:09 +00:00