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

171301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
e55c4f43df am a409cdf1: am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f automerge: 42340b9 
* commit 'a409cdf161664666e15f337ea5a0efd078667352':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 17:40:58 +00:00
Ricardo Cervera
158183c79a am fd8184e4: am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev automerge: 84a48b0 automerge: 721b1d3 
* commit 'fd8184e4247f81f6027ae3cc328e8a19869c2d5e':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 17:40:53 +00:00
Nick Kralevich
31a378efbf resolved conflicts for merge of 85118849 to master 
Change-Id: Ic4d98e2804dddf3a7fe58bea99f0a4b22ebd605d
 2014-11-01 10:35:47 -07:00
Mark Renouf
ee4d868a27 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 automerge: 381dfa7 -s ours 
automerge: 1fc26a4  -s ours

* commit '1fc26a481c0b5465dc5adcb51040b81b59d7fdaf':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-11-01 15:24:48 +00:00
Scott Rowe
e19bf40fad am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs automerge: 0948545 automerge: c94ad35 
automerge: 3d6f449

* commit '3d6f449cd24056ecfab4300ef55fb8e20919c631':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-11-01 15:23:29 +00:00
Mark Renouf
efadfc0c20 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 automerge: dc9ea93 -s ours 
automerge: 8c8c62a  -s ours

* commit '8c8c62a1bcc85166aca74510cf1440a29835cbdb':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-11-01 15:21:42 +00:00
David Friedman
5916862108 am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 automerge: cc7917d automerge: 4fc0aac 
automerge: ae4297e

* commit 'ae4297e2ef5e0713ecf78112b57b97444f20c818':
  Fixes wrongly nested braces. Bug: 17499985
 2014-11-01 15:20:46 +00:00
Alex Klyubin
a409cdf161 am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f 
automerge: 42340b9

* commit '42340b9de03fb2b27a0f915d827d729bce7fcda7':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 15:00:10 +00:00
Ricardo Cervera
fd8184e424 am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev automerge: 84a48b0 
automerge: 721b1d3

* commit '721b1d383f44caedcada436bed0db5e9d6b672e1':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 14:59:06 +00:00
Joe Fernandez
8511884919 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs automerge: ed47742 
automerge: 05827eb

* commit '05827eb8f77e26da75c09fbdb84bfb184f8667fd':
  docs:studio-update-814
 2014-11-01 14:58:06 +00:00
Mark Renouf
1fc26a481c 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 
automerge: 381dfa7  -s ours

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

* commit 'c94ad35b4a37d5b2646a0ab6792c0815dcebf522':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-11-01 14:55:58 +00:00
Mark Renouf
8c8c62a1bc 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 
automerge: dc9ea93  -s ours

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

* commit '4fc0aacb1add76df5fde2c9b24f96f8bc3e9dc1d':
  Fixes wrongly nested braces. Bug: 17499985
 2014-11-01 14:54:06 +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
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
e504335f7f am f5051e9b: am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev automerge: b1f5643 
* commit 'f5051e9b6771de3558d2b8adf7ef233721dad1d6':
  Conditionally allow non-primay profiles to use TextServices
 2014-11-01 03:24:18 +00:00
Yohei Yukawa
f5051e9b67 am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev 
automerge: b1f5643

* commit 'b1f56430d38f9d6bab0a3512905daaf994ba134b':
  Conditionally allow non-primay profiles to use TextServices
 2014-11-01 02:19:02 +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
Yohei Yukawa
22cbf54ca0 Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev 2014-11-01 01:29:26 +00:00
Svet Ganov
e73c6d93b9 am 28d51a39: am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev automerge: 4f5b8a6 
* commit '28d51a39a1bed35855b0fe75a65ad4a6d43a4460':
  Crash apps that print malformed or password protected PDFs.
 2014-11-01 00:32:52 +00:00
Rich Slogar
848f688145 Merge "docs: navigation and download updates" 2014-11-01 00:32:11 +00:00
Svet Ganov
28d51a39a1 am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev 
automerge: 4f5b8a6

* commit '4f5b8a6b9b1966b42c929f89e1e91827ec495719':
  Crash apps that print malformed or password protected PDFs.
 2014-11-01 00:27:30 +00:00
Svet Ganov
4f5b8a6b9b am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev 
* commit '182f0a136fca2bff1614cee41178d2052e7dcf61':
  Crash apps that print malformed or password protected PDFs.
 2014-11-01 00:26:18 +00:00
Svet Ganov
182f0a136f Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev 2014-11-01 00:22:08 +00:00
Craig Mautner
c3fdcf749c am 8252b827: am a1b9e3d7: Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev automerge: ec5f374 
* commit '8252b827db73004bdf97c6ac31f3a58f26148e03':
  Animate starting windows when keyguard dismissed.
 2014-11-01 00:06:32 +00:00
Svet Ganov
fce84f035c Crash apps that print malformed or password protected PDFs. 
If apps are writing malformed content (typically not a PDF file) or if the
PDF content they provide to the print system is password protected, are now
crashed as both of these are app bugs.

bug:17636435

Change-Id: Ifce6a3199e587448dd38f6a84290a965c24b698b
 2014-11-01 00:06:08 +00:00
Craig Mautner
8252b827db am a1b9e3d7: Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev 
automerge: ec5f374

* commit 'ec5f374f296791ebb28fb265b15e40b38844f2e7':
  Animate starting windows when keyguard dismissed.
 2014-11-01 00:02:37 +00:00
Craig Mautner
ec5f374f29 am a1b9e3d7: Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev 
* commit 'a1b9e3d7eabeca10bd2302d5efd34123b5ed789e':
  Animate starting windows when keyguard dismissed.
 2014-11-01 00:01:23 +00:00
Adam Powell
53b603af4b am 987f7168: am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev automerge: 35261e4 
* commit '987f7168d54ef42542b9d03b589f0287fd6e15c7':
  Don't update OverScroller fling state if no time has passed since start
 2014-10-31 23:56:03 +00:00
Craig Mautner
a1b9e3d7ea Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev 2014-10-31 23:55:55 +00:00
Adam Powell
987f7168d5 am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev 
automerge: 35261e4

* commit '35261e41b60ff2c0297dedaaff849a7414c9ff76':
  Don't update OverScroller fling state if no time has passed since start
 2014-10-31 23:49:49 +00:00
Adam Powell
35261e41b6 am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev 
* commit 'd8c941ff46a68b91c53b3b1dd26678593787e0f9':
  Don't update OverScroller fling state if no time has passed since start
 2014-10-31 23:48:26 +00:00
Adam Powell
d8c941ff46 Merge "Don't update OverScroller fling state if no time has passed since start" into lmp-mr1-dev 2014-10-31 23:42:43 +00:00
Craig Mautner
c0d2d0ad6d Animate starting windows when keyguard dismissed. 
Starting windows are displayed prior to their app windows visibility
being set. Consequently the WindowToken.hidden boolean for starting
windows is still true even when it is shown. The keyguard logic uses
the method WindowState.isVisibleNow to determine whether to animate
each window. This method incorrectly determined that starting windows
were not visible based on WindowToken.hidden and consequently didn't
animate in the starting window.

This change fixes isVisibleNow() to correctly determine when
starting windows are visible and animates them in as part of the
keyguard transition.

This change also adds keyguard debug.

Partially fixes bug 15991916.

Change-Id: Iac3e5f3f33876be5801ec619bbe7a1579e648322
 2014-10-31 16:33:56 -07:00
Tsuwei Chen
7148e9115c am ba16fc9d: am 5ef08182: Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev automerge: e939996 
* commit 'ba16fc9d06a20b62ffd17b595a7b521c580d752e':
  Reject SUPL connection when data is disbaled by user. b/18127920
 2014-10-31 23:31:01 +00:00
John Reck
9481684560 am e05575e9: am a8d83d63: Merge "Layer changes" into lmp-mr1-dev automerge: a51fba0 
* commit 'e05575e9c36850d8cfe49396ac9a1372511b12bf':
  Layer changes
 2014-10-31 23:30:57 +00:00
Dianne Hackborn
bc622ed7c3 am 58f2a1e8: am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev automerge: 1816361 
* commit '58f2a1e8a47de6c3ce4f588b07fc052f4687492d':
  Improve low on RAM reporting.
 2014-10-31 23:30:52 +00:00