OSDN Git Service
Jack He [Thu, 27 Jul 2017 19:15:06 +0000 (19:15 +0000)]
Merge "Bluetooth: show multi-device status in Quick Settings" into oc-dr1-dev am:
3afa031888 am:
552e7ec901
am:
f140cacec1
Change-Id: I8f558c13c74aee0246fe4c450f8343296f64a628
Jason Monk [Thu, 27 Jul 2017 19:09:24 +0000 (19:09 +0000)]
Merge "Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev am:
a5e3249b8a am:
ac58e85811" into oc-mr1-dev-plus-aosp
am:
16c409a58a
Change-Id: I7455ce4bf4d82c80af5c7e1b864bce49c5724036
Jason Monk [Thu, 27 Jul 2017 19:07:30 +0000 (19:07 +0000)]
Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev am:
a5e3249b8a am:
95a08e04b3
am:
d389716829
Change-Id: I6a2ad3fb261f4cd20e6fde81f000c4c01ff112be
Jack He [Thu, 27 Jul 2017 19:06:22 +0000 (19:06 +0000)]
Merge "Bluetooth: show multi-device status in Quick Settings" into oc-dr1-dev am:
3afa031888
am:
552e7ec901
Change-Id: I74ab28483f1e190cfec4a01a936b505412acb0dc
Android Build Merger (Role) [Thu, 27 Jul 2017 19:03:31 +0000 (19:03 +0000)]
Merge "Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev am:
a5e3249b8a am:
ac58e85811" into oc-mr1-dev-plus-aosp
Jason Monk [Thu, 27 Jul 2017 19:01:57 +0000 (19:01 +0000)]
Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev am:
a5e3249b8a
am:
ac58e85811
Change-Id: I84d3c8e2229f6e51b3ca3b2857d3041f1bc203a5
Jason Monk [Thu, 27 Jul 2017 19:00:37 +0000 (19:00 +0000)]
Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev am:
a5e3249b8a
am:
95a08e04b3
Change-Id: If6b45a7bd4bdbdbd320dc99d21bd9ccd2ea6ca25
Jack He [Thu, 27 Jul 2017 19:00:03 +0000 (19:00 +0000)]
Merge "Bluetooth: show multi-device status in Quick Settings" into oc-dr1-dev
am:
3afa031888
Change-Id: I7a8f6a7fcb3a693cfdec47525f5d1384b34e7b66
TreeHugger Robot [Thu, 27 Jul 2017 18:55:22 +0000 (18:55 +0000)]
Merge "Bluetooth: show multi-device status in Quick Settings" into oc-dr1-dev
Jason Monk [Thu, 27 Jul 2017 18:54:04 +0000 (18:54 +0000)]
Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev
am:
a5e3249b8a
Change-Id: Id4a3373bbb6006a0f31e99e74de4c810b84b3afa
Jason Monk [Thu, 27 Jul 2017 18:50:31 +0000 (18:50 +0000)]
Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev
am:
a5e3249b8a
Change-Id: Ibb2472793b6df6b066c6f8c3c0e8d48df409c916
TreeHugger Robot [Thu, 27 Jul 2017 18:43:39 +0000 (18:43 +0000)]
Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev
Etan Cohen [Thu, 27 Jul 2017 18:40:29 +0000 (18:40 +0000)]
Merge "[RTT] Add a binder to the AIDL to enable cleanup" into oc-mr1-dev am:
df33967d19
am:
6354fb8e22
Change-Id: Ifc1a74c9ae29f32f3c2396736002b2f8b7878cfb
Etan Cohen [Thu, 27 Jul 2017 18:32:41 +0000 (18:32 +0000)]
Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev am:
5b81cfe83c
am:
8c84e0f757
Change-Id: I0804ab42e73bff7d9c5a872fb6d58488176a2b0d
Etan Cohen [Thu, 27 Jul 2017 18:26:44 +0000 (18:26 +0000)]
Merge "[RTT] Add a binder to the AIDL to enable cleanup" into oc-mr1-dev
am:
df33967d19
Change-Id: I9cd1dd0827c0228b1e82970d1c1444f020a98154
Etan Cohen [Thu, 27 Jul 2017 18:16:49 +0000 (18:16 +0000)]
Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev
am:
5b81cfe83c
Change-Id: I45c2d0818657a5c4e8cc35f6ad09f2e7d7f77cea
Adam Lesinski [Thu, 27 Jul 2017 18:15:18 +0000 (18:15 +0000)]
Merge "AAPT2: Fix JavaDoc first sentence extraction."
Etan Cohen [Thu, 27 Jul 2017 18:11:36 +0000 (18:11 +0000)]
Merge "[RTT] Add a binder to the AIDL to enable cleanup" into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 18:07:19 +0000 (18:07 +0000)]
Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev
Yohei Yukawa [Thu, 27 Jul 2017 18:05:38 +0000 (18:05 +0000)]
Merge "Merge "Lock down IME switcher notification handling" into oc-mr1-dev am:
37f2e48697" into oc-mr1-dev-plus-aosp
am:
adfbfeb33a
Change-Id: Ia1033bd1c9746f86c4b86c8cf0339f315fd63366
Steven Moreland [Thu, 27 Jul 2017 18:02:52 +0000 (18:02 +0000)]
Merge "ActivityManagerService: fix nativehelper includes" am:
c372715beb -s ours am:
4d28662818 -s ours am:
b6c4ccb724 -s ours am:
5738af9abc -s ours
am:
c2eb24e718 -s ours
Change-Id: Id8bb00be2d82fc964d642a26205a827a888c4a2b
Adrian Roos [Thu, 27 Jul 2017 18:00:30 +0000 (18:00 +0000)]
Merge "Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am:
6efe486397 am:
6a7dc737a5" into oc-mr1-dev-plus-aosp
am:
7e362a92b5
Change-Id: I7df3cdaeb977de1b22db22f2fd28683679a176d8
Neil Fuller [Thu, 27 Jul 2017 17:58:11 +0000 (17:58 +0000)]
Merge "Merge "Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1 am:
c2f58098c1" into oc-dr1-dev-plus-aosp am:
224980cda6" into oc-mr1-dev-plus-aosp
am:
55ce3e4688
Change-Id: Iedfc845f2764ebf21b424922a3f1bc51f44e066b
Adrian Roos [Thu, 27 Jul 2017 17:56:07 +0000 (17:56 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am:
6efe486397 am:
0dbe7df15e
am:
8458a16078
Change-Id: Idfa9c2df46ec69844a7862f0afd8eb1f220463fe
Michael Wright [Thu, 27 Jul 2017 17:50:28 +0000 (17:50 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66 -s ours am:
985fad4d15 -s ours
am:
2d977423e7 -s ours
Change-Id: Ica7fd31f85bdc98bcb5433d77ca747bbbb3d9076
Michael Wright [Thu, 27 Jul 2017 17:48:13 +0000 (17:48 +0000)]
Merge "Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66 am:
22df0a5ae2 -s ours" into oc-mr1-dev-plus-aosp
am:
9f7d0ba789 -s ours
Change-Id: I430b6f818765e7ef705b1269f2feb595281f7118
Android Build Merger (Role) [Thu, 27 Jul 2017 17:45:21 +0000 (17:45 +0000)]
Merge "Merge "Lock down IME switcher notification handling" into oc-mr1-dev am:
37f2e48697" into oc-mr1-dev-plus-aosp
Steven Moreland [Thu, 27 Jul 2017 17:41:38 +0000 (17:41 +0000)]
Merge "ActivityManagerService: fix nativehelper includes" am:
c372715beb -s ours am:
4d28662818 -s ours am:
b6c4ccb724 -s ours
am:
5738af9abc -s ours
Change-Id: Idc5e97bcf1290adbcf6b0a89a077596d03916dc2
Yohei Yukawa [Thu, 27 Jul 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Lock down IME switcher notification handling" into oc-mr1-dev
am:
37f2e48697
Change-Id: I1018dff61ef7898f999c6f58ddb82aa41d6f91f6
Michael Wright [Thu, 27 Jul 2017 17:40:40 +0000 (17:40 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66 am:
22df0a5ae2 -s ours
am:
28a63c7200 -s ours
Change-Id: Iee50fbe91f591acf3f7765b88d43eb317fff4839
Android Build Merger (Role) [Thu, 27 Jul 2017 17:38:39 +0000 (17:38 +0000)]
Merge "Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am:
6efe486397 am:
6a7dc737a5" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 27 Jul 2017 17:37:13 +0000 (17:37 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am:
6efe486397
am:
6a7dc737a5
Change-Id: Idaf64e69087d813cec9d5982ec5f90e059de748c
Android Build Merger (Role) [Thu, 27 Jul 2017 17:36:05 +0000 (17:36 +0000)]
Merge "Merge "Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1 am:
c2f58098c1" into oc-dr1-dev-plus-aosp am:
224980cda6" into oc-mr1-dev-plus-aosp
Yohei Yukawa [Thu, 27 Jul 2017 17:33:36 +0000 (17:33 +0000)]
Merge "Lock down IME switcher notification handling" into oc-mr1-dev
Neil Fuller [Thu, 27 Jul 2017 17:33:24 +0000 (17:33 +0000)]
Merge "Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1 am:
c2f58098c1" into oc-dr1-dev-plus-aosp
am:
224980cda6
Change-Id: I768fa05e22981b6645cced385f0663620f51e04b
Adrian Roos [Thu, 27 Jul 2017 17:33:02 +0000 (17:33 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am:
6efe486397
am:
0dbe7df15e
Change-Id: Ifd8ce512455b1c994eda43466af3102c1ced172a
Michael Wright [Thu, 27 Jul 2017 17:30:34 +0000 (17:30 +0000)]
Report the display is off when the hardware blanks itself. am:
410fd1b838 -s ours am:
ef464c498f -s ours
am:
b76c6441c0 -s ours
Change-Id: Ie43e855991762aab9f2016e2113b178a5c51dc94
Michael Wright [Thu, 27 Jul 2017 17:27:42 +0000 (17:27 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66 -s ours
am:
985fad4d15 -s ours
Change-Id: I50e51154872bfbb548dbc57cf73b0d00dc4f1189
Steven Moreland [Thu, 27 Jul 2017 17:27:31 +0000 (17:27 +0000)]
Merge "ActivityManagerService: fix nativehelper includes" am:
c372715beb -s ours am:
4d28662818 -s ours
am:
b6c4ccb724 -s ours
Change-Id: I451558f083495ff80b44f41f66fd18f1cbe1a6fe
Android Build Merger (Role) [Thu, 27 Jul 2017 17:25:09 +0000 (17:25 +0000)]
Merge "Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66 am:
22df0a5ae2 -s ours" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
am:
6efe486397
Change-Id: I016efc215fa8fcf66a814f7cdf25a8ae0cc13e75
Michael Wright [Thu, 27 Jul 2017 17:22:02 +0000 (17:22 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66
am:
22df0a5ae2 -s ours
Change-Id: I540efcf49dc593654e816fe294b7cea6e9f741a6
Michael Wright [Thu, 27 Jul 2017 17:21:06 +0000 (17:21 +0000)]
Report the display is off when the hardware blanks itself. am:
410fd1b838 -s ours
am:
ef464c498f -s ours
Change-Id: Idd56b9f2f36ccc284c09160c06476aa4b9232b58
Adrian Roos [Thu, 27 Jul 2017 17:20:40 +0000 (17:20 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
am:
6efe486397
Change-Id: I9e73507cf6964a7d6747eb1bdea9eb6e8a547d6a
Michael Wright [Thu, 27 Jul 2017 17:20:02 +0000 (17:20 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev
am:
bf9b1dbb66 -s ours
Change-Id: I1bf0773df207deb55b8e4b8952919c875591e909
Steven Moreland [Thu, 27 Jul 2017 17:19:56 +0000 (17:19 +0000)]
Merge "ActivityManagerService: fix nativehelper includes" am:
c372715beb -s ours
am:
4d28662818 -s ours
Change-Id: I2a858e502449ace2c9c40ecb53e00dfff6d64dd8
Android Build Merger (Role) [Thu, 27 Jul 2017 17:16:44 +0000 (17:16 +0000)]
Merge "Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1 am:
c2f58098c1" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Thu, 27 Jul 2017 17:15:19 +0000 (17:15 +0000)]
Merge "Enable colorspace conversion while perserving legacy blending."
Neil Fuller [Thu, 27 Jul 2017 17:14:34 +0000 (17:14 +0000)]
Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1
am:
c2f58098c1
Change-Id: I70c224eb853e41ed216bebf608f9b540d69514a2
Android Build Merger (Role) [Thu, 27 Jul 2017 17:14:32 +0000 (17:14 +0000)]
Merge "Merge "Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19 am:
98c63ca9ac" into oc-mr1-dev-plus-aosp am:
84f7cc3a21"
Bill Yi [Thu, 27 Jul 2017 17:13:59 +0000 (17:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Steven Moreland [Thu, 27 Jul 2017 17:13:38 +0000 (17:13 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
am:
c372715beb -s ours
Change-Id: I57d45557c585238f9e98e0bf81c06058235d7e74
Michael Wright [Thu, 27 Jul 2017 17:12:53 +0000 (17:12 +0000)]
Report the display is off when the hardware blanks itself.
am:
410fd1b838 -s ours
Change-Id: I1af77c81d740876748958664fb78337d9939e136
Bill Yi [Thu, 27 Jul 2017 17:12:45 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Lucas Dupin [Thu, 27 Jul 2017 17:12:29 +0000 (17:12 +0000)]
Merge "Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19 am:
98c63ca9ac" into oc-mr1-dev-plus-aosp
am:
84f7cc3a21
Change-Id: Iae185221040fa7ded02ed5dea186f1ab03d1ae10
Michael Wright [Thu, 27 Jul 2017 17:12:26 +0000 (17:12 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev
am:
bf9b1dbb66
Change-Id: I6b5a1eeb546e7cd1b15a20d670d65429bfda5c82
Lucas Dupin [Thu, 27 Jul 2017 17:10:21 +0000 (17:10 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19 am:
3a5550a3be
am:
a5dbda0b36
Change-Id: Ia80a4e6197c02d34ad4069a87a63919ac7cc7de6
Bill Yi [Thu, 27 Jul 2017 17:07:17 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 27 Jul 2017 17:06:25 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Jul 2017 17:05:31 +0000 (17:05 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
Neil Fuller [Thu, 27 Jul 2017 17:05:27 +0000 (17:05 +0000)]
Merge "Tidy up RulesManagerService code" am:
d5517c39e8
am:
ef21b72dd1
Change-Id: I600ee50f8c5c463853035c2a83e43d2ce0149caa
TreeHugger Robot [Thu, 27 Jul 2017 17:03:17 +0000 (17:03 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev
Android Build Merger (Role) [Thu, 27 Jul 2017 17:01:19 +0000 (17:01 +0000)]
Merge "Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19 am:
98c63ca9ac" into oc-mr1-dev-plus-aosp
Treehugger Robot [Thu, 27 Jul 2017 17:00:13 +0000 (17:00 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
Lucas Dupin [Thu, 27 Jul 2017 16:58:43 +0000 (16:58 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19
am:
98c63ca9ac
Change-Id: I2264136dea35f9eb4d08c0a43e591c06d863c2ba
Lucas Dupin [Thu, 27 Jul 2017 16:58:28 +0000 (16:58 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19
am:
3a5550a3be
Change-Id: I18f59c0d2ab20ae38c29bc6135920dfe4e8cc647
Neil Fuller [Thu, 27 Jul 2017 16:58:02 +0000 (16:58 +0000)]
Merge "Tidy up RulesManagerService code"
am:
d5517c39e8
Change-Id: I56afb0031c2768ea5aed0797b64c9ebda91be8e8
Lucas Dupin [Thu, 27 Jul 2017 16:49:50 +0000 (16:49 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am:
4451b6ae19
Change-Id: Ia176aeafa9c9e2d0b979a472bb444657b4417ab9
Lucas Dupin [Thu, 27 Jul 2017 16:49:49 +0000 (16:49 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am:
4451b6ae19
Change-Id: I1549a77346b4c7c417ba2fa7a2b77a9b0ea2ea2a
Neil Fuller [Thu, 27 Jul 2017 16:48:58 +0000 (16:48 +0000)]
Merge "Tidy up RulesManagerService code"
Lucas Dupin [Thu, 27 Jul 2017 16:41:12 +0000 (16:41 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev
Neil Fuller [Thu, 27 Jul 2017 16:19:23 +0000 (16:19 +0000)]
Merge "Alter condition for starting RulesManagerService" into oc-mr1-dev am:
1807d585b5
am:
b39e80a259
Change-Id: Ida238f6afe83d4f993ca803b3661f8ebd1dc1f12
Neil Fuller [Thu, 27 Jul 2017 16:11:51 +0000 (16:11 +0000)]
Merge "Alter condition for starting RulesManagerService" into oc-mr1-dev
am:
1807d585b5
Change-Id: I3614a67ebf3d82f7e9bb8c99bfac02053fe053b9
Neil Fuller [Thu, 27 Jul 2017 16:02:50 +0000 (16:02 +0000)]
Merge "Alter condition for starting RulesManagerService" into oc-mr1-dev
Steven Moreland [Wed, 26 Jul 2017 19:21:58 +0000 (12:21 -0700)]
ActivityManagerService: fix nativehelper includes
Bug:
63762847
Test: none
Merged-In: I9f9497990fbf0697d05445f563ad46a28d6d6eeb
Change-Id: I964c88cb74f0287dfc6634fbfcd3210a7d984213
Felipe Leme [Thu, 27 Jul 2017 15:32:39 +0000 (15:32 +0000)]
Merge "Don't show Save UI when values filled by user belong to a dataset." into oc-mr1-dev am:
e802d18f49
am:
40ebd6cb32
Change-Id: I27a29b2eb54532bf09fb6cd5d37ea53f85e922a0
Adrian Roos [Thu, 27 Jul 2017 15:30:06 +0000 (15:30 +0000)]
Merge "Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am:
4bb2f8e9fb am:
5106255d4f" into oc-mr1-dev-plus-aosp
am:
874fb1bce3
Change-Id: I8f3b85f1f5dfb10146c4e2c2ee75a750f2cdd81c
Adrian Roos [Thu, 27 Jul 2017 15:23:58 +0000 (15:23 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am:
4bb2f8e9fb am:
79150c22e6
am:
67d518a2d4
Change-Id: Id889f2c7f04eef2c22fe0666566d1284d37201f3
Felipe Leme [Thu, 27 Jul 2017 15:21:40 +0000 (15:21 +0000)]
Merge "Don't show Save UI when values filled by user belong to a dataset." into oc-mr1-dev
am:
e802d18f49
Change-Id: I1ec79f54c600723b8e0409b26f4cc9ffd01130d8
Hugo Benichi [Thu, 27 Jul 2017 15:18:47 +0000 (15:18 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" am:
3451fb6156 am:
ef7d6d93c3 am:
5cbf7e2dc8 am:
1609fe7fe3
am:
2b3e495224
Change-Id: I0aa590170f1bd4c37175c7e35e54d52f1fb21347
Android Build Merger (Role) [Thu, 27 Jul 2017 15:16:55 +0000 (15:16 +0000)]
Merge "Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am:
4bb2f8e9fb am:
5106255d4f" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 27 Jul 2017 15:14:39 +0000 (15:14 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am:
4bb2f8e9fb
am:
5106255d4f
Change-Id: I6ebf2cbd3b67e94e2088badddce659a98972f1a0
Adrian Roos [Thu, 27 Jul 2017 15:14:08 +0000 (15:14 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am:
4bb2f8e9fb
am:
79150c22e6
Change-Id: I8db6e55c7d045df8b9795e375754c57c1e32dfe0
Felipe Leme [Thu, 27 Jul 2017 15:11:22 +0000 (15:11 +0000)]
Merge "Don't show Save UI when values filled by user belong to a dataset." into oc-mr1-dev
Hugo Benichi [Thu, 27 Jul 2017 15:08:19 +0000 (15:08 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" am:
3451fb6156 am:
ef7d6d93c3 am:
5cbf7e2dc8
am:
1609fe7fe3
Change-Id: Ieed9e3e7755e0c5f89dc41ef66f47d4dbf4c66a9
Adrian Roos [Thu, 27 Jul 2017 15:05:39 +0000 (15:05 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev
am:
4bb2f8e9fb
Change-Id: Ica37d75f7e45ad418113196b077fa4244512adc4
Adrian Roos [Thu, 27 Jul 2017 15:05:38 +0000 (15:05 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev
am:
4bb2f8e9fb
Change-Id: I7bc8b27c8c964c280ec78f3e0d2564a62fc39bf9
Michael Wright [Thu, 27 Jul 2017 15:05:06 +0000 (15:05 +0000)]
Merge changes from topic 'aod-mr1' into oc-mr1-dev am:
352d099c83
am:
472fcbde01
Change-Id: I487410f49341e25d4393e591d5ede92291113bf1
Michael Wright [Thu, 27 Jul 2017 15:03:54 +0000 (15:03 +0000)]
Report the display is off when the hardware blanks itself. am:
c3e6af8769
am:
2de4d4ec3d
Change-Id: I264f3e103f1d8452d1247e069d4dac470afbe25d
Adrian Roos [Thu, 27 Jul 2017 14:58:45 +0000 (14:58 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev
Hugo Benichi [Thu, 27 Jul 2017 14:58:32 +0000 (14:58 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" am:
3451fb6156 am:
ef7d6d93c3
am:
5cbf7e2dc8
Change-Id: I73cc879e910d503946facdba498b300337f349fd
Richard Coles [Thu, 27 Jul 2017 14:58:04 +0000 (14:58 +0000)]
Merge "Improve ActivityManagerInternal.startIsolatedProcess."
Adrian Roos [Tue, 25 Jul 2017 14:29:27 +0000 (16:29 +0200)]
AOD: Make sure to update visibilities after instant expanding
Fixes an issue where disable flags were not applied properly because
they were not recomputed after expanding the PanelBar.
Change-Id: I6933ba4951bf768a15a9d4f58728558939f106ae
Fixes:
64001235
Test: Open camera, put to landscape, press power; Verify time and battery icon are not visible in transition.
Michael Wright [Thu, 27 Jul 2017 14:54:25 +0000 (14:54 +0000)]
Merge changes from topic 'aod-mr1' into oc-mr1-dev
am:
352d099c83
Change-Id: Ia19dcf394ea8eb0350639dcd8e290ec6cd97b6fa
Michael Wright [Thu, 27 Jul 2017 14:53:31 +0000 (14:53 +0000)]
Report the display is off when the hardware blanks itself.
am:
c3e6af8769
Change-Id: I0c6668265b9b762dad80d931113541804d9cc5b0
Beverly [Thu, 27 Jul 2017 14:52:14 +0000 (14:52 +0000)]
Merge "Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7 am:
856b8b9e32" into oc-mr1-dev-plus-aosp
am:
81dbde4840
Change-Id: Icd9237ae05e2a169b536384d9097c637c759325a
Derek Sollenberger [Wed, 26 Jul 2017 17:53:27 +0000 (13:53 -0400)]
Enable colorspace conversion while perserving legacy blending.
When requesting an SkImage from a android::Bitmap we will also
return a colorFilter that will perform the sRGB conversion at draw
time.
Bug:
62347704
Test: CtsUiRenderingTestCases, CtsGraphicsTestCases, CtsViewTestCases
Change-Id: Icc4694e2c42605e29fcc834c252bc21263bac658
Hugo Benichi [Thu, 27 Jul 2017 14:50:14 +0000 (14:50 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" am:
3451fb6156
am:
ef7d6d93c3
Change-Id: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf
Beverly [Thu, 27 Jul 2017 14:50:13 +0000 (14:50 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7 am:
4f36d642a4
am:
cac46d0fff
Change-Id: Ic95879fb67ddfece866c5bb57a9f5f4b26af1d02
TreeHugger Robot [Thu, 27 Jul 2017 14:45:53 +0000 (14:45 +0000)]
Merge changes from topic 'aod-mr1' into oc-mr1-dev
* changes:
Add new config to tell us whether brightness is bucketed or continuous
Report the display is off when the hardware blanks itself.
OSDN Git Service
