Rich Slogar
1d793503bd
am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
...
* commit 'd47ab00cc4f15287c8b48ed5805c4e9766facb58':
docs:Remove tools/index.jd file.
2014-11-07 00:05:38 +00:00
Luan Nguyen
816b93cf23
am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
...
* commit '712c7ea3d87be2afb7ecaf0d87ea9f9eb1a0007c':
cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
2014-11-07 00:05:20 +00:00
Joe Fernandez
d00ce6c537
am 1d295821: docs: fix for Brand inquiries form
...
* commit '1d295821355c6a1ffcb01866e38664343570129e':
docs: fix for Brand inquiries form
2014-11-07 00:05:16 +00:00
ztenghui
0b70c09c1d
am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev
...
* commit '7ae6fc81efd05a7561ee2de853184d2a3788b88d':
A better looking and faster spot shadow.
2014-11-07 00:04:34 +00:00
ztenghui
7ae6fc81ef
Merge "A better looking and faster spot shadow." into lmp-mr1-dev
2014-11-06 23:59:17 +00:00
Andres Morales
f33d9db43a
am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
...
* commit 'b1477d11ca873db761dd378a5fea93b26d695f78':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
2014-11-06 23:57:25 +00:00
Yohei Yukawa
42be51bd98
Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev
...
automerge: 50ef3d9
* commit '50ef3d93adf2614d8394664626b706ab0d7f7de7':
Minimize the number of default enabled IMEs part 4
2014-11-06 23:57:17 +00:00
Andres Morales
b1477d11ca
Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
2014-11-06 23:51:00 +00:00
Yohei Yukawa
50ef3d93ad
Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev
2014-11-06 23:45:23 +00:00
Andres Morales
423c44dc91
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
...
Requires less memory pressure to start killing cached
processes.
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
2014-11-06 15:44:02 -08:00
destradaa
9ed36c42d8
Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev
...
automerge: 992b9aa
* commit '992b9aa37b0b7dba45505593cc4715d5be5aecbb':
Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124
2014-11-06 23:34:06 +00:00
Luan Nguyen
712c7ea3d8
Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
2014-11-06 23:26:53 +00:00
destradaa
992b9aa37b
Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev
2014-11-06 23:22:46 +00:00
ztenghui
d2dcd6fded
A better looking and faster spot shadow.
...
1. This improve the looking, the star shape (spike) on long action bar is gone.
Shadow is more smooth now.
2. The performance is better, too. For averaging around rect, round rect and
circle, the spot shadow itself is 3 times faster. On N7 v1, it could be less than
0.1 ms.
b/14976551
b/16712006
Change-Id: I61ed546ee56e7c8dbe504dfcaef12d084904b4b8
2014-11-06 15:09:46 -08:00
Joe Fernandez
1d29582135
docs: fix for Brand inquiries form
...
b/18162023
Change-Id: Iaf8a82bf268fb1c798c90012928641bd2961f4df
2014-11-06 14:53:04 -08:00
Craig Mautner
bc1fdca0bb
Add logging for failure to finish.
...
automerge: a11bb74
* commit 'a11bb7427171418681428754051d5ee4dce851ee':
Add logging for failure to finish.
2014-11-06 22:24:52 +00:00
Sreeram Ramachandran
2663cdcb39
Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev
...
automerge: 0cb1bc4
* commit '0cb1bc488c6578fde1503c53405715c564f0f7a0':
Send broadcasts when VPNs come and go.
2014-11-06 22:23:36 +00:00
Jason Parks
94c3e3bfcf
Merge "Fix NPE for CTS." into lmp-sprout-dev
2014-11-06 22:23:04 +00:00
destradaa
a084d357d3
Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev
...
automerge: c3e5599
* commit 'c3e5599cdc09a770d12433a98e7da93ec24d959d':
Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171
2014-11-06 22:22:35 +00:00
Winson Chung
044d52934e
Adding bounce animation for affiliated tasks. (Bug 16656169)
...
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
2014-11-06 14:02:35 -08:00
Craig Mautner
a11bb74271
Add logging for failure to finish.
...
Will help with bug 17648830.
Change-Id: Ib73c14cee332649a3e57a4779814a394f7d13173
2014-11-06 14:01:18 -08:00
Sreeram Ramachandran
0cb1bc488c
Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev
2014-11-06 21:57:21 +00:00
destradaa
c3e5599cdc
Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev
2014-11-06 21:50:40 +00:00
Alan Viverette
d6570d11e4
Support theme attributes in StateListDrawable <item> element
...
Also adds support for specifying drawable as a color since getDrawable()
automatically wraps colors to ColorDrawable. Does not currently allow
themed item elements to be used in Zygote preload, but we can add that
at some point in the future.
BUG: 18208662
Change-Id: I4c9721ffd100da4b9db7743a46c914828b943dae
2014-11-06 13:50:22 -08:00
RoboErik
bd94aff236
Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
...
automerge: b1d52e1
* commit 'b1d52e1d2095d0df986d4c338af43c5cd2b6efc5':
Update metadata artwork and uri docs
skip MediaController callbacks if it's been unregistered
2014-11-06 21:42:55 +00:00
Sailesh Nepal
fe319eabbc
Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev
...
automerge: 7d901cb
* commit '7d901cb6f54f31b01b9951599ba6abdcff580e42':
Make APIs to get system phone accounts public
2014-11-06 21:41:44 +00:00
Jeremy Joslin
91fff05ba9
Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
...
automerge: 1a2b99e
* commit '1a2b99ea2692a357f68368f7117bc529ef5dab06':
Implemented requestNetwork with a PendingIntent.
2014-11-06 21:38:17 +00:00
Amith Yamasani
26d8d1d5cb
Merge "Fix singleUser provider grants" into lmp-mr1-dev
...
automerge: 775d104
* commit '775d104db29dc8bdd8922fd7627cf646869d90c8':
Fix singleUser provider grants
2014-11-06 21:37:06 +00:00
Craig Mautner
39f6be1216
Merge "More fixes for keyguard animations." into lmp-mr1-dev
...
automerge: 7b1b0f6
* commit '7b1b0f63bcb76585621e856ecc8c8b71450735ee':
More fixes for keyguard animations.
2014-11-06 21:34:25 +00:00
RoboErik
b1d52e1d20
Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
...
* changes:
Update metadata artwork and uri docs
skip MediaController callbacks if it's been unregistered
2014-11-06 21:20:19 +00:00
Sailesh Nepal
7d901cb6f5
Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev
2014-11-06 21:06:36 +00:00
Jason Monk
5565cb42f2
Plumbing for screen pinning request from sysui
...
Removes lock-to-app request dialog from the AM.
Added a showScreenPinningRequest to IStatusBar to handle the
flow from app requesting lock task to showing the dialog.
This CL also allows startLockTaskOnCurrent (system|signature) to
start lock task directly. (Note: this is the less locked version
that always allows exit through back + recents)
Bug: 16957435
Change-Id: I284918dd5989de6cb2767c2a717529eb5e9c6db4
2014-11-06 15:53:43 -05:00
Jeremy Joslin
1a2b99ea26
Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
2014-11-06 20:51:24 +00:00
Amith Yamasani
775d104db2
Merge "Fix singleUser provider grants" into lmp-mr1-dev
2014-11-06 20:51:02 +00:00
Craig Mautner
7b1b0f63bc
Merge "More fixes for keyguard animations." into lmp-mr1-dev
2014-11-06 20:49:36 +00:00
Jeff Hao
2a83226c75
Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev
2014-11-06 20:45:01 +00:00
Vinod Krishnan
c6c5c7d6db
am efec89f2: am 1d6d4272: Adding wallpaper animations
...
* commit 'efec89f2edd09c021e4e52f9aa37b6a6ca6f31b8':
Adding wallpaper animations
2014-11-06 20:41:35 +00:00
Ricardo Cervera
5c3ba70634
am a2c2014d: am 126eda32: am b4a19198: am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs
...
* commit 'a2c2014d399c9637c06614872c6d5c08d33a1267':
docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 20:41:31 +00:00
Paul Lawrence
202ab2986c
am b282cc30: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
...
* commit 'b282cc308f13a464c7e2455e5b2b67c622ffce30':
DO NOT MERGE: Don't log passwords returned from vdc
2014-11-06 20:41:26 +00:00
Ricardo Cervera
1e9f44f132
am f90d9c23: am 0a285d4a: am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
...
* commit 'f90d9c235435116fbefc8b92f73553355ccec87e':
docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 20:41:21 +00:00
Dirk Dougherty
ac70173db2
am 1d270087: am 61a76f2d: am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download.
...
* commit '1d270087a30a3610c56c65700f61c800a9797dc3':
Doc change: Add play dev guide page with index card and shareable download.
2014-11-06 20:41:17 +00:00
Dirk Dougherty
3c7e1f4a71
am 0b315994: am 2acfc3b9: am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
...
* commit '0b315994f079be109d5ddcfff382b5c72c85bad6':
Doc change: Add play dev guide page with index card and shareable download.
2014-11-06 20:41:11 +00:00
Joe Fernandez
03d3a6e48a
am 0c03031b: am 93f89657: am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
...
* commit '0c03031b3e4db987df8af25360f97f4d5c3207ea':
docs: Add more information for getting started with TV app
2014-11-06 20:41:06 +00:00
Justin Koh
4ca342cdba
am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
...
* commit '2d42f484494e4183c42114ce5918fc4592a33fb6':
Hide Surface#lockHardwareCanvas DO NOT MERGE
2014-11-06 20:40:56 +00:00
Dirk Dougherty
768344f73d
am 012849f4: am c6f2ec20: am b2fe15f9: am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
...
* commit '012849f452ee7cc72a28df3054fdbe68b5133cee':
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
2014-11-06 20:40:50 +00:00
Rich Slogar
d47ab00cc4
am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
...
* commit '830790baf8c35942832c5e7fb2467be6112048f4':
docs:Remove tools/index.jd file.
2014-11-06 20:39:18 +00:00
John Spurlock
9d3abdd742
am df2fe430: am d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev
...
* commit 'df2fe4306f18da28ace2882fee669e113744a566':
Zen: Track next-alarm condition across reboots.
2014-11-06 20:36:02 +00:00
Vinod Krishnan
efec89f2ed
am 1d6d4272: Adding wallpaper animations
...
* commit '1d6d427278d22d08ef60e5d76162b823e8ad58ed':
Adding wallpaper animations
2014-11-06 20:34:58 +00:00
Ricardo Cervera
a2c2014d39
am 126eda32: am b4a19198: am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs
...
* commit '126eda32ebc1c61ff0a6a7a93093c71f2ac73d43':
docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 20:34:53 +00:00
Paul Lawrence
b282cc308f
am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
...
* commit '3bde026aebffdaea8ab1315977b05e53e4a75185':
DO NOT MERGE: Don't log passwords returned from vdc
2014-11-06 20:34:49 +00:00