Commit Graph

301953 Commits

Author SHA1 Message Date
Jiaquan He
bec9df8060 Merge "Check split screen properly." into nyc-mr2-dev
am: 632332c259

Change-Id: I2d69e69b9e00d076f2707a690137d5278fd2107c
2016-12-28 19:20:06 +00:00
Jiaquan He
e3ecb097b0 Check split screen properly.
am: 5fac212e8b

Change-Id: Ica99e37798a2447acdbddb7b29b6e67655870b1d
2016-12-28 19:20:00 +00:00
Jiaquan He
632332c259 Merge "Check split screen properly." into nyc-mr2-dev 2016-12-28 19:12:27 +00:00
Kang Li
9082f5b697 Log metrics for Smart-Sharing in ChooserActivity.
Bug: 33051310, 30982298
Test: manually shared several images in Camera.

Change-Id: I6b147ec89729815931e2b626b7533e1e5b95c819
2016-12-28 10:31:59 -08:00
Jeremy Joslin
7231d44467 Defining a new REQUEST_NETWORK_SCORES permission.
This is intended to be a drop-in replacement for the existing
BROADCAST_NETWORK_PRIVILEGED with a more appropriate name.

Test: Built, ran.
BUG: 33752149
Change-Id: I12bdba9694fdf2a2e39990736265919edafd865e
2016-12-28 10:26:59 -08:00
Jeremy Joslin
e3d260d4e9 Cleanup the evaluateBinding() method.
Small refactor to remove 1 level of nesting.

Test: build, run.
Change-Id: Ic46a65036b207ff73fefced914e0928de2f2b500
Merged-In: I38836ca9d18c5fcd3c6edf5931b58de3b08614ee
2016-12-28 10:18:55 -08:00
Adam Lesinski
38665547bb AAPT2: Treat non-AAPT attributes as Attributes with no format specified.
Attributes in XML like "class" should be treated as attributes with no
format specified. That means that something like 'version="1"' will
be interpreted as an Integer value instead of as a string.

This is more in line with the old AAPT behaviour.
Bug: 30763349
Test: make libaapt2_tests

Change-Id: I02fe41617e3c62c354714056198ef480d62afee7
2016-12-28 12:40:35 -05:00
Jorim Jaggi
21635d67f9 Merge "Change screen pinning back to old gesture" into nyc-mr2-dev am: 8812fb0695
am: 3b03622406  -s ours

Change-Id: I6dfdf86c11ef17a3cc2d09c7b68486452f5401cc
2016-12-28 17:21:04 +00:00
Jorim Jaggi
ef51c27ffe Change screen pinning back to old gesture am: 4e723e6087
am: 6f0236688f  -s ours

Change-Id: Ic7820f41eeaf02de2c0ee8ed41f43103f5eb3d14
2016-12-28 17:19:56 +00:00
Jorim Jaggi
3b03622406 Merge "Change screen pinning back to old gesture" into nyc-mr2-dev
am: 8812fb0695

Change-Id: I4a5ccf55bf02ba25d4ce652ac86cdba20814d661
2016-12-28 17:12:38 +00:00
Jorim Jaggi
6f0236688f Change screen pinning back to old gesture
am: 4e723e6087

Change-Id: I83dee36d5d3b16adbf740dd6495e7945bf0236ef
2016-12-28 17:12:28 +00:00
Jorim Jaggi
8812fb0695 Merge "Change screen pinning back to old gesture" into nyc-mr2-dev 2016-12-28 17:01:22 +00:00
TreeHugger Robot
8baf18ac67 Merge "Allow lazy preloading of zygote resources." 2016-12-28 16:52:34 +00:00
Jorim Jaggi
e962a8f3c7 Merge "Change screen pinning back to old gesture" 2016-12-28 15:27:52 +00:00
Narayan Kamath
5a3d0c6e11 Allow lazy preloading of zygote resources.
Add a flag that controls resource preloading. If set, the zygote waits
until the first fork request to preload resources.

When applied to the secondary zygote, this approach appears to save
between 500-800ms of boot time once the webview RELRO step that uses
the 32 bit zygote is deferred.

Test: Manual
Bug: 32735001

Change-Id: Id387b7132d052fa51b9c25f0142fcd546b99662d
2016-12-28 15:20:11 +00:00
Geoffrey Pitsch
4dd5006ff5 Change Notification Inline Settings for Channels
Removes slider advanced settings.
Move more Guts internals out of BaseStatusBar.

Test: runtest systemui
Change-Id: I0cf7f144859d1248bd54e281cfe0b35a817376a6
2016-12-28 10:13:02 -05:00
Jorim Jaggi
95f50d7314 Merge "Reenable test for presubmit" 2016-12-28 14:00:14 +00:00
Jorim Jaggi
ac5fa1bb60 Change screen pinning back to old gesture
This makes the code a bit more complicated, but allows apps to
receive long-press back again and also makes the mode harder
to exit for toddlers.

Test: Without TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Test: With TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Fixes: 324407
Change-Id: Icd7347aa9c60af00fdb0b3991baabb730552d097
2016-12-28 14:57:40 +01:00
Jorim Jaggi
4e723e6087 Change screen pinning back to old gesture
This makes the code a bit more complicated, but allows apps to
receive long-press back again and also makes the mode harder
to exit for toddlers.

Test: Without TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Test: With TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Merged-In: Icd7347aa9c60af00fdb0b3991baabb730552d097
Change-Id: Icd7347aa9c60af00fdb0b3991baabb730552d097
Fixes: 32440409
2016-12-28 05:56:17 -08:00
Ivan Podogov
afababd4d8 In permission review mode, always request user's consent to toggle BT.
Bug: 33155221
Test: Manual: flash the watch, check that the consent UI was
      displayed in both apps (the one with CompileSDK=21 and
      TargetSDK=21, and the one with CompileSDK=25 and
      TargetSDK=25).
Change-Id: Ic1ed987bbaf282892a2aef354a8ca0add2c829ba
2016-12-28 11:18:21 +00:00
Andrii Kulian
6cc1a1d65c Fix crash when removing a display with activities
When secondary display is removed current behavior is to
move its stacks to the primary display. This requires app
windows to be reparented, and there was a check missing
for app windows in DisplayContent.reParentWindowToken.

Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Test: #testMoveStackBetweenDisplays
Bug: 33677605
Change-Id: I2ac2cdba273134438c63385887a09c37d42017bb
2016-12-27 23:52:59 -08:00
Andrii Kulian
d276563b38 Add positionChildAt method to WindowContainer
Added method to change the position of a child among siblings.
It accepts int value, which can either specify a target position
or POSITION_TOP/POSITION_BOTTOM.
When child is moved to top or bottom, there is an option to also
perform same action on parents. This will effectively move the
entire branch of the hierarchy tree to top/bottom.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowContainerTests
Test: #testPositionChildAt
Test: #testPositionChildAtIncludeParents
Test: #testPositionChildAtInvalid
Test: bit FrameworksServicesTests:com.android.server.wm.TaskStackContainersTests
Test: bit FrameworksServicesTests:com.android.server.wm.TaskStackTests
Change-Id: I6ade787487055f1c9a305afea64270c243196614
2016-12-27 19:52:44 -08:00
Joe LaPenna
9a4d62678e Merge "Send RECOMMEND_NETWORKS action when binding to provider." am: 1471ad3ea7 am: ddff9e586c am: bef179f094
am: b84fd75bf4  -s ours

Change-Id: Ie2112d79564ea4d0041ea85cb18b7968e2f093db
2016-12-28 03:10:38 +00:00
Joe LaPenna
b84fd75bf4 Merge "Send RECOMMEND_NETWORKS action when binding to provider." am: 1471ad3ea7 am: ddff9e586c
am: bef179f094

Change-Id: I4b8a42cb9499e9ba2beab0b39375485d1898b07c
2016-12-28 03:03:33 +00:00
Joe LaPenna
bef179f094 Merge "Send RECOMMEND_NETWORKS action when binding to provider." am: 1471ad3ea7
am: ddff9e586c

Change-Id: Ie86fbc9c427e3f238e0d83a03240fc7045a61e5e
2016-12-28 02:56:34 +00:00
Joe LaPenna
ddff9e586c Merge "Send RECOMMEND_NETWORKS action when binding to provider."
am: 1471ad3ea7

Change-Id: I9b052e48c067dc50111c6ce6bf1b200232676aa2
2016-12-28 02:49:01 +00:00
Treehugger Robot
1471ad3ea7 Merge "Send RECOMMEND_NETWORKS action when binding to provider." 2016-12-28 02:36:23 +00:00
TreeHugger Robot
d30dafa86b Merge "Send RECOMMEND_NETWORKS action when binding to provider." 2016-12-28 01:05:03 +00:00
TreeHugger Robot
4799fce7b0 Merge "Remove unused ro.com.android.wifi-watchlist" 2016-12-28 01:03:02 +00:00
TreeHugger Robot
3c288cf792 Merge "Fix settings shell command" 2016-12-28 00:41:35 +00:00
TreeHugger Robot
ca9eed4315 Merge "Add VisualVoicemailService" 2016-12-28 00:33:17 +00:00
TreeHugger Robot
f963b74e12 Merge "Make classes non-final so mockito can mock them." 2016-12-28 00:02:53 +00:00
Adrian Roos
7b0b5eb62b Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev am: 02f07cce35
am: 99a921a272

Change-Id: Ic2cb9f827131aeb44a330e51516401bc0808e8d5
2016-12-27 23:57:55 +00:00
Adrian Roos
799992ef75 Ambient Display: Fix race with coloring and redaction am: e5726a2082
am: dff956b0e0

Change-Id: I18d7da64d56f70923926df6231472a2c3a909f15
2016-12-27 23:56:47 +00:00
Adrian Roos
99a921a272 Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
am: 02f07cce35

Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6
2016-12-27 23:49:53 +00:00
Adrian Roos
dff956b0e0 Ambient Display: Fix race with coloring and redaction
am: e5726a2082

Change-Id: I9c2c42692f01b7665fb11d6e0f47c707d3c630fc
2016-12-27 23:49:46 +00:00
Jiaquan He
0a5e2d6b93 Resue TaskView information.
In this commit we calculate all the TaskView information we need
during initialization, so that we don't need to calculate again
unless any configuration is changed.

Bug: 32101881
Change-Id: I433688d0a05c69064d0da5268b61340cecdbfe74
2016-12-27 15:48:07 -08:00
Adrian Roos
7418c7b947 Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev am: 52133e6916
am: 656f7e2090

Change-Id: Ibb71a72da783a03bb9fe96c8dc968402ce45b38a
2016-12-27 23:37:27 +00:00
Adrian Roos
02f07cce35 Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev 2016-12-27 23:37:00 +00:00
Adrian Roos
58ffefa40f Keyguard: Don't lock on SIM removed during shutdown am: 1f8025adf2
am: c30dc190ba

Change-Id: Ic0b38d7d66f702241ee1d9df7e433076cc40485e
2016-12-27 23:36:15 +00:00
Alex Klyubin
db75666418 Remove unused ro.com.android.wifi-watchlist
System property ro.com.android.wifi-watchlist is automatically copied
into Settings.Secure.WIFI_WATCHDOG_WATCH_LIST which has been
deprecated and unused since API Level 16 (if not 14). Neither the
system property not its Settings.Secure counterpart is used anywhere.

This commit thus removes the automatic copying of the system property
into Settings.Secure.

Test: Device boots, Wi-Fi works
Bug: 33700679
Change-Id: If27149b863f41fed6c09b62145d5cfd96ae8e6de
2016-12-27 15:30:40 -08:00
Adrian Roos
656f7e2090 Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
am: 52133e6916

Change-Id: I9fe96a428c918f1fc250b021ddd4d1c6fbdd061b
2016-12-27 23:29:54 +00:00
Adrian Roos
c30dc190ba Keyguard: Don't lock on SIM removed during shutdown
am: 1f8025adf2

Change-Id: I22b34aa27c6540bf661081950a51eb275894c032
2016-12-27 23:29:47 +00:00
Adrian Roos
52133e6916 Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev 2016-12-27 23:20:47 +00:00
Svetoslav Ganov
ce7daaf982 Fix settings shell command
Test: run shell commands and verified result

Change-Id: I24e87a0efa9330a5872d300e17083d320fcc0573
2016-12-27 15:06:55 -08:00
Joe LaPenna
9bc5effad5 Send RECOMMEND_NETWORKS action when binding to provider.
Some services use action to disambiguate which binder to return in
onBind.

Test: built && installed && bound.
BUG: 33905890
Change-Id: I83ae41b472c597661b93f5467b64b258e9056f5f
Merged-In: I83ae41b472c597661b93f5467b64b258e9056f5f
2016-12-27 14:56:54 -08:00
Joe LaPenna
25e7ec24da Send RECOMMEND_NETWORKS action when binding to provider.
Some services use action to disambiguate which binder to return in
onBind.

Test: built && installed && bound.
BUG: 33905890
Change-Id: I83ae41b472c597661b93f5467b64b258e9056f5f
2016-12-27 14:52:53 -08:00
Jiaquan He
5fac212e8b Check split screen properly.
This commit detacts split screen by checking whether there's
a docked task instead of multi window mode.

Bug: 33847223
Bug: 32101881
Change-Id: I23ee11e57ded7c5e81d51cfbfea05500a879945c
2016-12-27 14:52:24 -08:00
sergeyv
15a108550e Fix getConfig on recycled bitmap
Test: android.graphics.cts.BitmapTest#testGetConfigOnRecycled
bug:33789983
Change-Id: Ic91c16cbd83acdd6002021b44da57636ee27742d
2016-12-27 14:32:03 -08:00
Fan Zhang
82dd3b0bf6 Make classes non-final so mockito can mock them.
Bug: 33341275
Test: RunSettingsRoboTests
Change-Id: If83180d7caf3af29c9d0dcdc20d557d8d9827c74
2016-12-27 13:59:23 -08:00