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
Jeff Brown
e333e674a7
Add a function to boost screen brightness temporarily.
...
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds. This action is
also considered to be user activity.
Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
2014-10-31 18:45:11 -07: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
Joe Fernandez
8404550614
am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references
...
* commit '20207a83c989fde1d57b45a4c1373ca25fd49bd7':
docs: multidex - building apps with over 65K method references
2014-11-01 01:25:26 +00:00
Joe Fernandez
20207a83c9
am e8ad737d: docs: multidex - building apps with over 65K method references
...
* commit 'e8ad737db6b35bfe342dc0a1674f1200d08e45f5':
docs: multidex - building apps with over 65K method references
2014-11-01 01:14:15 +00:00
Jim Miller
b256e4e209
Fix SetupWizard black screen issue for EDU devices
...
This fixes a problem where EDU devices show a black screen if
the device is rebooted after setting a pin/pattern/password but
before completing SetupWizard.
The issue is that the system doesn't expect to see a state
where the device is not provisioned but has a pin/pattern/password
because it wasn't possible before. With the addition of the ability
for EDU devices to add a pin/pattern/password, we can now get
into this unforseen state.
The fix ignores provisioning if a password is set so that the
user can reach the security screen to unlock the device and
continue with SetupWizard.
Fixes bug 18022051
Change-Id: Ie88a75530d964c02458c25866f0629877214edf4
2014-10-31 18:06:40 -07:00
Joe Fernandez
e8ad737db6
docs: multidex - building apps with over 65K method references
...
Change-Id: I822cdc54d0f2df34a89d5294ff7ea1f5f83b25f9
2014-10-31 17:38:49 -07: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
George Mount
b592d84514
Fix javadoc.
...
Bug 18183024
Change-Id: Ia29d46e03b0137cc6964dcf488af052486b6898c
2014-10-31 17:19:18 -07: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
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
Craig Mautner
a1b9e3d7ea
Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev
2014-10-31 23:55:55 +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
Dirk Dougherty
e129d338da
Add Nexus 6 and Nexus 9 to the device framer.
...
Change-Id: I7e66642429497921e20bad9065dbe5e56e952028
2014-10-31 23:31:41 +00:00
Tsuwei Chen
e939996646
am 5ef08182: Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev
...
* commit '5ef081828181663bc79ea0add6afaa35a93567fb':
Reject SUPL connection when data is disbaled by user. b/18127920
2014-10-31 23:11:51 +00:00
Tsuwei Chen
5ef0818281
Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev
2014-10-31 23:06:01 +00:00
John Reck
a51fba0bf0
am a8d83d63: Merge "Layer changes" into lmp-mr1-dev
...
* commit 'a8d83d639a5687b2ab5689db4ea61e2a6cce66f4':
Layer changes
2014-10-31 23:00:44 +00:00
John Reck
a8d83d639a
Merge "Layer changes" into lmp-mr1-dev
2014-10-31 22:55:47 +00:00
Andres Morales
a31c23da30
Only allow USER_OWNER to access PDB and change OEM unlock ability
...
Bug:18191568
Change-Id: Ie09823945af04accead99216580efc958bf6aefe
2014-10-31 15:49:35 -07:00
Dianne Hackborn
18163616c8
am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev
...
* commit 'f34fa3e7aa9be9bf24c955a9ebf34022e4b88c25':
Improve low on RAM reporting.
2014-10-31 22:49:27 +00:00
Dianne Hackborn
f34fa3e7aa
Merge "Improve low on RAM reporting." into lmp-mr1-dev
2014-10-31 22:44:24 +00:00
Amit Mahajan
40d7655026
am 30e51130: Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev
...
* commit '30e5113000877e053ba4f30b5962a42a4d11fa6e':
Improve a calculation method for LTE antenna reception level
2014-10-31 22:39:39 +00:00
Amit Mahajan
30e5113000
Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev
2014-10-31 22:35:52 +00:00
Kensuke Ueda
c962b1dcfb
Improve a calculation method for LTE antenna reception level
...
RSRP value thresholds is relatively high compared with
other mobile phone platforms, which make android seems
low sensitive to radio. This patch sets better thresholds.
Bug: 17891524
Change-Id: I502e1c3d08b2a52c51fe93da9b77476ac827a25b
2014-10-31 15:35:23 -07:00