OSDN Git Service
Android Build Merger (Role) [Wed, 1 Jun 2016 17:38:23 +0000 (17:38 +0000)]
Merge "Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f am:
adc3f1ec2b" into nyc-mr1-dev-plus-aosp
Adrian Roos [Wed, 1 Jun 2016 17:37:25 +0000 (17:37 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f
am:
adc3f1ec2b
* commit '
adc3f1ec2b8b85d1b3ced34e424e1b091f937b03':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I68a1cc476055a7fe28cb9f5157dfc0362de7c9bd
Brian Carlstrom [Wed, 1 Jun 2016 17:34:51 +0000 (17:34 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
93193135b1
am:
41846b0612
* commit '
41846b061226af72eaffbdea4dc44fa2bbd087b1':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I524bf5934835d10d42dec63bacd52cd1bacda96d
Jason Monk [Wed, 1 Jun 2016 17:34:33 +0000 (17:34 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev am:
8768f68713
am:
e696c8465b
* commit '
e696c8465b599fdbc560ec18a7497f90d0a3efbe':
QS: Only put visible tiles in listening state
Change-Id: If91dcf13524c6d63cf99946639163c45bae15739
Jason Monk [Wed, 1 Jun 2016 17:34:18 +0000 (17:34 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev am:
7b945d8d30
am:
a58c1a52ac
* commit '
a58c1a52ac44a53175475f78cea074583ed5e177':
QS: Protect against crash with no icon
Change-Id: I20c0c15d3e7358f056198280d8d9c2b0d9ca4115
Adrian Roos [Wed, 1 Jun 2016 17:34:05 +0000 (17:34 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f
am:
72bc1299f2
* commit '
72bc1299f2020c4acd51defed6da430d61edc5fa':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: Ifcba6fe03700c39b9777c3c08ffa1c4bf4873dd7
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
Android Build Merger (Role) [Wed, 1 Jun 2016 17:22:32 +0000 (17:22 +0000)]
Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28 am:
c123c0b4d0" into nyc-mr1-dev-plus-aosp
Mady Mellor [Wed, 1 Jun 2016 17:21:58 +0000 (17:21 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28
am:
c123c0b4d0
* commit '
c123c0b4d02e948757e825e4f8249391afd45e3f':
Change-Id: I6c21ac599c286db2f84a399a61613d2d7d6ca16a
Benjamin Franz [Wed, 1 Jun 2016 17:20:43 +0000 (17:20 +0000)]
Merge "Add an intent extra to force master clear" into nyc-mr1-dev
am:
3c826b160c
* commit '
3c826b160c724d38f49bb479aa13ab8cf685e2d2':
Add an intent extra to force master clear
Change-Id: I5789ac49b040ba6b1330e9680c1a595f24e82af9
Android Build Merger (Role) [Wed, 1 Jun 2016 17:14:58 +0000 (17:14 +0000)]
Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28 am:
8c475d5b0a" into nyc-mr1-dev-plus-aosp
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
Mady Mellor [Wed, 1 Jun 2016 17:14:27 +0000 (17:14 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28
am:
8c475d5b0a
* commit '
8c475d5b0a18705aa8e76a1efa01b6860fc8ceae':
Adds alpha to dimmed backgrounds
Change-Id: Id58651cfd6bf2be8e47c7d59bce96779cb1539f5
Android Build Merger (Role) [Wed, 1 Jun 2016 17:14:19 +0000 (17:14 +0000)]
Merge "Merge "trim and strip html tags for load safe label name" into nyc-dev am:
c16bc88fc9 am:
30680c6506" into nyc-mr1-dev-plus-aosp
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
Chen Xu [Wed, 1 Jun 2016 17:12:16 +0000 (17:12 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev am:
c16bc88fc9
am:
30680c6506
* commit '
30680c65061777a6eaa4a19e195567765bdb6b6d':
trim and strip html tags for load safe label name
Change-Id: I13347f68eba49563974e5067eb9997b20ac0b5cd
Chen Xu [Wed, 1 Jun 2016 17:06:41 +0000 (17:06 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev am:
c16bc88fc9
am:
36befb2dbc
* commit '
36befb2dbce9b05ce1cf26ee9aef5c268d6c7266':
trim and strip html tags for load safe label name
Change-Id: I630902aad16a71485506628625bb3b9c09b992f6
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
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
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
Android Build Merger (Role) [Wed, 1 Jun 2016 16:46:17 +0000 (16:46 +0000)]
Merge "Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev am:
438693dd6c am:
0e443c1320" into nyc-mr1-dev-plus-aosp
Dianne Hackborn [Wed, 1 Jun 2016 16:45:46 +0000 (16:45 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev am:
438693dd6c
am:
0e443c1320
* commit '
0e443c132092fc028227297aa71ed4a35729c71c':
Work on issue #
28942589: Tune job scheduler
Change-Id: I14cf39b73d09b3dccc6b3a5ed08d38f8a7d536ba
Dianne Hackborn [Wed, 1 Jun 2016 16:45:40 +0000 (16:45 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev am:
438693dd6c
am:
576430f36a
* commit '
576430f36ac04843fed5697ecae1716489c164bb':
Work on issue #
28942589: Tune job scheduler
Change-Id: I101010ff1d7d88c2ccac14d095df7722569cf549
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
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
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:49:29 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
a007e877f2 -s ours
am:
ed0e749092 -s ours
* commit '
ed0e749092e8d8303876738b159278c8f226fc55':
Change-Id: I71989db7e276e5e4f735725fbb250d6aea764b56
Bill Yi [Wed, 1 Jun 2016 15:49:25 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
f9a6f33091 -s ours
am:
54fd6701ca -s ours
* commit '
54fd6701caea2f9471b7fd16e93ab5fe0d75da2d':
Change-Id: I8cc20393d26a06a25aa565241b31099b782d026e
Bill Yi [Wed, 1 Jun 2016 15:49:22 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
072150db89 -s ours
am:
725ce2bc3f -s ours
* commit '
725ce2bc3fcda86c08725e5cb3696e1a5adbc179':
Change-Id: I964c896985a493ac3cd2c2829ab406514b63424e
Bill Yi [Wed, 1 Jun 2016 15:41:04 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
a007e877f2 -s ours
am:
652af4f813 -s ours
* commit '
652af4f8133741752ed3146b7408144b28c45eff':
Import translations. DO NOT MERGE
Change-Id: I7346c446e942b1f57f97d5341cca64f43f2e6489
Bill Yi [Wed, 1 Jun 2016 15:41:02 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
f9a6f33091 -s ours
am:
e316fc0577 -s ours
* commit '
e316fc0577a1a4f8cd08c50b5c2e56d866a13983':
Import translations. DO NOT MERGE
Change-Id: Ide5118c04f66f5c20ca474cc83c2eb9da3a8ddd1
Bill Yi [Wed, 1 Jun 2016 15:40:59 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
072150db89 -s ours
am:
998797a27d -s ours
* commit '
998797a27d026a0b79dc1fd1fcb6004a35799228':
Import translations. DO NOT MERGE
Change-Id: Ida92a6743226c1c95cd8531012a3c953a0c0a7bd
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
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
Bill Yi [Wed, 1 Jun 2016 15:32:47 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
561ae1baca -s ours
* commit '
561ae1bacaf1cf0c282363e97dc006d41ee19cb5':
Import translations. DO NOT MERGE
Change-Id: Ib2531d234f02ecfef5405028ef50f39c4265bc90
Bill Yi [Wed, 1 Jun 2016 15:32:40 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
713e725b1e -s ours
* commit '
713e725b1ed378711aadaff5173bd6c93d9aff76':
Import translations. DO NOT MERGE
Change-Id: I7e206b75f8385f639b5a4d6ab8e8a118f2448d2d
Bill Yi [Wed, 1 Jun 2016 15:32:34 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
8c228d05e3 -s ours
* commit '
8c228d05e3b050c82a3e7bd69799d6dafad5e0e9':
Import translations. DO NOT MERGE
Change-Id: Id4d7363ff2a4d43388f8c8bb2b6e117cee373a66
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
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
Android Build Merger (Role) [Wed, 1 Jun 2016 13:58:55 +0000 (13:58 +0000)]
Merge "Fix action mode animation on recreations - framework edition am:
e65b3fbb63 am:
9269e2272b" into nyc-mr1-dev-plus-aosp
Chris Banes [Wed, 1 Jun 2016 13:58:28 +0000 (13:58 +0000)]
Fix action mode animation on recreations - framework edition am:
e65b3fbb63
am:
9269e2272b
* commit '
9269e2272bea8b4c6ca80c3e20872de75dd4c876':
Fix action mode animation on recreations - framework edition
Change-Id: I40309a35d76dd1da34e91b0ab7a2e756956fbdf8
Chris Banes [Wed, 1 Jun 2016 13:58:25 +0000 (13:58 +0000)]
Fix action mode animation on recreations - framework edition am:
e65b3fbb63
am:
b4acd653e6
* commit '
b4acd653e6f554d33b838b3dd1de643d7997956d':
Fix action mode animation on recreations - framework edition
Change-Id: I90681c1028df89dc10f7e79068b5936685bdf83c
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 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:14:27 +0000 (03:14 +0000)]
Merge "Trigger power hints for activity launch" into nyc-mr1-dev
am:
2ab4ac3835
* commit '
2ab4ac38350b51c239fe564bc89727b201036205':
Trigger power hints for activity launch
Change-Id: I2c16d792bfa2617bb8120529f204d50fc817bab0
Wei Wang [Wed, 1 Jun 2016 03:06:36 +0000 (03:06 +0000)]
Merge "Trigger power hints for activity launch" into nyc-mr1-dev
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
Android Build Merger (Role) [Wed, 1 Jun 2016 01:28:01 +0000 (01:28 +0000)]
Merge "Merge "Update override config to include some changes from global config" into nyc-dev am:
88be465ce5 am:
a0668c7442" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Wed, 1 Jun 2016 01:27:32 +0000 (01:27 +0000)]
Merge "Update override config to include some changes from global config" into nyc-dev am:
88be465ce5
am:
a0668c7442
* commit '
a0668c7442ed2f66323c4ae798b5b39c1ab7cd52':
Update override config to include some changes from global config
Change-Id: Ifca4309410e0ab8813e32787daca658f493ac03c
Andrii Kulian [Wed, 1 Jun 2016 01:27:28 +0000 (01:27 +0000)]
Merge "Update override config to include some changes from global config" into nyc-dev am:
88be465ce5
am:
ae01e27755
* commit '
ae01e27755107d437bc92b1f994932c860453453':
Update override config to include some changes from global config
Change-Id: Ie6459b34e31ea7a5a7aff40b71db0157e2fe014f
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
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
Android Build Merger (Role) [Wed, 1 Jun 2016 01:15:53 +0000 (01:15 +0000)]
Merge "Merge "media: avoid recursion when evaluating profile support" into nyc-dev am:
a72a83a172 am:
c4da6b9962" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Wed, 1 Jun 2016 01:15:22 +0000 (01:15 +0000)]
Merge "media: avoid recursion when evaluating profile support" into nyc-dev am:
a72a83a172
am:
c4da6b9962
* commit '
c4da6b99626df7d16ccd28967a4af9ccd4541e21':
media: avoid recursion when evaluating profile support
Change-Id: I2d4105e27d4842c54015b8e51769a459eb7c4d1f
Lajos Molnar [Wed, 1 Jun 2016 01:15:06 +0000 (01:15 +0000)]
Merge "media: avoid recursion when evaluating profile support" into nyc-dev am:
a72a83a172
am:
bf3d1fc245
* commit '
bf3d1fc24527d521c2538e4266dcb48a17bca422':
media: avoid recursion when evaluating profile support
Change-Id: I31256b6fa3cceaafe814b0a502723a74ccf61b2a
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
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
Android Build Merger (Role) [Wed, 1 Jun 2016 00:43:09 +0000 (00:43 +0000)]
Merge "Merge "HWUI: do nothing in case of empty layer" into nyc-dev am:
21a608f27f am:
561df62a52" into nyc-mr1-dev-plus-aosp
Sergei Vasilinetc [Wed, 1 Jun 2016 00:42:32 +0000 (00:42 +0000)]
Merge "HWUI: do nothing in case of empty layer" into nyc-dev am:
21a608f27f
am:
561df62a52
* commit '
561df62a523fdc78616db66b6f24ac7b10f57eb9':
Add null check in showLockTaskToast
Change-Id: I5d7b851dbee2de45e9f0b184e3f5eb1722707946
Hall Liu [Wed, 1 Jun 2016 00:40:18 +0000 (00:40 +0000)]
Merge "Add null check in showLockTaskToast" into nyc-dev am:
d7007923c5
am:
1f1f29ece6
* commit '
1f1f29ece6f93b53cb44140b271927c198615113':
Add null check in showLockTaskToast
Change-Id: I4398b476dfd86c807a452b09b789214b44e7ccdd
Android Build Merger (Role) [Wed, 1 Jun 2016 00:35:08 +0000 (00:35 +0000)]
Merge "Merge "HWUI: do nothing in case of empty layer" into nyc-dev am:
21a608f27f am:
c4d91f0bbf" into nyc-mr1-dev-plus-aosp
Sergei Vasilinetc [Wed, 1 Jun 2016 00:34:12 +0000 (00:34 +0000)]
Merge "HWUI: do nothing in case of empty layer" into nyc-dev am:
21a608f27f
am:
c4d91f0bbf
* commit '
c4d91f0bbf9b3e85e227baf0d987ba904eefbf31':
HWUI: do nothing in case of empty layer
Change-Id: I9e5504e9c1d57649e2d5ee1e4d02a451564b8d3c
Sergei Vasilinetc [Wed, 1 Jun 2016 00:34:04 +0000 (00:34 +0000)]
Merge "HWUI: do nothing in case of empty layer" into nyc-dev am:
21a608f27f
am:
6544a0e2e2
* commit '
6544a0e2e255b676770d64fa89f4f616a7021e63':
HWUI: do nothing in case of empty layer
Change-Id: I4bfc8c0210ec97a21fd4ee4cb5ea698324c309f2
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: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
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
OSDN Git Service
