246340 Commits

Author SHA1 Message Date
Jason Monk
2b4e612b10 Merge "Fix double status bar icons" into nyc-dev 2016-08-29 18:00:02 +00:00
TreeHugger Robot
4226dcef1e Merge "Fixed a bug where notifications could reappear" into nyc-dev 2016-08-29 17:58:31 +00:00
Jason Monk
12124d7eca Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController.  Set it in the constructor to enforce
this.

Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes: 28524184
(cherry picked from commit c6fe61c59c5a3a6ae691256c9afdde3820e3dd9e)
2016-08-29 13:26:18 +00:00
Adam Powell
00c4f7ba65 Force AlertDialogLayout to have gravity start|top
AlertDialogLayout overrides LinearLayout#onMeasure but not onLayout,
meaning that some state initialized for the handling of gravity may
not be valid in LinearLayout#onLayout. As this is an internal class
never used directly by apps, explicitly specify the default gravity of
start|top in @layout/alert_dialog_material to avoid this bug. Apps
that do things like set gravity in their theme (for whatever reason)
could otherwise change its behavior.

Bug 30494039

Change-Id: I71a8be1829a7fe24cf7714a3bd5ed732f85eb887
(cherry picked from commit 39e0bf23f50a3de112b232321c5e0a1013af70c7)
2016-08-27 16:44:10 +00:00
Tao Bao
8abcfed8a4 Bump up the uncrypt timeout to 30 min.
Bug: 30490464
Change-Id: I9b65afb10134d79b2f5b5275a6d81065a04e91b9
2016-08-26 20:52:41 -07:00
Yuichi Biwa
cb3e1237b5 ChooserActivity: Cannot start app that the icon overflows the layout
Symptom:
When sharing an image from Album, ChooserActivity can be shown.
But then the app to be located to the bottom part of the list may not
be started even if user tap it.

Root cause:
ChooserActivity uses ResolverDrawerLayout. And ResolverDrawerLayout
can display only some items on the list (known as "Collapse mode").
When the item clipping along the bottom edge is tapped by the user,
ResolverDrawerLayout tries to expand the list and scroll it to a
better position, instead of starting an application.
In this problem case, ResolverDrawerLayout continues to try to expand
the list whenever tapping, so an application will never start.

Solution:
Change a condition so that mOpenOnClick becomes true only when the list
has been collapsed (mCollapseOffset > 0).

Bug: 30153542

Change-Id: I576fb6c8b6a91d79c1e0d46d069146779f4dbd17
(cherry picked from commit 4f3a843ea9b6ffe2e29e6625ffb3d87fbf143623)
2016-08-27 01:36:44 +00:00
Abodunrinwa Toki
99c340cad9 FloatingActionMode: Fix screen coordinates.
Use application context to get the screen's display metrics.

Bug: 30127070
Change-Id: I2c453c494ef210c12d89fc7e3ff026728f9ecb0f
(cherry picked from commit afb38c5cc4226ce82367015f4ce52765018226d6)
2016-08-27 01:27:28 +00:00
Alan Viverette
c328f042a6 Set up view state before attaching, jump drawables if needed
View attachment calls jumpDrawablesToCurrentState(), so the view state
needs to be set up prior to attachment. For views that are already
attached but are being moved to a new position, manually jump.

Cleans up comments in methods that were modified.

Bug: 29978498
Change-Id: Ica27b2c60ad7ee98b9d1e4912c4f8b8c248af88d
(cherry picked from commit 26489e1688633ee270ff1469d0df38c90bbdf674)
2016-08-27 01:17:22 +00:00
Selim Cinek
f3b64692a3 Fixed a bug where notifications could reappear
With sensitive notifications a user could get into
a situation where the groupsummary would not be cleared
because its dismissability was never updated and based
on the visibility of the veto button. This is now corrected.

This Cl also cleans up the veto button handling overall and
ensures that there's no stale state arond it.

Change-Id: Ic7df8d382146d7863ee551c1daa8ba5ed384c7b5
Fixes: 30056258
(cherry picked from commit 9e624e732aa5646c83d203587be9c2c4e94c9266)
2016-08-27 00:38:03 +00:00
Selim Cinek
a4155bb7c0 Fixed a bug where the headsup would be stuck disappearing
Change-Id: I56d6be69f6e59c1bec647e7e70e50a36b793f895
Fixes: 30120962
2016-08-27 00:33:49 +00:00
Raph Levien
9cde7244b6 Enforce consistent sizes for arrays in SpannableStringInternal
The grow logic in SpannableStringInternal#setSpan assumes that the
size of mSpanData is consistent with that of mSpans, in particular
that if the latter doesn't need to grow, neither does the former.
The copySpans() method didn't enforce this, creating an mSpanData
array only big enough to hold the data.

This patch documents the invariant in a comment and enforces it.

Bug: 30359314
Change-Id: Ie25db70a76836e97af8476a7f5c10cb4b976c1cf
(cherry picked from commit 83549088c643586aa6013d947ad2c21464a3878e)
2016-08-26 23:44:47 +00:00
smain@google.com
99e44c903c add a notice that Work profiles are not compatible with Instant Run
Also includes the redirect for links from the Studio UI
bug: 31098748

Change-Id: Ief7296e512ccf387d738426026413dfe19785ff7
2016-08-26 16:37:16 -07:00
Andrii Kulian
620040db3f DO NOT MERGE -- Correctly finish activity in non-focused stack
When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.

Bug: 29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
(cherry picked from commit 7318d63ba6dbb3042907d10d5369fcd5ac444d67)
2016-08-26 23:07:28 +00:00
Andrew Solovay
6f29c2091c docs: Fixing formatting problem
Fixing problem (mismatched <div> tags) that caused the page text to be
obscured. See first comment for doc stage location.

bug: 31046432
Change-Id: I82227fd29764755885458c1c011db534325fcde3
2016-08-26 13:35:03 -07:00
Dirk Dougherty
c2b9d55818 Merge "Fetch ga script over https to avoid mixed content." into nyc-dev 2016-08-26 16:22:08 +00:00
Robin Lee
0737c2b4c2 DO NOT MERGE Stop work challenge freeform bypass
Bypassing work challenge in freeform mode was trivial by just keeping
work apps open in freeform mode and then switching focus to them from
another app.

Because the only interception point is startActivity this never
triggered work challenge.

The solution is to trigger the check on focus change events and also to
allow passing the result back into the freeform stack instead of dumping
our user out into the homescreen.

Change-Id: I141ecf90b5f0e708a21d27141b6fec6074e5d475
Fix: 30693465
2016-08-26 14:39:34 +00:00
Mark Lu
314d995ca1 Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev 2016-08-26 00:46:05 +00:00
Mark Lu
3c638c1ea1 Merge "docs: fix link in Loader reference page" into nyc-dev 2016-08-26 00:46:02 +00:00
Android Build Merger (Role)
fea9feb30e Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev 2016-08-25 23:41:50 +00:00
Android Build Merger (Role)
cca29c7284 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev 2016-08-25 23:41:41 +00:00
Android Build Merger (Role)
5f5403def8 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev 2016-08-25 23:41:32 +00:00
Android Build Merger (Role)
555fbf30d2 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev 2016-08-25 23:41:20 +00:00
Android Build Merger (Role)
4ee46e5b99 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev 2016-08-25 23:41:08 +00:00
Mark Goldstein
8d660eebad Merge "docs: Fix typo" into nyc-dev 2016-08-25 23:40:43 +00:00
Sudheer Shanka
d57565864b resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25
am: 7a46fac0cd

Change-Id: Ib35ca340d72a71b8cd9ae6d850375012461977ad
2016-08-25 23:39:59 +00:00
Sudheer Shanka
02ba5ef875 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39
am: 71933abbdc  -s ours

Change-Id: I5dbd13447fe89f0fa6040b9377098fda50335ca9
2016-08-25 23:39:54 +00:00
Amith Yamasani
4a3caefd6c DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca
am: 7586e03e06  -s ours

Change-Id: I404e1cdbb507d5c48c31cd3fddc3ff5f9e1078b5
2016-08-25 23:39:49 +00:00
Sudheer Shanka
6a9490f850 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa
am: bc5775c18b  -s ours

Change-Id: Iabe2db5b615a67130bffceca1801fd5ee9749ba0
2016-08-25 23:39:41 +00:00
Amith Yamasani
b6cc1acb63 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38
am: a106b52180  -s ours

Change-Id: Ia656bceb884d47015003d6c60f54f18f2217c01b
2016-08-25 23:39:37 +00:00
Sudheer Shanka
7a46fac0cd resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3
am: 203d1bee25

Change-Id: Ib8939aceb6c23ce3273eef396a9d8fa09aa4aeb8
2016-08-25 23:30:05 +00:00
Sudheer Shanka
71933abbdc Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab
am: c35a9fed39

Change-Id: Icf80dd720b371aa3ee488f074b5c038607691b80
2016-08-25 23:30:03 +00:00
Amith Yamasani
7586e03e06 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41
am: f6361752ca

Change-Id: I09846a866cdfec673fd99d5c7574d31734335d85
2016-08-25 23:29:59 +00:00
Sudheer Shanka
bc5775c18b Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e
am: 2f664374fa

Change-Id: I08ec5c73b827a58274aaa3422bd5ca57eb67e402
2016-08-25 23:29:56 +00:00
Amith Yamasani
a106b52180 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a
am: 5eed3c9c38

Change-Id: I4470a56b330eb087ecd2f2662ad99fccbca917cf
2016-08-25 23:29:52 +00:00
Narayan Kamath
1238ffcd2c resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76
am: b0429bbad5

Change-Id: I0212348400f48551e21902938c5b42c7edb0ea9c
2016-08-25 23:29:29 +00:00
Sudheer Shanka
203d1bee25 resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c
am: 77dec89bb3

Change-Id: I1d755ef86b80f723c3fde59476e0018167fbf8b7
2016-08-25 23:22:19 +00:00
Sudheer Shanka
c35a9fed39 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4
am: 97194798ab

Change-Id: If4a1716de3d54d6a08025665cdff51edc1b2f6da
2016-08-25 23:22:14 +00:00
Amith Yamasani
f6361752ca DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e
am: 75c7391a41

Change-Id: I2646c10763640e6079e09e6fd53b9958b3aba2ea
2016-08-25 23:22:10 +00:00
Sudheer Shanka
2f664374fa Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb
am: 2490679d7e

Change-Id: I59f3ace3a9c72a6d2fe1e1bd4cadec102a8c6254
2016-08-25 23:22:04 +00:00
Amith Yamasani
5eed3c9c38 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d
am: 1d513c845a

Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06
2016-08-25 23:22:00 +00:00
Narayan Kamath
b0429bbad5 resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
am: a21569cd76

Change-Id: I502200a2a204e576944033a58ccd4be272603d5e
2016-08-25 23:21:09 +00:00
Sudheer Shanka
77dec89bb3 resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3
am: c2a760e68c

Change-Id: I2e5a3bb037921013e78b4270d843cebe239ac520
2016-08-25 23:14:09 +00:00
Sudheer Shanka
97194798ab Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours
am: 603a69ffb4

Change-Id: Ie94c3c24a3b07c26c8b363358f4df1d7366d95a2
2016-08-25 23:14:06 +00:00
Amith Yamasani
75c7391a41 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours
am: 9080d4462e

Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1
2016-08-25 23:14:04 +00:00
Sudheer Shanka
2490679d7e Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours
am: 86ac88ccdb

Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562
2016-08-25 23:14:01 +00:00
Amith Yamasani
1d513c845a DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours
am: 368ae62e9d

Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f
2016-08-25 23:13:58 +00:00
Narayan Kamath
a21569cd76 resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
am: 8f4f9e4d5e

Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4
2016-08-25 23:13:51 +00:00
Narayan Kamath
8f4f9e4d5e resolve merge conflicts of 5191225 to mnc-dev
am: 1fbc4b8624

Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71
2016-08-25 23:08:25 +00:00
Sudheer Shanka
c2a760e68c resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58
am: cdf70ba0a3

Change-Id: Ia7c597b1b96e65cce89396a6b509a796bb17bc2c
2016-08-25 23:07:56 +00:00
Sudheer Shanka
603a69ffb4 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288
am: dfc2d0a4bc  -s ours

Change-Id: Ia4a5952bc4fda5be8602708215ff1d72a5db297a
2016-08-25 23:07:53 +00:00