Commit Graph

74954 Commits

Author SHA1 Message Date
Selim Cinek
b481c010e6 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev am: 60a09546c0
am: 0c8a132ea3

Change-Id: Ie7e15d7c4010c0e3cbf0081a1a4084767c83b1fa
2017-08-23 16:23:40 +00:00
Selim Cinek
0c8a132ea3 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
am: 60a09546c0

Change-Id: If41351abbd54b19dbdcaecca01fe7104176f488b
2017-08-23 16:07:49 +00:00
TreeHugger Robot
cbae716bed Merge "Update javadoc of UserManager#DISALLOW_ADJUST_VOLUME" 2017-08-23 16:07:04 +00:00
TreeHugger Robot
e0ebf03ba7 Merge "WebView: clarify docs for addJavascriptInterface" 2017-08-23 15:30:54 +00:00
Wen ZHANG
61ed0dc033 Update javadoc of UserManager#DISALLOW_ADJUST_VOLUME
Profile owners are not allowed setting this restriction until the N
release.

Test: No test as it only touches javadocs

Change-Id: I793e2c3b5270ee00e451551e68567e8995f31d1c
2017-08-23 14:32:59 +01:00
Selim Cinek
05bba9e284 Merge "Fixed a bug with app provided media spans" into oc-mr1-dev am: 3c47a11598
am: 09adc8f1a3

Change-Id: Iefd242f4b242ae0861f7f1fd9b8b8b89b06d6f20
2017-08-23 04:23:57 +00:00
Selim Cinek
09adc8f1a3 Merge "Fixed a bug with app provided media spans" into oc-mr1-dev
am: 3c47a11598

Change-Id: I874b39c9c76b13579f94b047a269e47602bda72d
2017-08-23 04:10:55 +00:00
Selim Cinek
87c3153dcd Transforming all texts of decorated media custom views
Since otherwise they would be illegible with the color
tranformation.

Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes: 64810767
Test: manual, add decoratedMediaCustomView
2017-08-23 02:30:14 +00:00
Todd Kennedy
675e99ac6e Merge "Only log resolution when starting activities" into oc-mr1-dev am: e4de49140d
am: d10454ecc3

Change-Id: I179996d5c4b79b19fdacd08049ee5fdc047fe1bf
2017-08-23 01:01:14 +00:00
Svet Ganov
50f75df634 Merge "Allow clearing instant app meta-data" into oc-mr1-dev am: e391175330
am: a80370745b

Change-Id: I719169bc27017a8e8c4d6a858c14ca2a458acc95
2017-08-23 00:13:48 +00:00
Todd Kennedy
d10454ecc3 Merge "Only log resolution when starting activities" into oc-mr1-dev
am: e4de49140d

Change-Id: Ia86f2d6097877e894fed40f12c5c49f26a1b690d
2017-08-23 00:06:45 +00:00
Selim Cinek
ef89f578f2 Merge "Fixed a bug with decorated custom views" into oc-mr1-dev am: 9d41e8cd47
am: a7ea41c7d7

Change-Id: I91899094a4798d83b8e2e24b41d5f11a3a9bb045
2017-08-23 00:06:29 +00:00
Svet Ganov
a80370745b Merge "Allow clearing instant app meta-data" into oc-mr1-dev
am: e391175330

Change-Id: I35fea7acf6bd4084b06cb17c580c75df08ef484c
2017-08-22 23:39:07 +00:00
Selim Cinek
48f66b7b77 Fixed a bug with app provided media spans
Since notifications are colorized now,
We need to clear color spans from media
notifications, otherwise the contrast won't
be ensured.

Test: use media notification with color span, observe no span
Fixes: 64445955
Change-Id: Ib4f5b14196c604468c8c00ba48f294b1b2d102e3
2017-08-22 23:24:38 +00:00
Nate Fischer
0d2b68bb68 Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev am: b2456e6194
am: 0cd12a83c6

Change-Id: I5c0529021e6bbba15090bfc500bb4610a9a4c0d7
2017-08-22 23:21:15 +00:00
Selim Cinek
a7ea41c7d7 Merge "Fixed a bug with decorated custom views" into oc-mr1-dev
am: 9d41e8cd47

Change-Id: I36099788ad09bb8035374c2ca27caffabc21dfb0
2017-08-22 23:20:24 +00:00
Nate Fischer
0cd12a83c6 Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev
am: b2456e6194

Change-Id: I3066dd0edd6c125b2e7fdab7fc07624f4c8688a5
2017-08-22 23:01:12 +00:00
Todd Kennedy
e4de49140d Merge "Only log resolution when starting activities" into oc-mr1-dev 2017-08-22 23:00:58 +00:00
TreeHugger Robot
e391175330 Merge "Allow clearing instant app meta-data" into oc-mr1-dev 2017-08-22 22:49:03 +00:00
TreeHugger Robot
9d41e8cd47 Merge "Fixed a bug with decorated custom views" into oc-mr1-dev 2017-08-22 22:48:14 +00:00
Nate Fischer
b2456e6194 Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev 2017-08-22 22:40:39 +00:00
TreeHugger Robot
15628f8092 Merge "Check contents of Bundle for ScoredNetwork.equals" 2017-08-22 22:31:54 +00:00
Selim Cinek
fc8073c4b6 Fixed a bug with decorated custom views
Even if their layout still maches, the content was unrecoverably
destroyed, so we can't just reapply it anymore.

Fixes: 62911941
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java

Change-Id: I3a50c96484686958570ac5e4949df3ad4b8a421a
2017-08-22 14:58:59 -07:00
Svet Ganov
f935a70398 Allow clearing instant app meta-data
The package manager has an API to clear the data of an app
which does not work for uninstalled instant apps for which
we store some meta-data (icon, title, cookie). This change
allows clearing the data of an uninstalled instant app.

Test: Instant cookie CTS tests use this API

bug:64517837

Change-Id: Ia929fead71b5ae786e88ddd0fa8e8a490d970dd0
2017-08-22 12:22:38 -07:00
Stephen Chen
4efd1ca536 Check contents of Bundle for ScoredNetwork.equals
Bundle just uses object equality, so this improves the equality of
ScoredNetwork by checking the contents of the bundle.

Bug: 34824590
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/ScoredNetworkTest.java

Change-Id: I1c39e574d4e1e23e0155467302be5e34076fe9a0
2017-08-22 11:09:02 -07:00
TreeHugger Robot
25fd1afa7b Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" 2017-08-22 17:25:01 +00:00
Wale Ogunwale
3af8736334 Merge "Introducing windowing mode in WindowConfiguration." 2017-08-22 17:13:12 +00:00
Android Build Merger (Role)
e7169710de Merge "Merge "Place focus on window when a11y performs an action" into oc-mr1-dev am: c6c9e089db am: df79ca699d" 2017-08-22 17:11:03 +00:00
TreeHugger Robot
37c8a15d84 Merge "Skip smart select animation if selection result is null" 2017-08-22 17:08:03 +00:00
Phil Weaver
5add014517 Merge "Place focus on window when a11y performs an action" into oc-mr1-dev am: c6c9e089db
am: df79ca699d

Change-Id: I2089f32e0f370378eaf472cfeca5cc829e780e04
2017-08-22 17:07:26 +00:00
Todd Kennedy
6ebabca547 Only log resolution when starting activities
Change-Id: I406af40953f3d6ade39e1bab18a35c534e308f3e
Fixes: 63804529
Test: Manual. Query web intent, notice no logs are emitted
Test: Manual. Start activity via web intent, notice logs are emitted
2017-08-22 10:02:12 -07:00
Phil Weaver
df79ca699d Merge "Place focus on window when a11y performs an action" into oc-mr1-dev
am: c6c9e089db

Change-Id: Iea95db16258ad071852a5925eb69069e432c8e74
2017-08-22 16:52:12 +00:00
Phil Weaver
c6c9e089db Merge "Place focus on window when a11y performs an action" into oc-mr1-dev 2017-08-22 16:42:13 +00:00
Tobias Thierer
34a555122e Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: be87c9ca58 am: 70b000e6e2 am: 0aa55f7b2c am: 6376859a98
am: 45ade15a7c

Change-Id: I94d4593ff8234c9ee4340b3b2e733ae936177e48
2017-08-22 15:51:15 +00:00
Tobias Thierer
45ade15a7c Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: be87c9ca58 am: 70b000e6e2 am: 0aa55f7b2c
am: 6376859a98

Change-Id: I1ed6962088be8a0999b81a19d84f5c1c7203dddb
2017-08-22 15:40:30 +00:00
Tobias Thierer
6376859a98 Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: be87c9ca58 am: 70b000e6e2
am: 0aa55f7b2c

Change-Id: I048a7695ec98711163494e3dedab785e1400d1da
2017-08-22 15:28:07 +00:00
Tobias Thierer
0aa55f7b2c Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: be87c9ca58
am: 70b000e6e2

Change-Id: I0e15e22f4e1561102012b012cdea74db63ac2163
2017-08-22 15:16:31 +00:00
Petar Šegina
c6381f7a76 Skip smart select animation if selection result is null
Bug: 64809246
Test: bit CtsAccessibilityServiceTestCases:AccessibilityTextTraversalTest#testTextEditingActions
Change-Id: I4ef9d374e3d4a2889462459f50b673cca8970b5b
2017-08-22 16:15:05 +01:00
Phil Weaver
0948eb4f07 Merge "Double-check a11y node sealing during refresh" 2017-08-22 15:02:03 +00:00
Tobias Thierer
70b000e6e2 Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs"
am: be87c9ca58

Change-Id: I79db2f0dc0870f71ec21397545e2e6abb5c7142b
2017-08-22 15:00:24 +00:00
Tobias Thierer
be87c9ca58 Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" 2017-08-22 14:07:16 +00:00
Wale Ogunwale
687b427334 Introducing windowing mode in WindowConfiguration.
Currently Stacks (specifically their ids) are used to determine
windowing mode for activities. This isn't flexible when it comes
to changing/mixing various windowing modes at different levels
of the window hierarchy. E.g. how do you have the non-default
display support freeform or split-screen or how do you
interleave freeform windows with fullscreen windows.
To help with this problem we are introducing windowing mode
in WindowConfiguration that can be used to set the windowing
mode for any WindowContainer in the hierarchy.

Currently all displays are set to fullscreen windowing mode and
stacks windowing modes are set based on their id.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: go/wm-smoke
Change-Id: Iccdc3212cda651998d6ad76ce5261d089bff897a
2017-08-22 06:53:01 -07:00
Jorim Jaggi
249a45363a resolve merge conflicts of c55cce487c to master
Change-Id: If833e3c5efed891fb1ba7b32b2edc96a60ea2566
2017-08-22 13:28:57 +02:00
Nate Fischer
aaef6827ca WebView: clarify docs for addJavascriptInterface
Docs change only, no change in logic.

We do not support calling #addJavascriptInterface until after JavaScript
is enabled via WebSettings#setJavaScriptEnabled. Calling these methods
in the wrong order is undefined behavior (and we've seen that it's buggy
under certain conditions, e.g. if the DOM includes an <img> element).

This clarifies the point in the docs and code example.

Bug: 64899039
Test: make -j40 docs (everything looks good)
Change-Id: I8ef9eec7f038037e6b898286e4dad8a57ecad472
2017-08-22 01:06:07 +00:00
Nate Fischer
2b108d8609 WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing
This renames the method as follows:

 * initSafeBrowsing -> startSafeBrowsing

This also updates documentation to fix javadoc references, and to
clarify that Safe Browsing checks are not guaranteed until after
startSafeBrowsing() invokes its callback.

This does not change the method name in WebViewFactoryProvider, because
changing this would break CTS tests (since the WebView APK implements
this under the old name).

This also removes shutdownSafeBrowsing, because we found there was no
good use for this (it's meaningless for AOSP, and we were recommended to
avoid calling the underlying GMSCore API for GoogleWebView). More
significantly, there's no good place for an application to call it from.

Bug: 64331900
Test: make update-api (docs are correct)
Change-Id: Idf2b9390306052f5c5dfb92909fca4cfeec74aef
2017-08-21 18:04:28 -07:00
Siyamed Sinir
a8d982d6c8 StaticLayout capped height should be 0 when maxLines=0
Previously we added mMaxLineHeight to track the line height at the
maxLines value. However when maxLines is set to zero, mMaxLineHeight is
not calculated and remains 0. When maxLines is set to zero, the capped
height of the layout should be 0.

Test: Added a test case to coretests/StaticLayoutTest
Test: bit FrameworksCoreTests:android.text.StaticLayoutTest
Test: bit FrameworksCoreTests:android.text.DynamicLayoutTest
Test: bit FrameworksCoreTests:android.text.StaticLayoutLineBreakingTest
Test: bit FrameworksCoreTests:android.text.StaticLayoutBidiTest
Test: bit FrameworksCoreTests:android.text.StaticLayoutTextMeasuringTest
Test: bit FrameworksCoreTests:android.text.StaticLayoutDirectionsTest
Test: bit CtsTextTestCases:android.text.cts.StaticLayoutTest
Test: bit CtsTextTestCases:android.text.cts.DynamicLayoutTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest

Bug: 64822158
Change-Id: I5a2a40661501b5778ef8687b342f3e790c6f716a
2017-08-21 15:50:54 -07:00
Phil Weaver
cc797d596d Double-check a11y node sealing during refresh
I believe this line can detect when a node is
recycled during a refresh. This change is much
more targeted than preventing all interactions
with recycled nodes.

Bug: 37858096
Test: A11y CTS and unit tests
Change-Id: I07dd6c2eccd2ba26347f42d4ecd2cefb684e2c8e
2017-08-21 12:45:11 -07:00
Jorim Jaggi
c55cce487c Merge "Log reportFullyDrawn into TRON" into oc-mr1-dev
am: 56af51d67e

Change-Id: I2456541c70227510494c8ef1bf82589fd73e010f
2017-08-21 16:57:07 +00:00
TreeHugger Robot
56af51d67e Merge "Log reportFullyDrawn into TRON" into oc-mr1-dev 2017-08-21 16:47:21 +00:00
Phil Weaver
cf190ce1d2 Merge "Revert "Prohibit using recycled AccessibilityNodeInfos."" 2017-08-21 15:13:16 +00:00