OSDN Git Service
Kevin Hufnagle [Wed, 1 Jun 2016 18:19:48 +0000 (18:19 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185 am:
f5250c5b37
am:
b04f86acae
* commit '
b04f86acae9f5a0101e997a2dde08342c92b180f':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: Id72cdfad947a1a8d15cd190de8604f76fbf5a866
Kevin Hufnagle [Wed, 1 Jun 2016 18:10:43 +0000 (18:10 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185
am:
f5250c5b37
* commit '
f5250c5b372ce3246bdc1e67212dc1fc7ca468ad':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: I55b4b106e27d642878f8c1050c82594a21ff4574
Julia Reynolds [Wed, 1 Jun 2016 18:07:18 +0000 (18:07 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
am:
d05a7b5972
* commit '
d05a7b5972cb06f711cc8cfa66efa9f0f6d901a5':
Radio buttons belong in a radio group.
Change-Id: If12173e67797ba105ea40475e3ad9e3061d592f9
Kevin Hufnagle [Wed, 1 Jun 2016 18:02:22 +0000 (18:02 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest.
am:
d5368b8185
* commit '
d5368b81857a04879ed55be2a67f034cce4e5094':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: Ie8343e36136e7f3829bf92d7ac26488faf01b489
TreeHugger Robot [Wed, 1 Jun 2016 18:01:34 +0000 (18:01 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
Ian Rogers [Wed, 1 Jun 2016 17:54:22 +0000 (17:54 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
am:
748620e9f0
* commit '
748620e9f03dd66bfed38d91d32b35d79684173b':
Fix call to equals that could never succeed.
Change-Id: I82af33ea3b93c4017c845b1f791ebee403bffe21
TreeHugger Robot [Wed, 1 Jun 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:37:49 +0000 (17:37 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
am:
4215ae0100
* commit '
4215ae01002f1217587698d24636870ace4a50f5':
QS: Fix single expanded frame from layout
Change-Id: Id3571cce3d2b4ecd01e5ea8bf1f093e08952a757
Jason Monk [Wed, 1 Jun 2016 17:27:21 +0000 (17:27 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
am:
1ceef7c0fa
* commit '
1ceef7c0fab15af522f56ade3e08abf559622181':
QS: Followup to scroll fixes
Change-Id: I0d013329236b9c2ac1a6aa76fba20bcd7e79a4a1
Jason Monk [Wed, 1 Jun 2016 17:26:52 +0000 (17:26 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 17:20:55 +0000 (17:20 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
d579be0cf2
* commit '
d579be0cf234a35273f79676c102b8bd80e071dc':
Fix deadlock when showing subtitles MediaPlayer
Change-Id: Ib1c57040e723d534df8243ad48479e9b554a74d1
Jason Monk [Wed, 1 Jun 2016 17:20:16 +0000 (17:20 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
Robert Shih [Wed, 1 Jun 2016 17:16:59 +0000 (17:16 +0000)]
Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 17:14:59 +0000 (17:14 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
93193135b1
* commit '
93193135b184a2f1c7518d8beeff7c51b2880606':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I1eddbe894b3f4a2583973a98f3dc0d8adf8af16c
Jason Monk [Wed, 1 Jun 2016 17:14:54 +0000 (17:14 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
am:
8768f68713
* commit '
8768f687138510b90dd997e41720ad7d88637b49':
QS: Only put visible tiles in listening state
Change-Id: I437e2841841d6b54ba5c747052a885109b7e8bc4
Jason Monk [Wed, 1 Jun 2016 17:14:50 +0000 (17:14 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
am:
7b945d8d30
* commit '
7b945d8d30a6e3978b50d5952539279a71148eca':
QS: Protect against crash with no icon
Change-Id: I6e4fedcad9d788fcb2b8c803e905671bfff3f561
Adrian Roos [Wed, 1 Jun 2016 17:14:47 +0000 (17:14 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
am:
ff39d3ec2f
* commit '
ff39d3ec2fa773a50bbd069a40570767c80fd404':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I96b1992f69d94f24a63784c1c2d954b91ab9570d
Benjamin Franz [Wed, 1 Jun 2016 17:13:14 +0000 (17:13 +0000)]
Merge "Add an intent extra to force master clear" into nyc-mr1-dev
Mady Mellor [Wed, 1 Jun 2016 17:06:26 +0000 (17:06 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am:
0d7dbb0f28
* commit '
0d7dbb0f282afb43ec2a6a81789379749b2ab054':
Adds alpha to dimmed backgrounds
Change-Id: I1ae5d761387b9eb9b9eb42c1eea65275b63eed64
Brian Carlstrom [Wed, 1 Jun 2016 17:06:19 +0000 (17:06 +0000)]
Merge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:04:24 +0000 (17:04 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:04:20 +0000 (17:04 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 17:01:58 +0000 (17:01 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
fionaxu [Wed, 1 Jun 2016 16:55:51 +0000 (16:55 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev
am:
c16bc88fc9
* commit '
c16bc88fc99a6446c77d0b075f242c042bb31ded':
trim and strip html tags for load safe label name
Change-Id: Ic79f077813fcf2124fe1cbf031cb4e0770a02a51
Mady Mellor [Wed, 1 Jun 2016 16:53:49 +0000 (16:53 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
Chen Xu [Wed, 1 Jun 2016 16:47:17 +0000 (16:47 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 16:38:12 +0000 (16:38 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev
am:
438693dd6c
* commit '
438693dd6cc4e3fe2ffb336d551c0d69e9546102':
Work on issue #
28942589: Tune job scheduler
Change-Id: I8264ce4204762358ccbf893e7846434eed258a22
Julia Reynolds [Wed, 1 Jun 2016 15:37:29 +0000 (11:37 -0400)]
Radio buttons belong in a radio group.
Fix for 'multiple buttons selected at once' issue.
Change-Id: Iec54eac699886ed1c7b8afd91382ff9b5750c696
Fixes:
27698976
Ian Rogers [Mon, 30 May 2016 22:16:30 +0000 (15:16 -0700)]
Fix call to equals that could never succeed.
Caught by Error Prone.
Bug:
29045331
Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
(cherry picked from commit
edf2f5747b9adc3399b59eb478c94641b1021222)
Dianne Hackborn [Wed, 1 Jun 2016 16:27:04 +0000 (16:27 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 14:18:14 +0000 (15:18 +0100)]
PackageManager: Don't clear app profiles during system upgrades.
They don't need to be cleared and will remain valid as long as
the application itself hasn't changed.
bug:
28998083
bug:
29067239
Change-Id: I2e4a4ee1b168da81073b8e70b12918db592fe691
Bill Yi [Wed, 1 Jun 2016 15:35:03 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a007e877f2 -s ours
* commit '
a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: Ic0ab9aacb14fb341186d8c204f8595cd4087ae6a
Bill Yi [Wed, 1 Jun 2016 15:34:50 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f9a6f33091 -s ours
* commit '
f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: I19a2537c01efc8b4e47d64778d675bbed498b782
Bill Yi [Wed, 1 Jun 2016 15:34:37 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
072150db89 -s ours
* commit '
072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: Ic78cdd6faee5831d7fa1a62d3cca0c49f1e0ad1a
TreeHugger Robot [Wed, 1 Jun 2016 15:26:42 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:52 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:34 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:14 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Wed, 1 Jun 2016 15:19:26 +0000 (11:19 -0400)]
QS: Fix single expanded frame from layout
During animation it was resetting the QS expansion on layout which
made a frame of fully expanded appear.
Bug:
28008271
Change-Id: I6ac44cb918bdf53da0653332eabf0f4e96779cff
TreeHugger Robot [Wed, 1 Jun 2016 15:16:49 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:15:57 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Benjamin Franz [Thu, 26 May 2016 13:24:29 +0000 (14:24 +0100)]
Add an intent extra to force master clear
Currently, if a priv-app sends ACTION_MASTER_CLEAR, whilst
DISALLOW_FACTORY_RESET is set, the factory reset is blocked. This CL
introduces a new extra for master clear that let's the priv-app bypass
the user restriction.
Bug:
28689894
Change-Id: I4bf979a3826454e977f1abff4562f85c8d0eec4a
Jason Monk [Wed, 1 Jun 2016 14:25:01 +0000 (10:25 -0400)]
QS: Protect against crash with no icon
Change-Id: I65d594c9bf15190418d96cc6d2c426df00fed212
Fixes:
28941131
Chris Banes [Wed, 1 Jun 2016 13:53:58 +0000 (13:53 +0000)]
Fix action mode animation on recreations - framework edition
am:
e65b3fbb63
* commit '
e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: I19274b7ede1fae09deb915807c35a478caf939ee
Chris Banes [Wed, 1 Jun 2016 10:39:54 +0000 (11:39 +0100)]
Fix action mode animation on recreations - framework edition
Currently if an action mode is started in onCreate()
it will fade in. This isn't ideal though, especially
since Activities are recreated routinely with
multi-window and resizable Activities. In that instance
we fade it in on every recreate.
This CL fixes this in both the decor and toolbar action
modes to only fade in if the decor has been laid out.
BUG:
29036694
Change-Id: Iae985efcced170a0a4229124c1c132355c2aa71e
Bill Yi [Wed, 1 Jun 2016 13:15:34 +0000 (06:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e9a73431f13e4ccab446571ec51524eb5a3a165
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 13:09:15 +0000 (06:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia172193f8f33ba21461ea85c092248433d254780
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 09:01:08 +0000 (02:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I825eb779a66d54e72adca353cc52fbdeaf2921ae
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 08:51:04 +0000 (01:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I95a9ffff8b53c291bd9eb314641b310c4ca1cbad
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 08:38:57 +0000 (01:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I637f5ffcfb514015ac00e23b2a8e0c592c2958a4
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 08:19:56 +0000 (01:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib90c671ec93583cc219bfc9bb18f199c71963f04
Auto-generated-cl: translation import
Wei Wang [Wed, 1 Jun 2016 03:06:36 +0000 (03:06 +0000)]
Merge "Trigger power hints for activity launch" into nyc-mr1-dev
Kevin Hufnagle [Tue, 31 May 2016 21:56:34 +0000 (14:56 -0700)]
cherry-pick: docs: Added note that <application> at end of manifest.
After cherry picking, removed trailing whitespace at end of lines.
Bug:
28823898
Change-Id: I30d69f1877d772893965e1512455f3addb397c80
Original-Change-Id: I9d4e67c30a0e95e78a596c933c9b9d4804eb4d6a
fionaxu [Tue, 31 May 2016 21:47:14 +0000 (14:47 -0700)]
trim and strip html tags for load safe label name
Bug:
28557603
Change-Id: I30b6c1d32e97c1fb71ba83c2845c310fe3b7f579
Wei Wang [Wed, 18 May 2016 18:32:52 +0000 (11:32 -0700)]
Trigger power hints for activity launch
BUG:
28220567
Change-Id: Id2a0397efd1dd02ee50d5626edaed9e60ea6de8a
Andrii Kulian [Wed, 1 Jun 2016 01:20:50 +0000 (01:20 +0000)]
Merge "Update override config to include some changes from global config" into nyc-dev
am:
88be465ce5
* commit '
88be465ce572f84649e01744a7ec96b6346b3686':
Update override config to include some changes from global config
Change-Id: I2b15d9856f87e66ae9eb1ab6c9b84f7ac3add2ce
Dianne Hackborn [Sat, 28 May 2016 00:59:40 +0000 (17:59 -0700)]
Work on issue #
28942589: Tune job scheduler
We now have a new settings key that provides all of the existing
tuning parameters, plus some newly redone ones for dealing with
different memory levels.
Changed the minimum batching for overall jobs from 2 to 1, so
we will never get in the way of immediately scheduling jobs
when the developer asks for this. We should now be able to rely
on the doze modes to do better batching of jobs for us when it
is really important.
Also work on issue #
28981330: Excessive JobScheduler wakeup alarms.
Use a work source with scheduled alarms to blame them on the app
whose job they are being scheduled for, and add a check for whether
a job's timing constraint has been satisfied before considering it
a possible candidate for the next alarm. (If it is satisified,
the time is in the past, so we should not schedule an alarm for it.)
Finally clean up a bunch of the dumpsys output to make it easier
to understand.
Change-Id: I06cf2c1310448f47cf386f393e9b267335fabaeb
Andrii Kulian [Wed, 1 Jun 2016 01:08:36 +0000 (01:08 +0000)]
Merge "Update override config to include some changes from global config" into nyc-dev
Lajos Molnar [Wed, 1 Jun 2016 01:05:47 +0000 (01:05 +0000)]
Merge "media: avoid recursion when evaluating profile support" into nyc-dev
am:
a72a83a172
* commit '
a72a83a1724d1a2b047fdbb8ab343db6b9b4b7ae':
media: avoid recursion when evaluating profile support
Change-Id: I2ba4a9e16b1989cb05291f9db2412c61bf3e2d07
TreeHugger Robot [Wed, 1 Jun 2016 00:58:28 +0000 (00:58 +0000)]
Merge "media: avoid recursion when evaluating profile support" into nyc-dev
Hall Liu [Wed, 1 Jun 2016 00:33:39 +0000 (00:33 +0000)]
Merge "Add null check in showLockTaskToast" into nyc-dev
am:
d7007923c5
* commit '
d7007923c55994d64514706b212fa3e8c1a3b25f':
Add null check in showLockTaskToast
Change-Id: Ieba238cbc0cc0ae36ec6cab942cbe98e55600fcb
Hall Liu [Wed, 1 Jun 2016 00:25:04 +0000 (00:25 +0000)]
Merge "Add null check in showLockTaskToast" into nyc-dev
sergeyv [Wed, 1 Jun 2016 00:20:56 +0000 (00:20 +0000)]
Merge "HWUI: do nothing in case of empty layer" into nyc-dev
am:
21a608f27f
* commit '
21a608f27f1f7b9c0fcfbb982f290fed29cc1817':
HWUI: do nothing in case of empty layer
Change-Id: Iec199a2a20c9981922468c3a33065a86f818d833
Sergei Vasilinetc [Wed, 1 Jun 2016 00:15:30 +0000 (00:15 +0000)]
Merge "HWUI: do nothing in case of empty layer" into nyc-dev
Lajos Molnar [Tue, 31 May 2016 23:02:57 +0000 (16:02 -0700)]
media: avoid recursion when evaluating profile support
Bug:
28671284
Bug:
29041205
Change-Id: Ia9b3596a122bd5ba554a4b4ede875ebcadc67b67
Christopher Tate [Tue, 31 May 2016 23:13:20 +0000 (23:13 +0000)]
Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev
am:
cd0aa9cda8
* commit '
cd0aa9cda8e57c224b473198a345fb008fe30b5a':
Don't bother with WeakHashMap for direct alarm bookkeeping
Change-Id: I3b28a8c03cee7fe6f85540f1f679de10de09923c
Jorim Jaggi [Tue, 31 May 2016 23:02:23 +0000 (23:02 +0000)]
Merge "Enforce background fallback to be non-translucent" into nyc-dev
am:
a35724f666
* commit '
a35724f6667e80abc5e6b45e75d7000d3fb17267':
Enforce background fallback to be non-translucent
Change-Id: If68ead500309566e66230b079f71667e0d555be0
Chris Tate [Tue, 31 May 2016 22:59:24 +0000 (22:59 +0000)]
Merge "Don't bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev
Hall Liu [Tue, 31 May 2016 22:50:48 +0000 (15:50 -0700)]
Add null check in showLockTaskToast
Bug:
29056498
Change-Id: Ic4333ec4f43e3c2916a4963b5ddf9e6ad10136ed
Jorim Jaggi [Tue, 31 May 2016 22:50:08 +0000 (22:50 +0000)]
Merge "Enforce background fallback to be non-translucent" into nyc-dev
Christopher Tate [Tue, 31 May 2016 22:08:04 +0000 (15:08 -0700)]
Don't bother with WeakHashMap for direct alarm bookkeeping
Call cancel() explicitly before dropping local references to your
callback objects; they won't just quietly go away.
Bug
28987260
Change-Id: Id9da66ed86a46b4fb38127e2ddd7a7d84fd2313a
Steve McKay [Tue, 31 May 2016 22:10:08 +0000 (22:10 +0000)]
Merge "Don\'t assert on uris with stack." into nyc-dev
am:
760b557158
* commit '
760b5571582056e756d9fb1bc366247bc26a8e54':
Don't assert on uris with stack.
Change-Id: I888984060b578ecff9dfefc70e6adacafe49e14c
TreeHugger Robot [Tue, 31 May 2016 22:03:27 +0000 (22:03 +0000)]
Merge "Don't assert on uris with stack." into nyc-dev
Joe Onorato [Tue, 31 May 2016 21:50:18 +0000 (21:50 +0000)]
Merge "Turn this wtf into just a log." into nyc-dev
am:
1755dd08cb
* commit '
1755dd08cbcdd2ffb14ac2eb84edc663843ced24':
Turn this wtf into just a log.
Change-Id: I6e4a129e2ba7ea6d23e5d3a07b120278a373ed10
TreeHugger Robot [Tue, 31 May 2016 21:42:45 +0000 (21:42 +0000)]
Merge "Turn this wtf into just a log." into nyc-dev
George Mount [Tue, 31 May 2016 21:37:51 +0000 (21:37 +0000)]
Merge "Better handling of confused finish transition." into nyc-dev
am:
2fd9cd7cbb
* commit '
2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
Better handling of confused finish transition.
Change-Id: I27914d6161ab68ce236b9d15e5d07c71889edb4e
TreeHugger Robot [Tue, 31 May 2016 21:31:28 +0000 (21:31 +0000)]
Merge "Better handling of confused finish transition." into nyc-dev
sergeyv [Tue, 31 May 2016 21:18:02 +0000 (14:18 -0700)]
HWUI: do nothing in case of empty layer
bug:
28862058
Change-Id: I8e09a5c33d0eb00a829be4df706dab49cad48b1e
Todd Kennedy [Tue, 31 May 2016 21:14:37 +0000 (21:14 +0000)]
Merge "Remove STOPSHIP" into nyc-dev
am:
1c39a112b4
* commit '
1c39a112b43e50da4e801d634e28ae7a130c0dcb':
Remove STOPSHIP
Change-Id: Icc176dca4735f3b03c8e1b47015792ecc202d398
Todd Kennedy [Tue, 31 May 2016 21:07:33 +0000 (21:07 +0000)]
Merge "Remove STOPSHIP" into nyc-dev
Sharvil Nanavati [Tue, 31 May 2016 21:03:45 +0000 (21:03 +0000)]
Merge "Clean up Bluetooth test code." into nyc-mr1-dev
Adrian Roos [Tue, 31 May 2016 20:59:07 +0000 (20:59 +0000)]
Merge "Fix crash with intent-less actions" into nyc-dev
am:
ac2b44f502
* commit '
ac2b44f5021f6d863c37167b26fe7dfba9bc4c6f':
Fix crash with intent-less actions
Change-Id: Ifa3e489a206c04b43d9747bd260156e346111d3e
Adrian Roos [Tue, 31 May 2016 20:51:49 +0000 (20:51 +0000)]
Merge "Fix crash with intent-less actions" into nyc-dev
Steve McKay [Tue, 31 May 2016 17:54:23 +0000 (10:54 -0700)]
Don't assert on uris with stack.
This is legal arrangement when viewing Archives.
Bug:
28923366
Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
(cherry picked from commit
a379fad3b9b9e708e9211f7c026ddd13572fc16e)
Jorim Jaggi [Tue, 31 May 2016 20:16:13 +0000 (20:16 +0000)]
Merge "Fix multi-window enter animation" into nyc-dev
am:
0c54d2c391
* commit '
0c54d2c391b6d781fc660646e731f562bcd7037f':
Fix multi-window enter animation
Change-Id: I85cb5a7ee1ce17e21bb52052c77352e065354734
Andrii Kulian [Sat, 28 May 2016 00:30:16 +0000 (17:30 -0700)]
Update override config to include some changes from global config
In override config for task we set Configuration#screenLayout field based on
initial global config + shrink to fit the area on screen given for this task.
However this field also contains information (like layout direction) that we
do not intend to override and it can be changed in global config separately.
In this case we need to update the override config with changes from global
config.
Bug:
28616488
Change-Id: I22673257621b3f9ae7933b37bd0fb9446c6042ea
Jorim Jaggi [Tue, 31 May 2016 20:08:49 +0000 (20:08 +0000)]
Merge "Fix multi-window enter animation" into nyc-dev
Jorim Jaggi [Wed, 25 May 2016 23:41:49 +0000 (16:41 -0700)]
Enforce background fallback to be non-translucent
To avoid screen garbage or wallpaper shining through, the background
we use there for filling the whole needs to
a) Be non-translucent in all cases except if the window is translucent.
b) Don't infer it from the theme as it might be unexpected. Don't define
it in the theme, and use black if it's not defined.
Bug:
28763785
Change-Id: Ifb724b5c5feea3ed70d68e5bd7615fa91185e743
George Mount [Tue, 31 May 2016 19:58:52 +0000 (12:58 -0700)]
Better handling of confused finish transition.
Bug
28347277
When an activity calls startActivity with makeSceneTransitionAnimation
and then calls finishAfterTransition, it should not do any transition
and just finish.
Change-Id: I00e537638fa6f24c95605f09bbafd843b569bb4d
Jason Monk [Tue, 31 May 2016 19:40:58 +0000 (15:40 -0400)]
QS: Only put visible tiles in listening state
- Make it so the QSPanel doesn't listen until expansion starts
- Push listening state through the TileLayout
- Make PagedTileLayout only listen for visible pages
- Push setListening onto background thread
Change-Id: Id7c008c9447f9a5dac69469fef72bc580f423b0c
Fixes:
28962155
Selim Cinek [Tue, 31 May 2016 19:36:21 +0000 (19:36 +0000)]
Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev
am:
ddc6de1eda
* commit '
ddc6de1eda495790e6564438994df5d49ddf248f':
Fixed a few accessibility issues with notifications and groups
Change-Id: Ieec9526a2c54edd2f0d3b34973cc61f610f452ae
Selim Cinek [Tue, 31 May 2016 19:26:14 +0000 (19:26 +0000)]
Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev
Yigit Boyar [Tue, 31 May 2016 19:26:09 +0000 (19:26 +0000)]
Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev
am:
bb039d2f17
* commit '
bb039d2f17d61b96c88d2cae445a53a642fb421f':
Invalidate child bounds when AbsListView bounds change
Change-Id: I204f80216fb0594b7c7cb6070add58e91003b7a7
Yigit Boyar [Tue, 31 May 2016 19:20:19 +0000 (19:20 +0000)]
Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev
sreevanis [Tue, 31 May 2016 18:50:20 +0000 (18:50 +0000)]
Updated image sizes and wrapped text around images. am:
1ce2279423 am:
2cbac3c122
am:
9801a9269c
* commit '
9801a9269c6fcdc9996fb752b2421eb409fc3b09':
Updated image sizes and wrapped text around images.
Change-Id: I82a1e05d0c1da0560dff4199c36ce75f094064a0
sreevanis [Tue, 31 May 2016 18:45:36 +0000 (18:45 +0000)]
Updated image sizes and wrapped text around images. am:
1ce2279423
am:
2cbac3c122
* commit '
2cbac3c122e1114f72ef44c3e62c8ec7c372db94':
Updated image sizes and wrapped text around images.
Change-Id: Ie0df8af83058bf81a71f6fb75cb71b453ad9f47e
Christopher Tate [Tue, 31 May 2016 18:42:03 +0000 (18:42 +0000)]
Merge "Build JobStatus objects outside the lock" into nyc-dev
am:
87ad1fce25
* commit '
87ad1fce254bdb398c5a33753f0368a596fd81f0':
Build JobStatus objects outside the lock
Change-Id: I91f11f9de40e5d8cfa8c5619796dedd56c490eb5
sreevanis [Tue, 31 May 2016 18:39:38 +0000 (18:39 +0000)]
Updated image sizes and wrapped text around images.
am:
1ce2279423
* commit '
1ce2279423a544d431bf6b64f2bfeb1a4617120b':
Updated image sizes and wrapped text around images.
Change-Id: I61e1bb43a0b32ca80e0875e375c746fc930c85cb
Chris Tate [Tue, 31 May 2016 18:36:48 +0000 (18:36 +0000)]
Merge "Build JobStatus objects outside the lock" into nyc-dev
sreevanis [Thu, 19 May 2016 21:15:14 +0000 (14:15 -0700)]
Updated image sizes and wrapped text around images.
Fixed messagingstyle link in api-overview page.
Bug:
28864173
Change-Id: I2e1a6036010b2e3aea8104e51e37a1697906691c
OSDN Git Service
