Commit Graph

245370 Commits

Author SHA1 Message Date
Christopher Tate
88c9eae886 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade
am: 24ceca96af  -s ours

* commit '24ceca96af925ac19a1fa337afc0e739d9cb11ad':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663
2016-05-26 00:12:37 +00:00
Phil Weaver
7ab1a4d286 Merge "Improve accessibility window title behavior" into nyc-dev 2016-05-26 00:11:25 +00:00
Sid Soundararajan
caa611f88d Make content descriptions of task cards, the title description
Use the title description as content description for the task
card, this should be better for talkback.

BUG: 28594452
Change-Id: Idc97004f1370a35ea5328c4e9e46a72a9349c8f4
2016-05-25 17:08:12 -07:00
TreeHugger Robot
135c4760fd Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev 2016-05-25 23:51:01 +00:00
Adam Lesinski
27d301667b Use app's best locale if they override LocaleList
App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.

Bug:28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a
2016-05-25 16:45:14 -07:00
Adam Powell
43ec62af45 N is API 24
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
2016-05-25 16:42:56 -07:00
Derek Tan
03d3f4a6cb Merge "Per API review, revert the API renaming CL." into nyc-dev 2016-05-25 23:41:21 +00:00
Hemal Patel
ff9f9ee180 Docs: Changed GitHub samples link to point to "Google Samples" page on
GitHub.

Bug: 28223672
Change-Id: Ie168740a3f9c8393379d09bb97c7f6422d8fb9dd
2016-05-25 16:25:32 -07:00
Mady Mellor
6baed9e3a2 Parent notifications should always be normal notification color
Notification groups would use the background color of their
children in some cases. This changes it so that parent
notifications always use the normal notification color.

Change-Id: I0638f94e044da2ba65a921f0c4a538941c001ca7
Fixes: 28613919
2016-05-25 16:16:53 -07:00
Christopher Tate
24ceca96af DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101
am: 4c559cdade

* commit '4c559cdadea4b74262b40cbefe4a76a0e22ccc68':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Iff8942e506b14cb2d0e64623daea3bdc3cee2142
2016-05-25 23:16:15 +00:00
Christopher Tate
38a37f336f Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca
am: c69aa838a8

* commit 'c69aa838a8f89ba7476ce554ecf5a19a6de78b28':
  Backport of backup transport whitelist

Change-Id: I0151279dfa467d6f456c2cfb4066cbc2ff4f7365
2016-05-25 23:16:02 +00:00
Trevor Johns
05dd9d2c29 docs: Fix broken link in Volley training
Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.

Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9
2016-05-25 16:13:21 -07:00
Dianne Hackborn
47fb83a1e2 Fix issue #28964589: Binding dies when (unrelated) component is disabled in package
We go through the same path for uninstalling and changing an app...
both of which would do a full force stop.  That is only appropriate
for uninstalling; for changing, we should just be killing its processes.

Change-Id: Ia87750d96d3e3eb7ee30841429eb926c20c5ad78
2016-05-25 16:12:02 -07:00
Philip P. Moltmann
00e3c23265 Merge "Move add-printer list headers to the right positions." into nyc-dev 2016-05-25 23:10:26 +00:00
Chris Tate
c69aa838a8 Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22
am: 600d4f61ca

* commit '600d4f61ca15b375c9acef64d52913f0ab823deb':
  Backport of backup transport whitelist

Change-Id: I308a0f0284990dc8e327c581cac49db899ad6cfa
2016-05-25 23:06:54 +00:00
Christopher Tate
4c559cdade DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours
am: 077534b101

* commit '077534b1015762d445f505fc2f440beaa2ba974a':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I04041486cfa35b534915a25cd1d84442a59ed7bf
2016-05-25 23:06:02 +00:00
Stephan Linzner
ebdc157bc0 Un-deprecated Android mock testing APIs
Some mock APIs don't have an ATSL equivalent yet
will be deprecated in O timeframe now.

Change-Id: Ibb7ec32fba3d16f0ea02d100f4e4fc8f011288f0
Bug: 28295815
2016-05-25 22:54:27 +00:00
Bill Yi
3a97b5e245 Import translations. DO NOT MERGE
Change-Id: I1565d077d00cddf65bcda9034194a020a1a61e7d
Auto-generated-cl: translation import
2016-05-25 15:53:43 -07:00
Christopher Tate
600d4f61ca Merge "Backport of backup transport whitelist" into mnc-dev
am: 2cfc6baa22

* commit '2cfc6baa2286a256585a7fb6295f9b66ff641726':
  Backport of backup transport whitelist

Change-Id: I73dff5d354cd5f26a7f2e68e16f8dd798d610fd3
2016-05-25 22:45:49 +00:00
Christopher Tate
077534b101 DO NOT MERGE : backport of backup transport whitelist
am: 647cb6a6d8  -s ours

* commit '647cb6a6d82e3bb22eca0e5a27810e99084e2d5b':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I08b62dc7639ecc874d4c61d737b2b4cca27da241
2016-05-25 22:45:22 +00:00
Chong Zhang
e55e4b7f73 Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev 2016-05-25 22:42:56 +00:00
Hemal Patel
ab0bd7d1ec Docs: Fixed the end-of-comment tag
Bug: 28025365
Change-Id: I2d3963c8c0a909f7e0a4925636bc73a56816e0af
2016-05-25 15:36:42 -07:00
Chris Tate
2cfc6baa22 Merge "Backport of backup transport whitelist" into mnc-dev 2016-05-25 22:30:58 +00:00
Chong Zhang
73d4b44ce3 Update dock stack create mode after rotation if dock side changed
On some devices (such as tablets) dock stack could be created on top,
but put to right after rotation. Dock create mode needs to be updated
in this case, otherwise when a new stack is attached to the display
(for example launch into now-cropped fullscreen stack),
attachDisplayContent() will use wrong dock mode to derive the bounds.

bug: 28942558
Change-Id: I83e66aeac94bd3f96c4b6a0a740acf76234bbe82
2016-05-25 15:26:58 -07:00
Sid Soundararajan
436da616c8 Merge "Alternate method for adding dismiss in talkback" into nyc-dev 2016-05-25 22:23:05 +00:00
Antonio Cansado
c45f0aea71 Merge "Cleaning up NetworkStatsManager." into nyc-dev 2016-05-25 22:17:21 +00:00
Siyamed Sinir
e747160509 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev 2016-05-25 22:03:06 +00:00
Fyodor Kupolov
ac06a4907b Remove ActivityManager calls with PM.mInstallLock held
UserController now pushes user state to UMS.

PM now checks user running/unlocking/unlocked state by calling
UserManagerInternal.

Bug: 28090199
Change-Id: I20e62b37f78238f28dd81f49f876732bbd3c6b34
2016-05-25 14:55:09 -07:00
Amanda Kassay
29b04437b1 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe
am: a475ff360c

* commit 'a475ff360c9457ecbef6af97ca7228dc9cd5c139':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: Ibe99c1f7e47acacf7b60f8ad66a7a3d658776413
2016-05-25 21:50:13 +00:00
Eric Schmidt
31e070a1b3 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c
am: 3c2709c6b7

* commit '3c2709c6b7b40f0a31674a775f891ca4e198cfa5':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: Ib072e701b8793baba0c9da9a24748dc89b1dae55
2016-05-25 21:50:00 +00:00
Amanda Kassay
a475ff360c Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs
am: cb3ae33cfe

* commit 'cb3ae33cfe5fdb73e648dc08bdf2ea0b19116b86':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I33fec5a25e6648db7b6fd0da06794c0ce7bd8ed5
2016-05-25 21:35:54 +00:00
Eric Schmidt
3c2709c6b7 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs
am: 5548a7c59c

* commit '5548a7c59cf6a41095c72189fee7e522b5cab8f1':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: I08d7e4c62072bffd01db4f1192cadbc1d033306b
2016-05-25 21:35:43 +00:00
Android Build Merger (Role)
cb3ae33cfe Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs 2016-05-25 21:28:20 +00:00
Amanda Kassay
4be59f0ae3 Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."
am: c68d8768c8

* commit 'c68d8768c84dd045d3db3f685a95963eb315be8c':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I40fa99170770712c4d844eab0d1e3d6fa9373d90
2016-05-25 21:28:01 +00:00
Andrii Kulian
0be2cfec46 Fix exception when trying to update config of detached stack
There is an NullPointerException which can be reproduced with following steps
on angler:
1. In split-screen open activities from the same app.
   Make sure to launch them from launcher.
2. Rotate device to landscape.
3. Force-stop the app using adb command.

After killing the app it will try to open launcher, which is fixed in
portrait mode on that device. This will update the configuration for all the
stacks, including already detached.

Bug: 28786255
Change-Id: Ia326c09cff9f1a3fb43cca5b48db29718553346a
2016-05-25 14:27:39 -07:00
Eric Schmidt
5548a7c59c Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs 2016-05-25 21:27:35 +00:00
Alan Viverette
29c01336db Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 2016-05-25 21:17:53 +00:00
Amanda Kassay
c68d8768c8 Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."
This reverts commit 85b7df2697.

Change-Id: I5c0256cbdc0f3c3588f10eb5accef8cf68642bbb
2016-05-25 17:14:08 -04:00
Alan Viverette
0d203354b9 Fix borderless colored button text color
Bug: 28962396
Change-Id: I8cd8d24c778e2174d268da7ad40e43a4cfc142eb
2016-05-25 17:10:33 -04:00
Chris Wren
698b1706be add metrics for notification and group expansion
Bug: 28146482
Change-Id: Id7f71873ba33f85c1a1f2c48b47f78d40df46c0d
2016-05-25 17:08:17 -04:00
Robin Lee
48b18f4fa9 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev 2016-05-25 21:05:55 +00:00
Zach Kuznia
a5e6601ad1 Merge "Ensure MotionEvent.split() won't be given an invalid value." into nyc-dev 2016-05-25 20:57:25 +00:00
Chris Wren
7e431621c4 boost starred people to at least high importance
Bug: 28949659
Change-Id: If604062a282db5db463642315a8fa5f7cd6e597c
2016-05-25 16:45:54 -04:00
TreeHugger Robot
dfe232c763 Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
Mady Mellor
b6f640607b Merge "Fix clipping not being activated on children in groups" into nyc-dev 2016-05-25 20:22:42 +00:00
Phil Weaver
2a7e4442bf Improve accessibility window title behavior
Suppress the default, unlocalized strings from being read as title.

Bug: 28744278
Change-Id: Iea0f7d8fed3d6428ada725cf3ffa077ba974b74a
2016-05-25 12:48:13 -07:00
Zachary Kuznia
ec1783828e Ensure MotionEvent.split() won't be given an invalid value.
b/27496784

Change-Id: I28bb4ac5bb8a705e7af9b22b2b56cd4061aa06a0
2016-05-25 12:38:58 -07:00
TreeHugger Robot
39e8022a75 Merge "Force pending transactions to flush before screenshot." into nyc-dev 2016-05-25 19:16:13 +00:00
Siyamed Sinir
f75775ea7f Fix TextView layout reuse when maxLines is set
When maxLines is set on StaticLayout and the text is wrapped, during
onMeasure TextView couldn’t recognize the wrap in the layout and tried
to reuse the layout which in turn caused width calculation problems.
This CL checks if maxLines is set, and if there is a text cut-off in
order to reuse existing layout.

Bug: 28468120
Change-Id: Ide43df8512a09112715067cbadf29cc64fd53247
2016-05-25 12:01:23 -07:00
Mady Mellor
7c17e70f2f Merge "Changes based on API council feedback for performContextClick" into nyc-dev 2016-05-25 19:00:08 +00:00