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

157910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
634ffc4211 am 13f00f07: Implement multi-press behavior for power key. 
automerge: a71601a

* commit 'a71601a98c7f37004e1b86757cdbf552564a2e8c':
  Implement multi-press behavior for power key.
 2014-11-01 14:52:11 +00:00
Jeff Brown
a80162f0d1 am e333e674: Add a function to boost screen brightness temporarily. 
automerge: 0ed053e

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

* commit 'f16f6d9ed25ee2abfa09b6a9448772b90112f0b4':
  docs: multidex - building apps with over 65K method references
 2014-11-01 14:50:23 +00:00
Joe Fernandez
c312071f4e am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs 
automerge: a1caad9

* commit 'a1caad91c7b5d9a96fec68c014b4fdc6c0d56664':
  docs:studio-updates-814v2
 2014-11-01 14:46:29 +00:00
smain@google.com
87888502db am 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page 
automerge: f417409

* commit 'f417409eb2f721b4336f0b3376b4aaa806fd4434':
  revise helpouts tags to use just one on each page
 2014-11-01 14:44:25 +00:00
smain@google.com
07c98070fb am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page 
automerge: b2b3b37

* commit 'b2b3b37e2f59b3a627b150acadbe90c31b41f9f4':
  revise helpouts tags to use just one on each page
 2014-11-01 14:43:30 +00:00
Alex Klyubin
42340b9de0 am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs 
automerge: 2f1c76f

* commit '2f1c76f074e2299b4d4327f160b5c83ed99e280a':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 14:41:35 +00:00
Ricardo Cervera
721b1d383f am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev 
automerge: 84a48b0

* commit '84a48b0a4a9e2fd006dbba4343a1edb652124ec5':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 14:40:15 +00:00
Joe Fernandez
05827eb8f7 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
automerge: ed47742

* commit 'ed47742ff057c0a687c666a7629128ab6ab69470':
  docs:studio-update-814
 2014-11-01 14:38:38 +00:00
Mark Renouf
381dfa704d am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
automerge: 024bc87  -s ours

* commit '024bc87645210fba6d78d74c61f867f4776cf6e4':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-11-01 14:37:38 +00:00
Scott Rowe
c94ad35b4a am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 
automerge: 0948545

* commit '0948545e304be3f23e0e9bcdfefa49895ce0c3c0':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-11-01 14:35:05 +00:00
Mark Renouf
dc9ea936d0 am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
automerge: c26d97c  -s ours

* commit 'c26d97c26484c01c3dde9ac8f47bf0b7848c1e15':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-11-01 14:34:05 +00:00
David Friedman
4fc0aacb1a am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 
automerge: cc7917d

* commit 'cc7917d0ee984fca49fe18b280a9f42947736fbd':
  Fixes wrongly nested braces. Bug: 17499985
 2014-11-01 14:31:58 +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
Mark Renouf
c26d97c264 am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
* commit '6497dd732565f4cadfe0e808d3075de95ecff80e':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-11-01 14:07:35 +00:00
David Friedman
cc7917d0ee am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 
* commit '62b532c7f4d7e6a868b8b007829dab9622ee5423':
  Fixes wrongly nested braces. Bug: 17499985
 2014-11-01 14:07:19 +00:00
Yohei Yukawa
b1f56430d3 am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev 
* commit '22cbf54ca0c64344cd28590446a02e521ca914f7':
  Conditionally allow non-primay profiles to use TextServices
 2014-11-01 02:15:47 +00:00
Jeff Brown
13f00f07d6 Implement multi-press behavior for power key. 
Added support for brightness boost or setting theater
mode from the power key.  This behavior is disabled by default and
must be enabled for specific products in a config.xml overlay.

Because the power key is already so overloaded, refactored the
code to split out handling of the similar ENDCALL button and
renamed all of the state that has to do with screenshot chord
detection to avoid confusion.

Bug: 17949215
Change-Id: Id282133188e3781472aabb64fabcee7b98d0c77d
 2014-10-31 19:15:33 -07:00