OSDN Git Service
Chris Wren [Thu, 2 Jun 2016 21:04:35 +0000 (17:04 -0400)]
resolve merge conflicts of
18455a9 to master
Change-Id: I06da8fa1601633baad82be50ae881462d33ff27e
TreeHugger Robot [Thu, 2 Jun 2016 20:49:07 +0000 (20:49 +0000)]
Merge "sysui: refactor for extensibility."
Chris Wren [Thu, 2 Jun 2016 20:35:27 +0000 (20:35 +0000)]
Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev
am:
cf665232f3
* commit '
cf665232f332faa4d3c0c6247c6e5685684a1b2a':
Give the auto-merger somthing to hang on to.
Change-Id: I7ee4ae7df89504ab53eb2829ca90243baa2aef65
Chris Wren [Thu, 2 Jun 2016 20:28:30 +0000 (20:28 +0000)]
Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev
Jorim Jaggi [Thu, 2 Jun 2016 19:58:55 +0000 (19:58 +0000)]
Merge "Merge "Also update setMinLines" into nyc-dev am:
79c0b2bcbb am:
93ef31f1ca" into nyc-mr1-dev-plus-aosp
am:
036f8ac188
* commit '
036f8ac188249586b265c08f31f8d22bb6449e3f':
Change-Id: I2b63c7228247ee76b7832005771fc4bc853f08e1
Jorim Jaggi [Thu, 2 Jun 2016 19:58:51 +0000 (19:58 +0000)]
Merge "Also update setMinLines" into nyc-dev am:
79c0b2bcbb am:
8524697351
am:
6379e87d06
* commit '
6379e87d06ccf741b0328bed57b67b1b52fa66cc':
Also update setMinLines
Change-Id: Ibe15ee4c83b5e51a71e49179d4428f28e2e89725
Julia Reynolds [Thu, 2 Jun 2016 19:53:08 +0000 (19:53 +0000)]
Merge "Merge "Fix leak on density change." into nyc-dev am:
a31ac7ddfb am:
db3744969e" into nyc-mr1-dev-plus-aosp
am:
754ac1b4dd
* commit '
754ac1b4ddd224fc66f0feaf0c711eb7f7e5b83b':
Change-Id: I76be44aee6148c7e0dd50524df3a4a7ea38f3b24
Android Build Merger (Role) [Thu, 2 Jun 2016 19:53:06 +0000 (19:53 +0000)]
Merge "Merge "Also update setMinLines" into nyc-dev am:
79c0b2bcbb am:
93ef31f1ca" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 2 Jun 2016 19:52:59 +0000 (19:52 +0000)]
Merge "Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am:
62716a9197 am:
48347048ba" into nyc-mr1-dev-plus-aosp
am:
cd188b6a6f
* commit '
cd188b6a6f9c94881b2de131f1a28143a83baaae':
Change-Id: I867d069877dbda3f022c2575adbfb7624ffbebdf
Julia Reynolds [Thu, 2 Jun 2016 19:52:43 +0000 (19:52 +0000)]
Merge "Fix leak on density change." into nyc-dev am:
a31ac7ddfb am:
f584b1d96d
am:
98d4456187
* commit '
98d44561879bdc0c92ea03ce71a358217e43e377':
Fix leak on density change.
Change-Id: Ic727a3c28d6e965bb0a79e667a6487f40aafc28f
Jorim Jaggi [Thu, 2 Jun 2016 19:52:28 +0000 (19:52 +0000)]
Merge "Also update setMinLines" into nyc-dev am:
79c0b2bcbb
am:
93ef31f1ca
* commit '
93ef31f1ca85cea95457af3eb6b9dc0bdbb0f9fd':
Also update setMinLines
Change-Id: Ib75ddd419cbbbd2eebfbd434e294b474fde3e76c
Julia Reynolds [Thu, 2 Jun 2016 19:52:23 +0000 (19:52 +0000)]
Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am:
62716a9197 am:
9548013287
am:
30721fb490
* commit '
30721fb4905a5743896134274ee83766c2dcc363':
Hide alarm condition if there's no alarm.
Change-Id: Ib5584c9bdc2648ea69917511b7cdc4b9e455f7da
Jorim Jaggi [Thu, 2 Jun 2016 19:52:09 +0000 (19:52 +0000)]
Merge "Also update setMinLines" into nyc-dev am:
79c0b2bcbb
am:
8524697351
* commit '
8524697351bb034c56bce99b6503225ca121fc71':
Also update setMinLines
Change-Id: I0dff24ca60c040bc003ccae9b0111a1e437ce255
Jorim Jaggi [Thu, 2 Jun 2016 19:45:17 +0000 (19:45 +0000)]
Merge "Also update setMinLines" into nyc-dev
am:
79c0b2bcbb
* commit '
79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
Also update setMinLines
Change-Id: Iae144dc953cc9e67225ebad2b2e7be777808d1eb
Jorim Jaggi [Thu, 2 Jun 2016 19:45:09 +0000 (19:45 +0000)]
Merge "Also update setMinLines" into nyc-dev
am:
79c0b2bcbb
* commit '
79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
Also update setMinLines
Change-Id: I34792f349b421e20849ad1db2a28d2751c994189
Jason Monk [Thu, 2 Jun 2016 19:44:16 +0000 (19:44 +0000)]
Merge "QS: Only put visible tiles in listening state"
Android Build Merger (Role) [Thu, 2 Jun 2016 19:40:47 +0000 (19:40 +0000)]
Merge "Merge "Fix leak on density change." into nyc-dev am:
a31ac7ddfb am:
db3744969e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Jun 2016 19:40:33 +0000 (19:40 +0000)]
Merge "Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am:
62716a9197 am:
48347048ba" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 2 Jun 2016 19:39:56 +0000 (19:39 +0000)]
Merge "Fix leak on density change." into nyc-dev am:
a31ac7ddfb
am:
db3744969e
* commit '
db3744969e241276ff02c58f9fefc8efb85c2c7d':
Fix leak on density change.
Change-Id: I0c2cdc6d46a14c4788405cb3f9f7af09eeed85ea
Julia Reynolds [Thu, 2 Jun 2016 19:39:30 +0000 (19:39 +0000)]
Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am:
62716a9197
am:
48347048ba
* commit '
48347048bade66799525391ca3bcfb42f95243a7':
Hide alarm condition if there's no alarm.
Change-Id: I5613d6377b97aa35c6427730da8df643780017f5
Julia Reynolds [Thu, 2 Jun 2016 19:39:14 +0000 (19:39 +0000)]
Merge "Fix leak on density change." into nyc-dev am:
a31ac7ddfb
am:
f584b1d96d
* commit '
f584b1d96d2d114d57f5c87e9c517b7929854d53':
Fix leak on density change.
Change-Id: I268a0c2d4096ad7d28c31964c560da88be43b44a
Julia Reynolds [Thu, 2 Jun 2016 19:38:59 +0000 (19:38 +0000)]
Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am:
62716a9197
am:
9548013287
* commit '
9548013287f8345177e106cb79bc8c6d621457bd':
Hide alarm condition if there's no alarm.
Change-Id: Ied3c40add25a0ffa8e766a820e64498e189a7df5
Jorim Jaggi [Thu, 2 Jun 2016 19:34:56 +0000 (19:34 +0000)]
Merge "Also update setMinLines" into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 19:31:11 +0000 (19:31 +0000)]
Merge "Fix leak on density change." into nyc-dev
am:
a31ac7ddfb
* commit '
a31ac7ddfbccdb602aebb05686fcdb582ba74752':
Fix leak on density change.
Change-Id: I8c474e29100543668a2348baca5f34b868cf8893
Julia Reynolds [Thu, 2 Jun 2016 19:30:58 +0000 (19:30 +0000)]
Merge "Fix leak on density change." into nyc-dev
am:
a31ac7ddfb
* commit '
a31ac7ddfbccdb602aebb05686fcdb582ba74752':
Fix leak on density change.
Change-Id: I4158711144354eb7059d6b421ed35d6673b63a5b
Julia Reynolds [Thu, 2 Jun 2016 19:30:52 +0000 (19:30 +0000)]
Merge "Hide alarm condition if there\'s no alarm." into nyc-dev
am:
62716a9197
* commit '
62716a9197ba77b349d74770e6cd3b114e5f5de7':
Hide alarm condition if there's no alarm.
Change-Id: Ib6c339aa3d00639fcad3bc15791787a52010a84f
Julia Reynolds [Thu, 2 Jun 2016 19:30:50 +0000 (19:30 +0000)]
Merge "Hide alarm condition if there\'s no alarm." into nyc-dev
am:
62716a9197
* commit '
62716a9197ba77b349d74770e6cd3b114e5f5de7':
Hide alarm condition if there's no alarm.
Change-Id: I16ff49b128224db3972335fd1f4b0aee9a06fcb8
TreeHugger Robot [Thu, 2 Jun 2016 19:24:15 +0000 (19:24 +0000)]
Merge "Fix leak on density change." into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 19:22:35 +0000 (19:22 +0000)]
Merge "Hide alarm condition if there's no alarm." into nyc-dev
Muyuan Li [Wed, 1 Jun 2016 18:05:08 +0000 (11:05 -0700)]
sysui: refactor for extensibility.
Refactor the test whether touch point is inside
QsContainer into a separate method.
Make mScrollingEnabled protected.
Bug:
28942125
Change-Id: I21a620bbad12c25fedfa5a1139221bd4cb2e95fe
(cherry picked from commit
cc10182c291d3e559382ddd181b69c1e89e5ec8e)
Chris Wren [Thu, 2 Jun 2016 19:11:48 +0000 (15:11 -0400)]
Give the auto-merger somthing to hang on to.
Bug:
29001173
Change-Id: Ie244f79f1569e2b32be4046d111919120ce6111e
Dianne Hackborn [Thu, 2 Jun 2016 19:04:02 +0000 (19:04 +0000)]
Merge "Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev am:
5a6cf3ac9a am:
340f22fcc6" into nyc-mr1-dev-plus-aosp
am:
b508d38074
* commit '
b508d380748c085858132ceda017fa946638fee2':
Change-Id: I64c67b04f75de07b5574330ce631de3e1f2567d9
Dianne Hackborn [Thu, 2 Jun 2016 19:03:55 +0000 (19:03 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev am:
5a6cf3ac9a am:
c9aaec43a6
am:
1d185fbad7
* commit '
1d185fbad7bbd1139039283b642655b150884108':
Work on issue #
29042642: Watchdog going off
Change-Id: I659acd8ca9d2b1ddd7992d1c079dd968e60befad
Android Build Merger (Role) [Thu, 2 Jun 2016 18:55:54 +0000 (18:55 +0000)]
Merge "Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev am:
5a6cf3ac9a am:
340f22fcc6" into nyc-mr1-dev-plus-aosp
Suprabh Shukla [Thu, 2 Jun 2016 18:55:33 +0000 (18:55 +0000)]
Merge "Changing user switching messages for demo mode" into nyc-mr1-dev am:
5ac8499b25
am:
ef3a63ce74
* commit '
ef3a63ce74bea3f1bd4a033e34070954aa905135':
Changing user switching messages for demo mode
Change-Id: Ic8c41f7790d40198f20ef088cf37a11a0f153a4c
Dianne Hackborn [Thu, 2 Jun 2016 18:55:23 +0000 (18:55 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev am:
5a6cf3ac9a
am:
340f22fcc6
* commit '
340f22fcc60f0e5d54cd9740b3995170d0c70c62':
Work on issue #
29042642: Watchdog going off
Change-Id: Iea9d7b29a9a7bc0b0d87387088f001d61ada83e7
Dianne Hackborn [Thu, 2 Jun 2016 18:55:13 +0000 (18:55 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev am:
5a6cf3ac9a
am:
c9aaec43a6
* commit '
c9aaec43a6ff487ff19e5fdb1871efb268b0592b':
Work on issue #
29042642: Watchdog going off
Change-Id: I1ddb808137c527967358e8b12fc93063dd153bfd
Suprabh Shukla [Thu, 2 Jun 2016 18:50:51 +0000 (18:50 +0000)]
Merge "Changing user switching messages for demo mode" into nyc-mr1-dev
am:
5ac8499b25
* commit '
5ac8499b25b1533c7e605f8b2cf3861e7cd7970c':
Changing user switching messages for demo mode
Change-Id: I822aed2c9762f680e3697c18e759168c2a72b1f2
Dianne Hackborn [Thu, 2 Jun 2016 18:50:24 +0000 (18:50 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev
am:
5a6cf3ac9a
* commit '
5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
Work on issue #
29042642: Watchdog going off
Change-Id: I2a3b120648aef7401bb6d4c2460f868cdc16c1a0
Dianne Hackborn [Thu, 2 Jun 2016 18:49:29 +0000 (18:49 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev
am:
5a6cf3ac9a
* commit '
5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
Work on issue #
29042642: Watchdog going off
Change-Id: Ic0c08c2ab1c0e7b1cc195928492ab4c0eaef782f
TreeHugger Robot [Thu, 2 Jun 2016 18:40:33 +0000 (18:40 +0000)]
Merge "Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev"
TreeHugger Robot [Thu, 2 Jun 2016 18:36:08 +0000 (18:36 +0000)]
Merge "Changing user switching messages for demo mode" into nyc-mr1-dev
Dianne Hackborn [Thu, 2 Jun 2016 18:31:15 +0000 (18:31 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev
Roozbeh Pournader [Thu, 2 Jun 2016 18:19:41 +0000 (18:19 +0000)]
Merge "Use bidi heuristics correctly in BoringLayout#isBoring()"
Amith Yamasani [Thu, 2 Jun 2016 18:07:13 +0000 (18:07 +0000)]
Merge "Setup user restrictions for demo user" into nyc-mr1-dev am:
a28576cb72
am:
64fc84e9c7
* commit '
64fc84e9c78e143e79a0e5b2dddf97f02d1f40d9':
Setup user restrictions for demo user
Change-Id: I414145f63da75daa63f25879dc2ef8ee167cef10
Julia Reynolds [Thu, 2 Jun 2016 18:04:31 +0000 (14:04 -0400)]
Hide alarm condition if there's no alarm.
Change-Id: Iba8c9eb2bd3033683c25c5cf145fc52f9ac0f0d2
Fixes:
27698976
Amith Yamasani [Thu, 2 Jun 2016 18:00:40 +0000 (18:00 +0000)]
Merge "Setup user restrictions for demo user" into nyc-mr1-dev
am:
a28576cb72
* commit '
a28576cb7201b468908346b4807892706870df92':
Setup user restrictions for demo user
Change-Id: I4121f9745f8d582c0c85240a35b6ed442e8f2850
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
Amith Yamasani [Thu, 2 Jun 2016 17:51:51 +0000 (17:51 +0000)]
Merge "Setup user restrictions for demo user" into nyc-mr1-dev
Garfield Tan [Thu, 2 Jun 2016 00:47:39 +0000 (00:47 +0000)]
Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev
Conflicts:
packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java
Change-Id: I1eb4f265891542f8db59349ce158b192f1b14315
David Brazdil [Thu, 2 Jun 2016 17:09:09 +0000 (17:09 +0000)]
Merge "Merge "Do not update packages in encrypted state" into nyc-dev am:
c4f1bc4032 am:
7397e80504" into nyc-mr1-dev-plus-aosp
am:
6094a6053b
* commit '
6094a6053be563a77329fa3b411e99ab1244e90e':
Change-Id: I75cbd30e87905abbdab3826a89abb4de9358e89c
Mady Mellor [Thu, 2 Jun 2016 17:01:01 +0000 (17:01 +0000)]
Merge "Merge "Parent notifications should always be normal notification color" into nyc-dev am:
09ca7e73c0 am:
ece7cd7120" into nyc-mr1-dev-plus-aosp
am:
a6d5dabde2
* commit '
a6d5dabde2485a9285e09389c23c51498db80aaa':
Change-Id: I57ad86e98f00b19e2580f03873a19a83d35e965d
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 17:00:57 +0000 (17:00 +0000)]
Merge "Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am:
2002061f34 am:
6b9371ceef" into nyc-mr1-dev-plus-aosp
am:
2d74e17bb0
* commit '
2d74e17bb0fe0bf9b52332f2664460a8a54549ec':
Change-Id: I6da0fd5a265c4ccec729f1b583e5ebd6e96f164c
Selim Cinek [Thu, 2 Jun 2016 17:00:54 +0000 (17:00 +0000)]
Merge "Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am:
8e2a2fa98c am:
5df763e177" into nyc-mr1-dev-plus-aosp
am:
14d77d69a8
* commit '
14d77d69a8d63655022d681cdb0f2afbca3058c7':
Change-Id: I185aa92075b5df705ce5651d370ec8ed73a07860
Selim Cinek [Thu, 2 Jun 2016 17:00:50 +0000 (17:00 +0000)]
Merge "Merge "Fixed a crash with notification groups" into nyc-dev am:
c152dacc37 am:
bf11142c36" into nyc-mr1-dev-plus-aosp
am:
7141267f68
* commit '
7141267f68a7acf57cdf68055445d61b248195f4':
Change-Id: I3e4c72a5ae274102091225fdff0e20f2040c621a
Chris Wren [Thu, 2 Jun 2016 17:00:45 +0000 (17:00 +0000)]
Merge "Merge "make the notification enqueue rate threshold a setting" into nyc-dev am:
43c3a7e5a7 am:
35f49c5968" into nyc-mr1-dev-plus-aosp
am:
9a487584dd
* commit '
9a487584dd9752fe29da88c49cb26965ef658b5a':
Change-Id: I508b048f2f97b29e8d4df2ca757d5f323ad3aeab
David Brazdil [Thu, 2 Jun 2016 16:57:35 +0000 (16:57 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev am:
c4f1bc4032 am:
a5e81480b1
am:
2a7c8c8024
* commit '
2a7c8c8024895c3270d4351e6ca4a364d598d52c':
Do not update packages in encrypted state
Change-Id: Ib0c5e3b003769c150631c7768918552902124456
Mady Mellor [Thu, 2 Jun 2016 16:57:30 +0000 (16:57 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev am:
09ca7e73c0 am:
0e6207ef40
am:
9982d86abc
* commit '
9982d86abcaa7102511364ddf6bf36a140041709':
Parent notifications should always be normal notification color
Change-Id: Icdda6486af4cccaacfc48dd30d8b97f0aaffa0a5
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 16:57:25 +0000 (16:57 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am:
2002061f34 am:
462db089d4
am:
4cdc299716
* commit '
4cdc299716bf6f9f5af553994e78e2b3b276783b':
Only reset global restriction owner on DO->PO for the right user
Change-Id: I51c749ddabeef1b080320baefaab1de4d72860fc
Selim Cinek [Thu, 2 Jun 2016 16:57:20 +0000 (16:57 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am:
8e2a2fa98c am:
01c59fc091
am:
13eaaea877
* commit '
13eaaea8771fc1ed55fde023e622ddc45c59656d':
Fixed that volume buttons were not working on the pin input
Change-Id: I2361392d72d01413abfd7859e2a70d93cdff662a
Selim Cinek [Thu, 2 Jun 2016 16:57:15 +0000 (16:57 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev am:
c152dacc37 am:
5432938bf6
am:
f96c5fd462
* commit '
f96c5fd46280754f7122637e2e90055105610030':
Fixed a crash with notification groups
Change-Id: If68dd896bbc9ae65941782589391d53f3063ea3d
Android Build Merger (Role) [Thu, 2 Jun 2016 16:54:59 +0000 (16:54 +0000)]
Merge "Merge "Do not update packages in encrypted state" into nyc-dev am:
c4f1bc4032 am:
7397e80504" into nyc-mr1-dev-plus-aosp
David Brazdil [Thu, 2 Jun 2016 16:54:33 +0000 (16:54 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev am:
c4f1bc4032
am:
7397e80504
* commit '
7397e80504bf1af3ef015a1fd108557a8551ac52':
Do not update packages in encrypted state
Change-Id: I5c5cac85700cce1b9cd690dfdca7ffc1ec5f943e
Android Build Merger (Role) [Thu, 2 Jun 2016 16:52:13 +0000 (16:52 +0000)]
Merge "Merge "Parent notifications should always be normal notification color" into nyc-dev am:
09ca7e73c0 am:
ece7cd7120" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Jun 2016 16:52:00 +0000 (16:52 +0000)]
Merge "Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am:
2002061f34 am:
6b9371ceef" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Jun 2016 16:51:48 +0000 (16:51 +0000)]
Merge "Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am:
8e2a2fa98c am:
5df763e177" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Jun 2016 16:51:34 +0000 (16:51 +0000)]
Merge "Merge "Fixed a crash with notification groups" into nyc-dev am:
c152dacc37 am:
bf11142c36" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Jun 2016 16:51:21 +0000 (16:51 +0000)]
Merge "Merge "make the notification enqueue rate threshold a setting" into nyc-dev am:
43c3a7e5a7 am:
35f49c5968" into nyc-mr1-dev-plus-aosp
Mady Mellor [Thu, 2 Jun 2016 16:50:44 +0000 (16:50 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev am:
09ca7e73c0
am:
ece7cd7120
* commit '
ece7cd712072c0415c2982b8a9b608ad24d6bf7c':
Parent notifications should always be normal notification color
Change-Id: I70892c76677875b44e518ccbca435cea6f2b3fca
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 16:50:40 +0000 (16:50 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am:
2002061f34
am:
6b9371ceef
* commit '
6b9371ceef5c86c9633ac30aa507b45125aeea7f':
Only reset global restriction owner on DO->PO for the right user
Change-Id: I9c6c50902c4712da1ff114f75bd0f92c505bc4eb
Selim Cinek [Thu, 2 Jun 2016 16:50:30 +0000 (16:50 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am:
8e2a2fa98c
am:
5df763e177
* commit '
5df763e1777e0a4e5fcc0bd399029cd03d8a2bc4':
Fixed that volume buttons were not working on the pin input
Change-Id: I2a53d1203e1037ce957cf051c67d3cd1630ce199
Selim Cinek [Thu, 2 Jun 2016 16:50:13 +0000 (16:50 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev am:
c152dacc37
am:
bf11142c36
* commit '
bf11142c36121e948f9476bc21ae817532a2e74a':
Fixed a crash with notification groups
Change-Id: I520415e49cccc48c5d26b460aa85ec804e6d9a50
Chris Wren [Thu, 2 Jun 2016 16:49:55 +0000 (16:49 +0000)]
Merge "make the notification enqueue rate threshold a setting" into nyc-dev am:
43c3a7e5a7
am:
35f49c5968
* commit '
35f49c5968775ea30fdcb859e94e1c816edfcb0d':
Change-Id: I43dcd53660bce93da819458ae1645ad35c58c3ef
David Brazdil [Thu, 2 Jun 2016 16:48:51 +0000 (16:48 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev am:
c4f1bc4032
am:
a5e81480b1
* commit '
a5e81480b16e8cbf5a3c4f015b667893defb1456':
Do not update packages in encrypted state
Change-Id: I6307cc4b29146dc95f3b5b45f22270fc44d6d2b7
Mady Mellor [Thu, 2 Jun 2016 16:48:36 +0000 (16:48 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev am:
09ca7e73c0
am:
0e6207ef40
* commit '
0e6207ef406d1fad389a9831e6c8816b274ad2b5':
Parent notifications should always be normal notification color
Change-Id: I73542bc4adf5240ec130bac09ef788248f929a9b
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 16:48:31 +0000 (16:48 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am:
2002061f34
am:
462db089d4
* commit '
462db089d4cd6d290e76ca76c0c159f52dcf0dc1':
Only reset global restriction owner on DO->PO for the right user
Change-Id: I0463116da229d2da751f52bd022d0c0bc60bef98
Selim Cinek [Thu, 2 Jun 2016 16:48:27 +0000 (16:48 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am:
8e2a2fa98c
am:
01c59fc091
* commit '
01c59fc091819d982f821ebc1d347b2821a13c41':
Fixed that volume buttons were not working on the pin input
Change-Id: I336e32276d219fe0205a934de4533dba1d5cba2d
Selim Cinek [Thu, 2 Jun 2016 16:48:23 +0000 (16:48 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev am:
c152dacc37
am:
5432938bf6
* commit '
5432938bf6838c934cd4e28e094b9d78eca18777':
Fixed a crash with notification groups
Change-Id: Id90f5d886d1019871172f0f7262f818e9fb2c36a
Chris Wren [Thu, 2 Jun 2016 16:48:13 +0000 (16:48 +0000)]
resolve merge conflicts of
43c3a7e5 to nyc-mr1-dev am:
d958f83a01
am:
be2da62d11
* commit '
be2da62d11227c564817906c5df0ceb151ed2436':
make the notification enqueue rate threshold a setting
Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed
Chris Wren [Thu, 2 Jun 2016 16:41:30 +0000 (16:41 +0000)]
resolve merge conflicts of
43c3a7e5 to nyc-mr1-dev
am:
d958f83a01
* commit '
d958f83a017dde230203d91c8daedf36d40c22a6':
make the notification enqueue rate threshold a setting
Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334
David Brazdil [Thu, 2 Jun 2016 16:41:12 +0000 (16:41 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
am:
c4f1bc4032
* commit '
c4f1bc40326c10fde55f07230e3fe3067d70fbfa':
Do not update packages in encrypted state
Change-Id: I84c2c77fb8ff2cc12095f5217c6960a156f2faf3
Mady Mellor [Thu, 2 Jun 2016 16:41:09 +0000 (16:41 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev
am:
09ca7e73c0
* commit '
09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
Parent notifications should always be normal notification color
Change-Id: I81160e649188e21d4c763abd8d222fa83608322d
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 16:41:06 +0000 (16:41 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
am:
2002061f34
* commit '
2002061f349edfbf583b115af647f0ca34cf749e':
Only reset global restriction owner on DO->PO for the right user
Change-Id: If1782d4b767ec46b14e8c1e31245fd9f99a93bf0
Selim Cinek [Thu, 2 Jun 2016 16:41:03 +0000 (16:41 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
am:
8e2a2fa98c
* commit '
8e2a2fa98c9ca077681acf13abfb6252c3859e0f':
Fixed that volume buttons were not working on the pin input
Change-Id: If75f4fef934ab26353803dcbeeed0569f1f2d9bf
Selim Cinek [Thu, 2 Jun 2016 16:41:00 +0000 (16:41 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
am:
c152dacc37
* commit '
c152dacc37bd850b06a37e18fba77308e8c9f939':
Fixed a crash with notification groups
Change-Id: I6f36c1dae68de0e4741ee74910696869c21b86ec
Tenghui Zhu [Thu, 2 Jun 2016 16:24:04 +0000 (16:24 +0000)]
Merge "Fix the instrumentation report issue"
David Brazdil [Thu, 2 Jun 2016 16:21:27 +0000 (16:21 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
am:
c4f1bc4032
* commit '
c4f1bc40326c10fde55f07230e3fe3067d70fbfa':
Do not update packages in encrypted state
Change-Id: Icdba2e72de1dbc284780df7f59cbdc56ff061ba1
David Brazdil [Thu, 2 Jun 2016 16:16:25 +0000 (16:16 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
Chris Wren [Thu, 2 Jun 2016 16:15:35 +0000 (12:15 -0400)]
resolve merge conflicts of
43c3a7e5 to nyc-mr1-dev
Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585
Mady Mellor [Thu, 2 Jun 2016 16:14:53 +0000 (16:14 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev
am:
09ca7e73c0
* commit '
09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
Parent notifications should always be normal notification color
Change-Id: I581aed7e42200d5b78a5e7ac396c76eed883450c
Mady Mellor [Thu, 2 Jun 2016 16:09:15 +0000 (16:09 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 16:02:56 +0000 (16:02 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
am:
2002061f34
* commit '
2002061f349edfbf583b115af647f0ca34cf749e':
Only reset global restriction owner on DO->PO for the right user
Change-Id: Ifb8b333ff367cbcd24333e3b46aa060060b384ed
TreeHugger Robot [Thu, 2 Jun 2016 15:59:23 +0000 (15:59 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
Selim Cinek [Thu, 2 Jun 2016 15:47:45 +0000 (15:47 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
am:
8e2a2fa98c
* commit '
8e2a2fa98c9ca077681acf13abfb6252c3859e0f':
Fixed that volume buttons were not working on the pin input
Change-Id: I6deb8c3a706c69bebeb29f46aab10c32f8f705af
Selim Cinek [Thu, 2 Jun 2016 15:47:41 +0000 (15:47 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
am:
c152dacc37
* commit '
c152dacc37bd850b06a37e18fba77308e8c9f939':
Fixed a crash with notification groups
Change-Id: I6b76008e357e6459abc2775f992d95bd6a706e68
TreeHugger Robot [Thu, 2 Jun 2016 15:41:19 +0000 (15:41 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:41:08 +0000 (15:41 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
Ricky Wai [Thu, 2 Jun 2016 15:25:38 +0000 (15:25 +0000)]
Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev am:
390a0ca025 am:
0a4127c583
am:
9b14b62f5d
* commit '
9b14b62f5dd01498198bab2c76532cca3e1ef1ed':
Change-Id: I0db37c1778e0efac3de7ca36abb8cc2fb6c493d4
Ricky Wai [Thu, 2 Jun 2016 15:20:37 +0000 (15:20 +0000)]
Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev am:
390a0ca025 am:
140fe982df
am:
4886275b94
* commit '
4886275b948660f3b3cb7bfa8bdbd57b6eb80cf5':
Do not use cached tile specs value in QSTileHost.addTile()
Change-Id: Ifa36b6e5f7fa11a3b17db4f722d7fabe8af058f7
Clara Bayarri [Thu, 2 Jun 2016 15:20:33 +0000 (15:20 +0000)]
DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice am:
9fe1077b05
am:
43ee92589a -s ours
* commit '
43ee92589a130577ddee01a5d674cde237b9b1e9':
DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice
Change-Id: Id6d22862adab1dde272b6bd07931079495f7e994
OSDN Git Service
