Commit Graph

288708 Commits

Author SHA1 Message Date
Mark Lu
d77a047bbc Merge "Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev am: d91c303e6c am: 92391ed7e2" into nyc-mr1-dev-plus-aosp
am: d79ad318c3

Change-Id: I5edf2c43abbcf3af0936c05eb9e02bc1da778c41
2016-09-26 09:06:53 +00:00
Mark Lu
bd628f9e1a Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev am: d91c303e6c am: 92391ed7e2
am: 0bb6f218a1

Change-Id: Ic89b626fe985d2cde308dc4739f8661ff7255300
2016-09-26 09:06:48 +00:00
Mark Lu
dd2dfcaae4 Merge "docs: update javadoc description for View.setVisibility() method am: ae0459f532 am: 56be5c1ae0" into nyc-mr1-dev-plus-aosp
am: d3eb743f56

Change-Id: I985d05e06e065ef3730d6b8724fa28c425d82001
2016-09-26 09:05:15 +00:00
Mark Lu
12e182a99e docs: update javadoc description for View.setVisibility() method am: ae0459f532 am: 56be5c1ae0
am: 41f36a5264

Change-Id: I107738e4c4322c8189aa84a94c3fca12c6980323
2016-09-26 09:05:12 +00:00
Mark Lu
e2aaee7e1e Merge "Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3 am: 229daadefc" into nyc-mr1-dev-plus-aosp
am: 83f6414527

Change-Id: If538a3635fa08e0e4c7bed936d51207bf36562e7
2016-09-26 09:03:46 +00:00
Mark Lu
6e3b752302 Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3 am: 229daadefc
am: b7ca62e1bf

Change-Id: I72c45cdcdee9ee0f278aade9ef97da06236fc6a2
2016-09-26 09:03:40 +00:00
Mark Lu
af4632df0c Merge "docs: update docs for uses-feature element am: b463a6db08 am: 1beb4c4cc3" into nyc-mr1-dev-plus-aosp
am: 5f2585ce80

Change-Id: Ic33cb07f7223b8be976ae128f52ac59c215da966
2016-09-26 09:02:11 +00:00
Mark Lu
88e706a155 docs: update docs for uses-feature element am: b463a6db08 am: 1beb4c4cc3
am: 3ed2e79292

Change-Id: Icac8f7e1776b4a252448196f8262231a89946ffb
2016-09-26 09:02:06 +00:00
Mark Lu
41aa3c6651 Merge "Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691 am: 5a418d40ba" into nyc-mr1-dev-plus-aosp
am: a154cba6e6

Change-Id: I166ecce6f746c8d799141d92a0cec73c3557f22e
2016-09-26 09:00:45 +00:00
Mark Lu
e0a7f350ef Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691 am: 5a418d40ba
am: a199bf4f88

Change-Id: Ie492ab2fb39069745b8f48fc682c227b22a6c81e
2016-09-26 09:00:40 +00:00
Adrian Roos
449c5f2c68 Merge "Fix wake lock logic during Dream startup am: 9ede1d2602 am: 042c2349c6" into nyc-mr1-dev-plus-aosp
am: e055d54715

Change-Id: I736ae286248e63eac5f3aa273bfea022810f7db7
2016-09-26 08:59:16 +00:00
Adrian Roos
35afe2d8de Fix wake lock logic during Dream startup am: 9ede1d2602 am: 042c2349c6
am: 4ffff73947

Change-Id: If3c1dd67f402bc549cad76e5072817a1d1104463
2016-09-26 08:59:08 +00:00
Mark Lu
efc86a0b81 Merge "docs: Add param info to TextView.setTextColor am: 193879a8b6 am: 5080a2c5e1" into nyc-mr1-dev-plus-aosp
am: 69ed95d1a3

Change-Id: I779e32a973ff50b505e6d0e73ca2ae59bbfb41b4
2016-09-26 08:57:46 +00:00
Mark Lu
d9576c7945 docs: Add param info to TextView.setTextColor am: 193879a8b6 am: 5080a2c5e1
am: 7bfb1e7f46

Change-Id: I434c524c07559b848f2ffe1e9d56237a5e5a686b
2016-09-26 08:57:40 +00:00
Mark Lu
9cb7445962 Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev am: c6a1076e40 am: 95ca35f4ff am: 824fc38439 am: d1cd0a23d2
am: 430e8edd64

Change-Id: Ib633f977d568d8b6a7eab87b6c533bfcb704b7de
2016-09-26 08:56:36 +00:00
Mark Lu
330fa9e193 docs: Mention SwitchCompat in Switch and toggle documentation am: 3404032dfc am: 902fb28784 am: a744c8c25a am: ed68ee67c2
am: ad75e714b6

Change-Id: I3393026cdcb51e4fed5bd2350e63ccd910e6d16a
2016-09-26 08:55:35 +00:00
Selim Cinek
2f81f2cd02 Merge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev am: 7f53b9bcb5 am: 64d0e2d807
am: ad6be91357

Change-Id: I3091756a125ce5358881bb3f00153124ef407b2f
2016-09-26 08:53:51 +00:00
Dong-wan Kim
67fdb6d5db Fix DismissView cannot be clicked sometimes after boot am: b926666a76 am: 2e61103c5e
am: a3ecfe6bdf

Change-Id: Ibb0c01a92857dd21a995e250fa8af0094c49e8a4
2016-09-26 08:52:56 +00:00
dongwan0605.kim
645d1de70c Fix RTL issue of ImageFloatingTextView am: dd8611fc5a am: 4d590a91c2
am: d986cfd62d

Change-Id: I25841a05053ca13b07147f98d7b0b5485b56740c
2016-09-26 08:51:40 +00:00
Selim Cinek
5425bebef5 Merge changes If7c3a55e,I68dcba41,Ib96a15da into nyc-mr1-dev am: a05719a278 am: b8306d0f54
am: b70c68f330

Change-Id: If8b1989bdfed3659fc80095c0bf417df35d31bdb
2016-09-26 08:49:37 +00:00
Selim Cinek
cc3308c983 Fixed a bug where the dimmed background could be invisible am: 3334a182a6 am: 53d7b67290
am: c04b945862

Change-Id: I5216d0139e52d36806903a9c75ab5e0f73b1aa55
2016-09-26 08:48:40 +00:00
Selim Cinek
206e74140b Fixed an issue where the inline controls where not usable am: fc7086ef65 am: 8f88867ba1
am: 29f40afd9b

Change-Id: I1dee9bcf6b49aff6954e6a5186c02352eee71365
2016-09-26 08:47:26 +00:00
Selim Cinek
2cae5760c6 Added Emergency affordance feature am: 705442fa7d am: 0e1f78da65
am: 10691456b8

Change-Id: Ieb3a0da5d5693a186c92ab1c21ba189558207ae3
2016-09-26 08:46:30 +00:00
Mark Lu
0b9131ca17 Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev am: c6a1076e40 am: 026b8e9a7c
am: 32840e5804

Change-Id: I8b82834581f05c39fbd91dfde8595c2da9167296
2016-09-26 08:45:28 +00:00
Mark Lu
73a174fc2d docs: Mention SwitchCompat in Switch and toggle documentation am: 3404032dfc am: cc9f8e2418
am: 15d0605087

Change-Id: I6035ee9f1c532e4298374f1f180e27e374fb146f
2016-09-26 08:44:30 +00:00
Andrew Solovay
33575412b2 Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev am: ddcf2deb14 am: 4e7bb2a653 am: caa71ddd02 am: 21f25acb10
am: 692aaaf7db

Change-Id: I9817fd22e6802eca62a17d2efa58b6f46aa59c11
2016-09-26 08:43:27 +00:00
Andrew Solovay
1dab2b369b docs: Removed two images that were moved to Piper in April am: f955d4cd9f am: 430cac7c81 am: f4e2f65117 am: 10f0dffb62
am: 9ff920b7e4

Change-Id: I685aba21073eb3768940ea9e5b2adfe7fd7b09b9
2016-09-26 08:42:32 +00:00
Andrew Solovay
c87c791a01 Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev am: ddcf2deb14 am: 8e3eed9102
am: 878536c3f8

Change-Id: Id4ac19ccbd6f9c52cbf9a3f368a1a8c324b27db7
2016-09-26 08:41:20 +00:00
Andrew Solovay
75f33a40ff docs: Removed two images that were moved to Piper in April am: f955d4cd9f am: 41e90a2548
am: 210e852381

Change-Id: Ia3eb6eaab594d5c5aae2afedc3235d8d69711eb0
2016-09-26 08:40:18 +00:00
Adam Powell
be3e1a406b Merge "ResolverComparator transitivity" into nyc-mr1-dev am: df7f4a13d7 am: 7bf854ac73
am: 3ca8797274

Change-Id: I6075fc8fe32807e26855185822c13a9a25de5600
2016-09-26 08:39:15 +00:00
Adam Powell
ec86155579 ResolverComparator transitivity am: 2366ff12a2 am: e698d8bfea
am: dbd1fc0d8e

Change-Id: I4c602d34473529ddc20717e073a0abb4f8ede081
2016-09-26 08:38:10 +00:00
Mark Renouf
d0035b2fe8 Merge "Extract action icons for Wear adjusted for optical alignment" into cw-f-dev am: e61535ac8f
am: 2093d04d43

Change-Id: If374d45907fe449f0659f8eaf73b0e245e0fab98
2016-09-26 08:37:05 +00:00
Mark Renouf
3b4f10b81b Extract action icons for Wear adjusted for optical alignment am: b46c93e33b
am: d99570055a

Change-Id: I3cdf1cd0441325c436ee6ab09a5bc57a92a2a9dd
2016-09-26 08:35:59 +00:00
Salvador Martinez
a604a8a625 Merge "Updated summary logic for wifi" into nyc-mr1-dev am: dd685cac26 am: 2ce9ec336e
am: 80eda67918

Change-Id: I44a15babdee16ab672bdcea7b199d669f8c818a4
2016-09-26 08:35:03 +00:00
Salvador Martinez
dbb9f9fa64 Updated summary logic for wifi am: 5d937fc95f am: 06db363355
am: 6d0f85a24f

Change-Id: I66e021526a9a07e4f60b7ca7a63756b3a5d7f7d1
2016-09-26 08:34:02 +00:00
Jason Monk
3c237be349 Merge "QS: Don't show graph or warning text when not present" into nyc-mr1-dev am: 31bc1f5ecf am: f0f85eb1f3
am: 7bdd1d9062

Change-Id: I53bee95fa2ab34392b5b5f4fc297007ddbfa6b18
2016-09-26 08:33:02 +00:00
Jason Monk
e4f3565f52 QS: Don't show graph or warning text when not present am: a03c641c60 am: 3a25aaaef2
am: 7ad42670e1

Change-Id: I76953de4569deeb7fb190a5678d74b47b5cf2f36
2016-09-26 08:32:06 +00:00
William Harmon
40f7a32c86 Merge "Remove location tile from the list of default-enabled QuickSettings tiles" into nyc-mr1-dev am: 8add486673 am: 429048ddce
am: d2189bc57b

Change-Id: Ic29722239e8d0c449d3817e15baf81b642b65bdb
2016-09-26 08:31:09 +00:00
Will Harmon
e12fe3b15a Remove location tile from the list of default-enabled QuickSettings tiles am: 3629af022f am: a6f4c5cb1b
am: 5852bd904d

Change-Id: Ia20006e99c6727df7a260b9205a88eb120f92077
2016-09-26 08:30:06 +00:00
Alan Viverette
922bd60cb2 Merge "Allow developer to override Material-style modes in picker dialogs" into nyc-mr1-dev am: 2525b0dab3 am: 4741c705aa
am: 1d1e0e2469

Change-Id: I7d2b33fc7e3d87870528a1f55e387533dc5c34d6
2016-09-26 08:29:03 +00:00
TreeHugger Robot
80848bc9bc Merge "resolve merge conflicts of 6e37f8a to master" 2016-09-26 08:27:06 +00:00
Etan Cohen
d928253580 [NAN] Reorder parameters of send message method(s) per API review [DO NOT MERGE]
am: 3da7c88425  -s ours

Change-Id: Idf7a081d619c5b66957fca136fc7e016ea1ea2cc
2016-09-26 00:26:55 +00:00
Daniel Nishi
e58d2a72b3 Add a hidden action to trigger the storage manager settings.
Bug: 31621740
Change-Id: I3ad0b65b0810d468e1f297c7ad312ea8a919ea2a
(cherry picked from commit 4bd88df1fb)
2016-09-25 22:25:12 +00:00
Andreas Gampe
50309b4644 resolve merge conflicts of 6e37f8a to master
Change-Id: I4fdcce7554977a56fd0f7e4ad4804929112d5599
2016-09-25 15:13:06 -07:00
Jason Monk
58feeccbad Revert "Change bang to x for indication of no internet" am: ed29365c9e am: 287ea2f714
am: 2e18eff746

Change-Id: Ia3bbd0a666a133ad2779800bd6dcb5c01020eb4b
2016-09-25 21:29:57 +00:00
Miao Wang
c4d42de0fc Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-mr1-dev am: 6b5d4723d2 am: a1050aff1d
am: a43ff9cb73

Change-Id: I90b303650d7d7fbf10615c554cb7a3c0a4edd38c
2016-09-25 21:29:05 +00:00
Shuo Gao
b553782f9d Enable shader cache for applications that shared UID with multiple packages too am: 1e6d77e836 am: 304c720d4a
am: 82e0dbf404

Change-Id: I6ae950bb2cd688ae955ef18d5f2a006ac475f347
2016-09-25 21:28:21 +00:00
Makoto Onuki
fdbde2e1f4 Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev am: 18fb24c5d3 am: 8f9146ef48
am: 1789235992

Change-Id: Id54dd7f09156f7be9f5c9cf82f53d3c1176084f7
2016-09-25 21:27:25 +00:00
Makoto Onuki
357ca56f8b Fix DPM unit tests, also fix a log message. am: 6ad5f92512 am: 2f78ab5387
am: 4001a2b4c4

Change-Id: Ifc1735798074af6758da5cc3a40d9adada1376cb
2016-09-25 21:26:31 +00:00
Gopal Krishna Shukla
42a99377f5 Merge "Provide synchronization to setview to avoid NPE" am: b05b93a674 am: 810c31fdca am: 621e87d72f
am: 260af96306

Change-Id: I1907b2252ae2fa25667b3a0484f6852660c74da3
2016-09-25 21:25:39 +00:00