OSDN Git Service
Selim Cinek [Wed, 1 Jun 2016 22:45:59 +0000 (22:45 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
am:
42621023cf
* commit '
42621023cfac084b8c74fd4d362bc2c64d61674e':
Fixes a few bugs on the keyguard with font density changes
Change-Id: Ic871ddca73896db588ca8436c2aea92c50eb37aa
Felipe Leme [Wed, 1 Jun 2016 22:45:33 +0000 (22:45 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
am:
31e3b14d6a
* commit '
31e3b14d6a613934a8c44223fd77aff2ecc5c5a5':
Move DownloadsManager to permanent whitelist.
Change-Id: I2d36bc51ff244a0890824e376602f22baa0c4b7b
Jorim Jaggi [Wed, 1 Jun 2016 22:45:20 +0000 (22:45 +0000)]
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev
am:
13d534e7f2
* commit '
13d534e7f2419219e3e26e582b1f6f5ae79be408':
Don't crash activity manager when supplying invalid URI
Change-Id: Iddb17cdf953668ad8bfae6a54a5eb9141ec12ad2
Eric Schmidt [Wed, 1 Jun 2016 22:44:58 +0000 (22:44 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246 am:
51500a1c5a
am:
28ed18877b
* commit '
28ed18877bc9cc040e8cea678f7a7782426c1dc9':
docs: Fixed 'MessageStyle' typo
Change-Id: Iff30a4c4e9c9b45939d780aebe34ac74bdfb5f8d
Adrian Roos [Wed, 1 Jun 2016 22:44:44 +0000 (22:44 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev
am:
b4cd4650cf
* commit '
b4cd4650cfd634df75e9e23f9585a756823bd012':
AppError: Change "close" to "close app"
Change-Id: If2879efeaf2c3b4bd6112a22d81b59e32acbbc13
Kevin Hufnagle [Wed, 1 Jun 2016 22:26:19 +0000 (22:26 +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: Id5b9ffebcafb4035b6d330e9aae0d65a09a282e2
Julia Reynolds [Wed, 1 Jun 2016 22:24:21 +0000 (22:24 +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: Ia5b4cd5135fb78ccf98f1b05e63fafc7a04349d8
Ian Rogers [Wed, 1 Jun 2016 22:20:47 +0000 (22:20 +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: I27b594ae75430b5cb9fe3bc905461b547ba5841c
Jason Monk [Wed, 1 Jun 2016 22:20:22 +0000 (22:20 +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: I49972e1a12bf6eeec91e845550c81a7eb41a0ecc
Jason Monk [Wed, 1 Jun 2016 22:20:16 +0000 (22:20 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
am:
1ceef7c0fa
* commit '
1ceef7c0fab15af522f56ade3e08abf559622181':
QS: Followup to scroll fixes
Change-Id: I7a0a3962cd1efef365787cb25aa70b77c6b403bf
Robert Shih [Wed, 1 Jun 2016 21:53:09 +0000 (14:53 -0700)]
resolve merge conflicts of
d579be0 to nyc-dev-plus-aosp
Change-Id: Ib64df6377d95578581fd7d311aaffc3ef64dd622
Robert Greenwalt [Wed, 1 Jun 2016 19:07:45 +0000 (19:07 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am:
56bd06fc3e
am:
ce82f1c16a
* commit '
ce82f1c16a4c10e003a11020fcb3c232010c40c6':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: Id0b350da8369340a4ac538358481577b22bc73d3
Selim Cinek [Wed, 1 Jun 2016 19:03:40 +0000 (19:03 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
Vasco Brito [Wed, 1 Jun 2016 18:51:28 +0000 (18:51 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
am:
56bd06fc3e
* commit '
56bd06fc3e29290ba90b792a7f7353864cbf772a':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: I0450be79c583cd2fc27156460b32b23830fc3c68
TreeHugger Robot [Wed, 1 Jun 2016 18:49:41 +0000 (18:49 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 18:37:34 +0000 (18:37 +0000)]
Merge "Don't crash activity manager when supplying invalid URI" into nyc-dev
Eric Schmidt [Wed, 1 Jun 2016 18:25:35 +0000 (18:25 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246
am:
51500a1c5a
* commit '
51500a1c5ad6ce1bde1f8966f9835b42d9419a95':
docs: Fixed 'MessageStyle' typo
Change-Id: I87addb7b46d0985b2cbfc92e6f0f9a7d44ce8963
Eric Schmidt [Wed, 1 Jun 2016 18:16:17 +0000 (18:16 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs
am:
8ef79a9246
* commit '
8ef79a9246eba129c22e5d54654ecb85414edf22':
docs: Fixed 'MessageStyle' typo
Change-Id: Ie9bfc94d89f388763e360841ae129d214156d6d2
Robert Greenwalt [Wed, 1 Jun 2016 18:15:15 +0000 (18:15 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
Adrian Roos [Wed, 1 Jun 2016 18:14:41 +0000 (18:14 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev
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
Eric Schmidt [Wed, 1 Jun 2016 18:04:55 +0000 (18:04 +0000)]
Merge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs
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
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:26:52 +0000 (17:26 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 17:26:22 +0000 (17:26 +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: Ic765c13a476c0924d2ede278b379db86d634fa1f
Jason Monk [Wed, 1 Jun 2016 17:26:14 +0000 (17:26 +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: I361a2ad640505ec2b1f10adb31e41aea0daced4e
Jason Monk [Wed, 1 Jun 2016 17:26:06 +0000 (17:26 +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: I6bf6ddc7a8331c2e324c5ae7c065c4eb9eb9fead
Adrian Roos [Wed, 1 Jun 2016 17:25:52 +0000 (17:25 +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: I4f725f15c12a3e5f49a521564ad2be54b75b2dd2
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
Mady Mellor [Wed, 1 Jun 2016 17:06:24 +0000 (17:06 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am:
0d7dbb0f28
* commit '
0d7dbb0f282afb43ec2a6a81789379749b2ab054':
Adds alpha to dimmed backgrounds
Change-Id: Iebe58b6c0b8a1b030626e5bb581dfd2c92d17a7b
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:56:44 +0000 (16:56 +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: I34cebbce65db27304e6d3dcc2c6e0cbc0f005b03
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
Selim Cinek [Tue, 31 May 2016 22:28:28 +0000 (15:28 -0700)]
Fixes a few bugs on the keyguard with font density changes
The reinflation of the system icons was not working correctly
and all the paddings were of.
Also the affordance icons were outdated and had to be reloaded.
Change-Id: I3cf338d33a82c8be94d01561d7b7d9a37a563ad9
Fixes:
28968657
Fixes:
28672410
Dianne Hackborn [Wed, 1 Jun 2016 16:38:18 +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: I9e4ddcc64d84a8d943128d8bd8ebf158743c5549
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:33:43 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a007e877f2 -s ours
* commit '
a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: I261c5b972c2cf481fcfd2cd69ae7b4803ca8fac1
Bill Yi [Wed, 1 Jun 2016 15:33:18 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f9a6f33091 -s ours
* commit '
f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: Id0b2e17995055d8d92b2e3f0d6a81e4a41fa55cb
Bill Yi [Wed, 1 Jun 2016 15:33:02 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
072150db89 -s ours
* commit '
072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: I7c97e2bfe59959e888e22cf8b3304a51aee0a0c9
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:34 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-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:15:57 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
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:54:01 +0000 (13:54 +0000)]
Fix action mode animation on recreations - framework edition
am:
e65b3fbb63
* commit '
e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: Ic990cf5fdb98e86083ccfe54f8f3e6905aa3e375
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:09:15 +0000 (06:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia172193f8f33ba21461ea85c092248433d254780
Auto-generated-cl: translation import
Vasco Brito [Wed, 1 Jun 2016 09:50:57 +0000 (10:50 +0100)]
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
This reverts commit
9a769a482861496686a4138a0a9b612a08fce8f8, reversing
changes made to
6fb921a61b0ca6bac8002e0fdbeb521453dce408.
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:19:56 +0000 (01:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib90c671ec93583cc219bfc9bb18f199c71963f04
Auto-generated-cl: translation import
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
Andrii Kulian [Wed, 1 Jun 2016 01:20:39 +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: I0f1f9f64bcd81321f44c48cd01537749ac4727ea
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:30 +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: I41d6aac773ab5c31b700eea343d9a143934c2f6b
TreeHugger Robot [Wed, 1 Jun 2016 00:58:28 +0000 (00:58 +0000)]
Merge "media: avoid recursion when evaluating profile support" into nyc-dev
Felipe Leme [Wed, 1 Jun 2016 00:50:39 +0000 (17:50 -0700)]
Move DownloadsManager to permanent whitelist.
DownloadProvider is now based completely on JobScheduler, and deep
inside the platform we allow foreground
downloads (FLAG_WILL_BE_FOREGROUND) to run even while the device is in
doze, so it doesn't need to be temporarily whitelisted anymore.
BUG:
29056149
Change-Id: I3658bb42aeeee5d5528f91ec990d6e1bc54257b6
Hall Liu [Wed, 1 Jun 2016 00:33:45 +0000 (00:33 +0000)]
Merge "Add null check in showLockTaskToast" into nyc-dev
am:
d7007923c5
* commit '
d7007923c55994d64514706b212fa3e8c1a3b25f':
Add null check in showLockTaskToast
Change-Id: I10339eddb06dab3acd2d2d770e4b678ef0cfe2f3
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:54 +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: I264e20e2290f474636a21eb7322377e308d316c2
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
Jorim Jaggi [Tue, 31 May 2016 22:49:01 +0000 (15:49 -0700)]
Don't crash activity manager when supplying invalid URI
Change-Id: I30a058f14d5d0a09ba86fdd10312a51db7a4a9df
Fixes:
29039290
Christopher Tate [Tue, 31 May 2016 23:13:31 +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: Ia86b5f27d511bb8da2bd8982ffe35d4d2906da54
Jorim Jaggi [Tue, 31 May 2016 23:02:53 +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: I692f30718453e03570e1512adb3b6e9fbe787197
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:07 +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: Id18689de7d04ae2627ea64612fe7fd8f2ac5f445
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:21 +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: I20cfd2c9ec4c6d95d6e638aff7955324d98f1495
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:38:07 +0000 (21:38 +0000)]
Merge "Better handling of confused finish transition." into nyc-dev
am:
2fd9cd7cbb
* commit '
2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
Better handling of confused finish transition.
Change-Id: I0b43e01df97b98a7b646999999611c7aafbea33a
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:28 +0000 (21:14 +0000)]
Merge "Remove STOPSHIP" into nyc-dev
am:
1c39a112b4
* commit '
1c39a112b43e50da4e801d634e28ae7a130c0dcb':
Remove STOPSHIP
Change-Id: I15ad40f01dd8bb86f1f64af67760de2a6e1db535
Todd Kennedy [Tue, 31 May 2016 21:07:33 +0000 (21:07 +0000)]
Merge "Remove STOPSHIP" into nyc-dev
Adrian Roos [Tue, 31 May 2016 21:02:16 +0000 (14:02 -0700)]
AppError: Change "close" to "close app"
Change-Id: Ib7205e103a93c559ef2fc50921248699e9457a62
Fixes:
28813950
Adrian Roos [Tue, 31 May 2016 20:59:16 +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: Ia0835af917c5818ec90fc96691d512c98e89d7e0
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:17:07 +0000 (20:17 +0000)]
Merge "Fix multi-window enter animation" into nyc-dev
am:
0c54d2c391
* commit '
0c54d2c391b6d781fc660646e731f562bcd7037f':
Fix multi-window enter animation
Change-Id: I89b75e2ab9b8fa5a628e77ed9ebd09b70f6a2dc4
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:27 +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: Iaa2ddc8bedaad3623190e65116f0d8b85687eb78