Tyler Gunn
b702ef8a91
Cleanup Video API javadoc.
...
- Cleaned up documentation and added more details where possible.
- Also added cross references from the VideoProvider and VideoCall
APIs to make it more clear what the link is between the two.
Bug: 21520606
Change-Id: I0a79450d69841df5850061311a523b37688efc49
2015-05-29 11:51:53 -07:00
Santos Cordon
7cb0925e7e
Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev
2015-05-28 23:06:17 +00:00
Amit Mahajan
ff0c25ce31
Merge "Cleaning up logging in TelephonyManager." into mnc-dev
2015-05-28 23:05:29 +00:00
David Friedman
3675694775
am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
...
* commit 'c397dde17960f2308ecc3ef0b5143c95df8e160c':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
2015-05-28 22:54:29 +00:00
Doris Liu
a9ac835437
Merge "Clean up calls to Rect.intersect()" into mnc-dev
2015-05-28 22:51:42 +00:00
Glenn Kasten
626f0dc73b
Merge "Deprecations are warnings not errors" into mnc-dev
2015-05-28 22:51:17 +00:00
Chris Craik
da28c8681a
Merge "Fix round cap approximation to understand scale" into mnc-dev
2015-05-28 22:50:03 +00:00
David Friedman
b3af4f43d7
am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
...
* commit '9ffbf9bd9b40487b7edacdf0c790714f080494c4':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
2015-05-28 22:40:16 +00:00
Quddus Chong
2f9f8a38f1
am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
...
* commit '01c4d8d357aef661d15ef770986e35be324c6d03':
docs: Fixed training TOC formatting and broken link in TV training landing.
2015-05-28 22:40:01 +00:00
Doris Liu
adb8921453
Clean up calls to Rect.intersect()
...
This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.
bug: 7368679
Change-Id: Ibda3bfd662f8ca83cb5662748d9be250243b72b2
2015-05-28 15:39:05 -07:00
Wale Ogunwale
c7cbdd11c3
Merge "Don't kill process with active service/receiver when task is removed." into mnc-dev
2015-05-28 22:38:03 +00:00
Chris Craik
2df124b854
Merge "Fix build" into mnc-dev
2015-05-28 22:35:00 +00:00
Chris Craik
469fb1efd6
Fix build
...
Change-Id: I7ee28c474aa821eb598f719723d87416a41537b9
2015-05-28 15:33:40 -07:00
Alan Viverette
4562f0bc89
Merge "Fix drawable CTS breakages" into mnc-dev
2015-05-28 22:33:33 +00:00
David Friedman
c397dde179
am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
...
* commit '92451a97271d014ab10ca4685beae728d53601b4':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
2015-05-28 22:33:22 +00:00
David Friedman
92451a9727
Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
2015-05-28 22:16:20 +00:00
David Friedman
9ffbf9bd9b
am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
...
* commit 'ed8c62955aa6512fb4e929e59893c774ae894358':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
2015-05-28 22:09:15 +00:00
Chris Craik
1cd7e4c3d0
Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev
2015-05-28 22:03:08 +00:00
Deepanshu Gupta
5cd795a909
Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev
2015-05-28 21:59:12 +00:00
Quddus Chong
01c4d8d357
am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
...
* commit 'dcfa755616504fb4443f4d79d936f30c3742d77a':
docs: Fixed training TOC formatting and broken link in TV training landing.
2015-05-28 21:59:02 +00:00
David Friedman
ed8c62955a
Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
2015-05-28 21:58:58 +00:00
Deepanshu Gupta
1421583bca
Merge "Fix BridgeTypedArray.getType()" into mnc-dev
2015-05-28 21:58:58 +00:00
Deepanshu Gupta
d758e042ce
Fix NPE in BridgeContext.obtainStyledAttributes()
...
Replace direct member access with getter that checks for nullness.
Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
2015-05-28 14:57:43 -07:00
Deepanshu Gupta
5779ad71ea
Fix BridgeTypedArray.getType()
...
Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.
Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
2015-05-28 14:57:43 -07:00
Tao Bao
165102f350
Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
2015-05-28 21:48:29 +00:00
Quddus Chong
dcfa755616
docs: Fixed training TOC formatting and broken link in TV training landing.
...
Change-Id: Ie159a1e5d3d84bfc20b2e2f0f5d4973d3880876d
2015-05-28 14:46:24 -07:00
Dianne Hackborn
4573dddcce
Merge "Add new API to set URI on AssistContent." into mnc-dev
2015-05-28 21:35:41 +00:00
Evgenii Stepanov
bf7fe1e051
Merge "Update asan/app_process." into mnc-dev
2015-05-28 21:30:58 +00:00
Quddus Chong
0e591ef26a
am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
...
* commit '7138643f4185d402ac216cfcfe3c871c860bf84e':
docs: Misc. fixes for M Preview docs.
2015-05-28 21:20:18 +00:00
Quddus Chong
7138643f41
am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
...
* commit 'd5db0f63b4cf03294c2871eb3bf9d3b944700788':
docs: Misc. fixes for M Preview docs.
2015-05-28 21:05:02 +00:00
Olawale Ogunwale
aa47d8d976
Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev
2015-05-28 20:59:10 +00:00
David Friedman
56d16c020c
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
...
Change-Id: I39c5c060f41cc501ef595e136fa2376232ea108d
2015-05-28 13:57:33 -07:00
Alan Viverette
b63b93dee7
Fix drawable CTS breakages
...
1. ClipDrawable.getOpacity() now correctly respects the current level
2. DrawableWrapper checks the contained drawable's changing config even
if it doesn't have a constant state
3. DrawableWrapper gives priority to the last valid child drawable
rather than the drawable attribute
Bug: 21406104
Change-Id: I442fe90d0a3865bfdc6b2d14a7358178310dde02
2015-05-28 13:50:44 -07:00
Quddus Chong
d5db0f63b4
Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
2015-05-28 20:47:15 +00:00
John Spurlock
517f3ee41a
Merge "Backup/restore notification policy." into mnc-dev
2015-05-28 20:34:18 +00:00
Doris Liu
057d93971a
Merge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev
2015-05-28 20:33:12 +00:00
Doris Liu
c81c082628
Fix ScrollView's EdgeEffect to respect clipToPadding flag
...
bug: 19126514
Change-Id: I21fe4fd3e2f1240ee31c51f9deac7f285ffe2408
2015-05-28 13:29:44 -07:00
Guang Zhu
6ac0c8c5fa
lock device orientation during app compatibility test
...
Devices on test benches are usually held sideways, which leads to app
rotation during launch. While it's useful to identify such issue from an
app perspective, the app compatibility test should be isolated from such
noise for the purpose of the testing for basic level of compatibility.
Change-Id: I403f96e5d8512ca6a17b05a83d69f4b02f760a32
2015-05-28 20:26:37 +00:00
David Friedman
9f33a25749
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
...
Change-Id: I78d719f48f795f0477e4a08920ddb05fce48b5fc
2015-05-28 13:25:32 -07:00
John Spurlock
35ef0a626c
Backup/restore notification policy.
...
- Include zen + ranking config in the backup payload.
- Owner user only for now.
- For the most part, reuse existing policy file structure
as the payload format, but elide items that do not survive
across devices (info for secondary users, uids).
- Also elide the manual zen rule, if set.
- During restore, keep ranking info for uninstalled apps
in purgatory until the apps exist.
Bug: 17755700
Change-Id: Iadf71a43cd0efd44fe9a0a29874d60666b6d2076
2015-05-28 16:25:32 -04:00
Quddus Chong
276ec483e2
docs: Misc. fixes for M Preview docs.
...
Change-Id: I816bb18d0110a4a7e585fe727471c2356a93caac
2015-05-28 13:17:55 -07:00
Bryce Lee
3aeb5f848e
am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
...
* commit '2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
Introduce indirection for base micro themes.
2015-05-28 20:07:57 +00:00
Adam Lesinski
8a179cab79
Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
2015-05-28 20:04:18 +00:00
Bryce Lee
2836b863fb
am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
...
* commit 'f33da5188d5d1d66c1697a84358f334018e9f905':
Introduce indirection for base micro themes.
2015-05-28 19:52:17 +00:00
Adam Lesinski
049c88b48a
BatteryStats: Output per-app wifi controller distribution
...
Currently we only output this data on checkin, adding the output
to dumpsys as well.
Change-Id: I649474b576d7341bbf54ff95c0b0e6fed367bcb0
2015-05-28 12:51:19 -07:00
Evgenii Stepanov
5ca3afa296
Update asan/app_process.
...
Build both 32 and 64-bit versions and don't limit it to eng.
Change-Id: I5d6cc8005291100d5fe0f1385e8a0b4ba5f4d630
(cherry picked from commit e740b17d2400ed0db17d1f7fce4f052bbbf808ab)
2015-05-28 12:47:30 -07:00
Bryce Lee
f33da5188d
Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
2015-05-28 19:39:45 +00:00
David Friedman
e9ac81745e
am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
...
* commit 'dd6ccfd0d97c7a794793cd465be029310efa67ea':
Docs: Quick typo fix.
2015-05-28 19:20:19 +00:00
Luan Nguyen
dd054f505b
am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby
...
* commit '15afeaa99f6da12f6237a2b24fdd544b298bf589':
docs: Fix bad heading link for doze-standby
2015-05-28 19:20:13 +00:00
David Friedman
dd6ccfd0d9
am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
...
* commit '8bf833e40f403f5f40233bf7c68778b2401c5673':
Docs: Quick typo fix.
2015-05-28 19:03:28 +00:00