OSDN Git Service
Jerry Zhang [Tue, 6 Mar 2018 07:39:47 +0000 (07:39 +0000)]
Merge "Check mMediaProvider for null" into pi-dev am:
cefe0c6518
am:
955b8209ab
Change-Id: If0c3a5c21f23e9aa98dd70bec3678a8785469973
Jack He [Tue, 6 Mar 2018 07:30:13 +0000 (07:30 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" into pi-dev am:
4a3dd2ba58
am:
c3ede0cdf3
Change-Id: I2d3d34c757b3a0a73eb289981540ee6c91249d2f
Fyodor Kupolov [Tue, 6 Mar 2018 07:18:09 +0000 (07:18 +0000)]
Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev am:
d97a0f1ac5
am:
d4315862cc
Change-Id: Ia73f006301d8225f7906612faa381f4307a23b51
Jack He [Tue, 6 Mar 2018 07:08:37 +0000 (07:08 +0000)]
Merge "Merge "Bluetooth: Use enums for adapter connection states" am:
95372e873e am:
8da4504cad" into pi-dev-plus-aosp
am:
3bc933c57f
Change-Id: I87ca2c0e8f11e17e0ac3aa14d3eb77415b5b9473
TreeHugger Robot [Tue, 6 Mar 2018 05:19:26 +0000 (05:19 +0000)]
Merge "Filter out detached views from touch"
Ben Lin [Tue, 6 Mar 2018 04:01:39 +0000 (04:01 +0000)]
Merge "Add new Intent start a package's Open By Default page directly."
Jerry Zhang [Tue, 6 Mar 2018 03:34:50 +0000 (03:34 +0000)]
Merge "Check mMediaProvider for null" into pi-dev
am:
cefe0c6518
Change-Id: I8c901d37c99d1e144c7b2cdf2d66531eee02bb3c
Android Build Merger (Role) [Tue, 6 Mar 2018 03:28:59 +0000 (03:28 +0000)]
Merge "Merge changes Iecf8b207,I2f2a05ef into pi-dev am:
081d3d2d89 am:
ab3b6e2fdc"
Dongwon Kang [Tue, 6 Mar 2018 03:28:35 +0000 (03:28 +0000)]
Merge changes Iecf8b207,I2f2a05ef into pi-dev am:
081d3d2d89
am:
ab3b6e2fdc
Change-Id: I7aa7db5adb2984a12adebe85629af2571972dc89
TreeHugger Robot [Tue, 6 Mar 2018 03:26:26 +0000 (03:26 +0000)]
Merge "Refactor cpu stats pullers"
Tej Singh [Tue, 6 Mar 2018 03:17:38 +0000 (03:17 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class" am:
84bda3a709 -s ours am:
f2fdc81f33 -s ours
am:
5455200b3e -s ours
Change-Id: I820bc9c0b4a9ea2c3599e6d8eef4feb2451e2ac0
Tony Mak [Tue, 6 Mar 2018 03:07:13 +0000 (03:07 +0000)]
Merge "Merge "Improve javadocs of some DPM APIs" into pi-dev am:
889cf2e00d" into pi-dev-plus-aosp
am:
38f8558f8f
Change-Id: I7255bcf1b2ac930476877dfa38e3a44eab8684c3
Chen Xu [Tue, 6 Mar 2018 02:37:52 +0000 (02:37 +0000)]
Merge "API review: rename CarrierIdentification to Carrier id" am:
f01600d5f9 am:
ce7404744f
am:
1f56d18fd1
Change-Id: If3f000c6213fb24fc964c8450cfb55a70653b863
TreeHugger Robot [Tue, 6 Mar 2018 02:21:20 +0000 (02:21 +0000)]
Merge "Do not allow ScrimView backgrounds"
Jack He [Tue, 6 Mar 2018 02:19:37 +0000 (02:19 +0000)]
Merge "Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am:
6ec103c746 am:
472ff2a79d" into pi-dev-plus-aosp
am:
bfd4a037b6
Change-Id: I7aade4a7c227208a9d0efaebcd119c6b5823a2bb
TreeHugger Robot [Tue, 6 Mar 2018 02:03:26 +0000 (02:03 +0000)]
Merge "Don't send config change when display is removed"
TreeHugger Robot [Tue, 6 Mar 2018 01:59:14 +0000 (01:59 +0000)]
Merge "Check mMediaProvider for null" into pi-dev
Beverly [Tue, 6 Mar 2018 01:52:39 +0000 (01:52 +0000)]
Merge "Metric constants for dnd system and duration" into pi-dev am:
74cfe56742
am:
748053c856
Change-Id: I146e7e976949b448b4a1041fda04472652d6a65f
Jack He [Tue, 6 Mar 2018 01:46:00 +0000 (01:46 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" into pi-dev
am:
4a3dd2ba58
Change-Id: I048b234c483a74428fdc5ce4c9ded9e2995ae931
Evan Laird [Tue, 6 Mar 2018 01:42:41 +0000 (01:42 +0000)]
Merge "Merge "Move SignalDrawable to SettingsLib so every can enjoy it" am:
2fa0f7964f am:
d9152570b0 -s ours" into pi-dev-plus-aosp
am:
34245e249d -s ours
Change-Id: If4a6925dae1b43b2dca292495408ebf3c5970a87
Mike Digman [Tue, 6 Mar 2018 01:26:59 +0000 (01:26 +0000)]
Merge "Increase rotate suggestion timeout in fullscreen" into pi-dev am:
ea36a69c7c
am:
c27a9db285
Change-Id: Ia59ac0e48740f25f52b6d1252e63eaa1524a10a6
Fyodor Kupolov [Tue, 6 Mar 2018 01:25:42 +0000 (01:25 +0000)]
Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev
am:
d97a0f1ac5
Change-Id: Ide1400a320ec6f3d5428fdfffae613d15319afe3
TreeHugger Robot [Tue, 6 Mar 2018 01:23:57 +0000 (01:23 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" into pi-dev
Android Build Merger (Role) [Tue, 6 Mar 2018 01:17:42 +0000 (01:17 +0000)]
Merge "Merge "Bluetooth: Use enums for adapter connection states" am:
95372e873e am:
8da4504cad" into pi-dev-plus-aosp
Jack He [Tue, 6 Mar 2018 01:17:15 +0000 (01:17 +0000)]
Merge "Bluetooth: Use enums for adapter connection states" am:
95372e873e
am:
8da4504cad
Change-Id: I7e0ed2b7a0b67bb443b9e104a7985e3a9bed96ff
Dongwon Kang [Tue, 6 Mar 2018 01:15:50 +0000 (01:15 +0000)]
Merge changes Iecf8b207,I2f2a05ef into pi-dev
am:
081d3d2d89
Change-Id: If5ac9d3e67a0156f6bbe9397c13e036b3ba9a815
Wei Jia [Tue, 6 Mar 2018 01:08:10 +0000 (01:08 +0000)]
Merge "OWNER: add wjia" into pi-dev am:
0db51ad50e
am:
bc88942540
Change-Id: If80db15fb6fc2650061fbdcd0a8d72a4a0141b81
Tej Singh [Tue, 6 Mar 2018 01:07:22 +0000 (01:07 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class" am:
84bda3a709 -s ours
am:
f2fdc81f33 -s ours
Change-Id: I74e707e09a47c976acfb3c39acdc1c0d53012855
Android Build Merger (Role) [Tue, 6 Mar 2018 01:03:33 +0000 (01:03 +0000)]
Merge "Merge "Improve javadocs of some DPM APIs" into pi-dev am:
889cf2e00d" into pi-dev-plus-aosp
Tony Mak [Tue, 6 Mar 2018 01:03:14 +0000 (01:03 +0000)]
Merge "Improve javadocs of some DPM APIs" into pi-dev
am:
889cf2e00d
Change-Id: I39e374287a4c37dfd644e5b4292f0801070ce6ad
Jack He [Tue, 6 Mar 2018 01:02:52 +0000 (01:02 +0000)]
Merge "Bluetooth: Use enums for adapter connection states"
am:
95372e873e
Change-Id: Iab73a463f99de6113146b6541babe95b512ebbfa
Chen Xu [Tue, 6 Mar 2018 01:00:36 +0000 (01:00 +0000)]
Merge "API review: rename CarrierIdentification to Carrier id" am:
f01600d5f9
am:
ce7404744f
Change-Id: Iad12593f9e027052185f9efcb65a1983dda22a16
Android Build Merger (Role) [Tue, 6 Mar 2018 00:53:07 +0000 (00:53 +0000)]
Merge "Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am:
6ec103c746 am:
472ff2a79d" into pi-dev-plus-aosp
Jack He [Tue, 6 Mar 2018 00:52:47 +0000 (00:52 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am:
6ec103c746
am:
472ff2a79d
Change-Id: Ib6accd1c4ea332eb04ab0246e3e9697c6ba4b4b4
Beverly [Tue, 6 Mar 2018 00:52:43 +0000 (00:52 +0000)]
Merge "Metric constants for dnd system and duration" into pi-dev
am:
74cfe56742
Change-Id: Ia3368c08194e7115d246c371a2f7184679377624
Lucas Dupin [Tue, 6 Mar 2018 00:51:25 +0000 (00:51 +0000)]
Merge "Tint keyguard icons" into pi-dev am:
94e5d34d4e
am:
ce8775f122
Change-Id: Ie390bf220ed7c35f79893fd6f2f13a8575a33e79
Tej Singh [Tue, 6 Mar 2018 00:50:33 +0000 (00:50 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class"
am:
84bda3a709 -s ours
Change-Id: If6a663dc3b9abe19a2cfb18ab5688b401bd2f624
Android Build Merger (Role) [Tue, 6 Mar 2018 00:46:59 +0000 (00:46 +0000)]
Merge "Merge "Move SignalDrawable to SettingsLib so every can enjoy it" am:
2fa0f7964f am:
d9152570b0 -s ours" into pi-dev-plus-aosp
Evan Laird [Tue, 6 Mar 2018 00:46:34 +0000 (00:46 +0000)]
Merge "Move SignalDrawable to SettingsLib so every can enjoy it" am:
2fa0f7964f
am:
d9152570b0 -s ours
Change-Id: I448448c4ee3147f5157e1d2ff1e2af2265fd9d34
Mike Digman [Tue, 6 Mar 2018 00:44:22 +0000 (00:44 +0000)]
Merge "Increase rotate suggestion timeout in fullscreen" into pi-dev
am:
ea36a69c7c
Change-Id: I1ffded01abc15fa57ff62e44d0d7d620674854ab
Chen Xu [Tue, 6 Mar 2018 00:40:19 +0000 (00:40 +0000)]
Merge "API review: rename CarrierIdentification to Carrier id"
am:
f01600d5f9
Change-Id: Ic75f2037d277ccce95b24003b152159c9c37e4fc
Bill Yi [Tue, 6 Mar 2018 00:36:18 +0000 (00:36 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1 am:
c3f0a8e200 am:
659c534a47 am:
0bd7631cea
am:
be35330cfa
Change-Id: Ie4282bfe41e42898858acc4c02149b91884d8c65
Jack He [Tue, 6 Mar 2018 00:35:28 +0000 (00:35 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices"
am:
6ec103c746
Change-Id: I65f257023b7cdc245236e9804f2c0859f4ee1601
Wei Jia [Tue, 6 Mar 2018 00:32:57 +0000 (00:32 +0000)]
Merge "OWNER: add wjia" into pi-dev
am:
0db51ad50e
Change-Id: I86fe5bf078cb69f8a8b8b08027df4bdde141dcee
Evan Laird [Tue, 6 Mar 2018 00:32:49 +0000 (00:32 +0000)]
Merge "Move SignalDrawable to SettingsLib so every can enjoy it"
am:
2fa0f7964f
Change-Id: Id4b60a36c89736fe49e84d4748b4ed643cd21816
Fyodor Kupolov [Tue, 6 Mar 2018 00:28:51 +0000 (00:28 +0000)]
Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev
Bill Yi [Tue, 6 Mar 2018 00:28:00 +0000 (00:28 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours am:
87addf6d04 -s ours am:
dd865d9fe7 -s ours am:
cfad81db08 -s ours
am:
40b8eaa4f0 -s ours
Change-Id: Ic095e547c9f2f8af80433f7e497d96aa09fcefee
TreeHugger Robot [Tue, 6 Mar 2018 00:19:54 +0000 (00:19 +0000)]
Merge changes Iecf8b207,I2f2a05ef into pi-dev
* changes:
Make MP2.prepare|play handled with task queue
Remove unused imports in MediaPlayer2.
Lucas Dupin [Tue, 6 Mar 2018 00:18:28 +0000 (00:18 +0000)]
Merge "Tint keyguard icons" into pi-dev
am:
94e5d34d4e
Change-Id: I2140301e186a475a46aba92f76fdeffe0131570c
Chenjie Yu [Mon, 26 Feb 2018 03:06:21 +0000 (19:06 -0800)]
Refactor cpu stats pullers
use same cpu stats readers with BatteryStats so that
1) both throttle to avoid too frequent pulls
2) cached value is served within throttle interval to avoid double
pulling by both statsd and BatteryStats
To run unit tests:
bit FrameworksCoreTests:com.android.internal.os.KernelUidCpuFreqTimeReaderTest
bit FrameworksCoreTests:com.android.internal.os.KernelUidCpuClusterTimeReaderTest
bit FrameworksCoreTests:com.android.internal.os.KernelUidCpuActiveTimeReaderTest
make -j56 statsd_test && adb sync data && adb shell /data/nativetest64/statsd_test/statsd_test
Test: cts test, unit test
Fix:
73745189
Fix:
73780619
Fix:
73360959
Change-Id: I10a9bc91ca67fa812f4cd71c4fbd73c1a5ba580e
Jeff Gaston [Mon, 5 Mar 2018 23:25:48 +0000 (23:25 +0000)]
Merge "Always get Support Library resources from prebuilts"
Treehugger Robot [Mon, 5 Mar 2018 23:16:21 +0000 (23:16 +0000)]
Merge "Bluetooth: Use enums for adapter connection states"
TreeHugger Robot [Mon, 5 Mar 2018 23:16:14 +0000 (23:16 +0000)]
Merge "Improve javadocs of some DPM APIs" into pi-dev
Treehugger Robot [Mon, 5 Mar 2018 23:14:48 +0000 (23:14 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class"
Jack He [Wed, 28 Feb 2018 03:34:49 +0000 (19:34 -0800)]
Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices
* Set config_bluetooth_max_connected_audio_devices to 5
Bug:
64767509
Test: runtest -j32 bluetooth
connect and disconnect to multiple headsets and car kits
TestTracker/146725
Change-Id: I211c5683490fd4be00d3379e11e843081c6fb3a6
(cherry picked from commit
48574ae23397207279c52daeb9f901a4f194db0d)
Chen Xu [Mon, 5 Mar 2018 22:59:21 +0000 (22:59 +0000)]
Merge "API review: rename CarrierIdentification to Carrier id"
Jerry Zhang [Fri, 2 Mar 2018 23:40:03 +0000 (15:40 -0800)]
Check mMediaProvider for null
Getting the content provider could
return null in some cases where the user
is locked, so check for that when closing.
Bug:
73656609
Test: no crash
Change-Id: I607cd2da5348520616a1c171d0d8a1afacabe592
TreeHugger Robot [Mon, 5 Mar 2018 22:20:31 +0000 (22:20 +0000)]
Merge "Metric constants for dnd system and duration" into pi-dev
Mike Digman [Mon, 5 Mar 2018 22:15:06 +0000 (22:15 +0000)]
Merge "Increase rotate suggestion timeout in fullscreen" into pi-dev
Felipe Leme [Mon, 5 Mar 2018 22:07:20 +0000 (22:07 +0000)]
Merge "Destroy fill UI when app dies."
Zhi An Ng [Mon, 5 Mar 2018 21:38:39 +0000 (21:38 +0000)]
Merge "Add more tests for MemoryStatUtil"
TreeHugger Robot [Mon, 5 Mar 2018 20:43:24 +0000 (20:43 +0000)]
Merge "[QS] Tweak tooltip color & shown count"
Amith Yamasani [Mon, 5 Mar 2018 20:39:04 +0000 (20:39 +0000)]
Revert "Allow restoring of apps that rotated key"
This reverts commit
313d225cd19885979596cf690103a8d77e19c3dc.
Reason for revert: b/
74159113
Change-Id: I483ecdd80d26fca8451cd270b4fcbe34379839cb
Wei Jia [Mon, 5 Mar 2018 20:34:51 +0000 (20:34 +0000)]
Merge "OWNER: add wjia" into pi-dev
Treehugger Robot [Mon, 5 Mar 2018 20:32:37 +0000 (20:32 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices"
Tony Mak [Wed, 28 Feb 2018 14:17:17 +0000 (14:17 +0000)]
Improve javadocs of some DPM APIs
FIX:
70332970
FIX:
73919570
FIX:
67495520
FIX:
71566404
Test: None
Change-Id: Ic9b485ff7c15e0d244cba9e71def8d5c41e52070
(cherry picked from commit
8309c8f7608cea212056ace1cedb8af4df1215e3)
Wei Jia [Mon, 5 Mar 2018 20:15:20 +0000 (12:15 -0800)]
OWNER: add wjia
Test: none
Bug:
63934228
Change-Id: I58fbe0ddd3303cfe8765dac1942cff71e6cbbd9c
Treehugger Robot [Mon, 5 Mar 2018 20:10:37 +0000 (20:10 +0000)]
Merge "Move SignalDrawable to SettingsLib so every can enjoy it"
Jeff Gaston [Mon, 5 Mar 2018 19:59:31 +0000 (14:59 -0500)]
Always get Support Library resources from prebuilts
Support Library is changing its build process (postprocessing
resource files, via Dejetifier), so its resource files won't be
able to be used directly for now.
Bug:
74196535
Test: m -j checkbuild
Change-Id: I856a4f0a2a9972fbc80f3f995eab3bfd40038372
TreeHugger Robot [Mon, 5 Mar 2018 19:49:24 +0000 (19:49 +0000)]
Merge "Improve javadocs of some DPM APIs"
Bill Yi [Mon, 5 Mar 2018 19:38:54 +0000 (19:38 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1 am:
c3f0a8e200 am:
659c534a47
am:
0bd7631cea
Change-Id: If6d4391731069035775d27dcb61f0bbda8fc8613
Mike Digman [Mon, 5 Mar 2018 19:14:39 +0000 (11:14 -0800)]
Increase rotate suggestion timeout in fullscreen
To use the rotate nav button in fullscreen the navbar must
become visible. This normally requires a user gesture which
makes it hard to hit the button given its normal timeout
duration. Make it easier to tap by effectively extending the
timeout if the suggestion is given when the navbar is
invisible.
Test: manual with fullscreen testing app
Change-Id: I54ac3dfb590df9b9a039c53984623497ca18fcb5
TreeHugger Robot [Mon, 5 Mar 2018 19:34:48 +0000 (19:34 +0000)]
Merge "Tint keyguard icons" into pi-dev
Dongwon Kang [Sat, 3 Mar 2018 02:10:49 +0000 (18:10 -0800)]
Make MP2.prepare|play handled with task queue
Test: plays video
Bug:
63934228
Change-Id: Iecf8b2079e87241365ab6b7b7b0a5a669c948427
Beverly [Mon, 5 Mar 2018 19:32:35 +0000 (14:32 -0500)]
Metric constants for dnd system and duration
Test: none
Bug:
73741459
Bug:
73362490
Change-Id: I01b7602e7bd05531c67fbb0c20b4d31ac7f5befe
Bill Yi [Mon, 5 Mar 2018 19:31:52 +0000 (19:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours am:
87addf6d04 -s ours am:
dd865d9fe7 -s ours
am:
cfad81db08 -s ours
Change-Id: I54f1f1bff569905cc0287293c4e7b832604d91ec
Jack He [Fri, 2 Mar 2018 21:11:27 +0000 (13:11 -0800)]
Bluetooth: Use enums for adapter connection states
Bug:
69478930
Test: make, no user visible change
Change-Id: I999d0c445fe3b24aca72961c40c3428901542bc1
Bill Yi [Mon, 5 Mar 2018 19:14:08 +0000 (19:14 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1 am:
c3f0a8e200
am:
659c534a47
Change-Id: I25798e2a43ed487320bd408a154140392a72f9cb
Dongwon Kang [Fri, 2 Mar 2018 18:08:53 +0000 (10:08 -0800)]
Remove unused imports in MediaPlayer2.
Test: build.
Change-Id: I2f2a05ef4fc41d14f91e6805217852adf5bbb28e
Bill Yi [Mon, 5 Mar 2018 19:07:26 +0000 (19:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours am:
87addf6d04 -s ours
am:
dd865d9fe7 -s ours
Change-Id: Idd316e6f5de4640ae1c4521fb817a181e00cfc63
Julia Reynolds [Mon, 5 Mar 2018 19:05:11 +0000 (19:05 +0000)]
Merge "Metrics for DND suppressed visual effects" into pi-dev am:
343c2157fc
am:
a673eca7db
Change-Id: I8b1e72fcafcf0ac9728b15ab209698193e237eb3
Bill Yi [Mon, 5 Mar 2018 19:01:28 +0000 (19:01 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1
am:
c3f0a8e200
Change-Id: Ia23c96b2880f13df80c3955c5acb0822bb6f2dd9
TreeHugger Robot [Mon, 5 Mar 2018 18:58:43 +0000 (18:58 +0000)]
Merge "Don't dereference a null pointer"
Adrian Roos [Mon, 5 Mar 2018 18:58:02 +0000 (18:58 +0000)]
DisplayCutout API: Make constructor public and adjust javadoc am:
9bbd9661c0
am:
573b1d11a6
Change-Id: Ib383e808d9a725894c17b2068fbd6cc83c128dd1
Bill Yi [Mon, 5 Mar 2018 18:56:01 +0000 (18:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours
am:
87addf6d04 -s ours
Change-Id: I0cb81b26368af76cfef8b4104df9ac0722f1ac3f
Jerry Zhang [Mon, 5 Mar 2018 18:45:00 +0000 (18:45 +0000)]
Merge "Update UsbHandlerTests"
Julia Reynolds [Mon, 5 Mar 2018 18:40:49 +0000 (18:40 +0000)]
Merge "Metrics for DND suppressed visual effects" into pi-dev
am:
343c2157fc
Change-Id: I703cf421a364449f0642dfc5fde06c3505152ffd
Bill Yi [Mon, 5 Mar 2018 18:37:15 +0000 (18:37 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev
am:
99cc6cb2a1
Change-Id: I618380bb159e5f394fabcc9ff69bde6f2d0679d5
Bill Yi [Mon, 5 Mar 2018 18:35:22 +0000 (18:35 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
am:
4532cd3395 -s ours
Change-Id: Ia8e72bfd84aeb59e7138e04f943abd73fd1cceb9
Adrian Roos [Mon, 5 Mar 2018 18:34:50 +0000 (18:34 +0000)]
DisplayCutout API: Make constructor public and adjust javadoc
am:
9bbd9661c0
Change-Id: Ia8cff9659b65e03a4a03af7f28939fa1712a2cb2
Rohan Shah [Mon, 5 Mar 2018 18:00:10 +0000 (10:00 -0800)]
Filter out detached views from touch
Views that are detached shouldn't get touch events/start getting
animated (They can't be animated).
Added filter to stream to remove these views from consideration for the
nearest touch frame algo.
Test: Visually + unit test
Bug:
65146195
Change-Id: I74df495a7c02d3d46cd6784f0950c48b5311819e
Richard Ledley [Mon, 5 Mar 2018 18:09:58 +0000 (18:09 +0000)]
Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P."
TreeHugger Robot [Mon, 5 Mar 2018 18:05:19 +0000 (18:05 +0000)]
Merge "Display shortcut modifiers in menu"
TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 5 Mar 2018 17:50:57 +0000 (17:50 +0000)]
Merge "Metrics for DND suppressed visual effects" into pi-dev
Lucas Dupin [Sat, 3 Mar 2018 22:05:04 +0000 (14:05 -0800)]
Tint keyguard icons
Test: visual
Change-Id: I7915c4ad1cd4bcb852a7bdd68e9f57fda7f985c6
Fixes:
71599427
(cherry picked from commit
914b708645f3f183719dd53623900a1609c6579b)
Julia Reynolds [Mon, 5 Mar 2018 17:21:17 +0000 (17:21 +0000)]
Merge "Revert "Metric constant for dnd system toggle""
Julia Reynolds [Mon, 5 Mar 2018 17:20:09 +0000 (17:20 +0000)]
Revert "Metric constant for dnd system toggle"
This reverts commit
8c3342b3da78e5afa7a0133018247355c89ec424.
Change-Id: I768a53aec1fd7b9f6fbaa206e36d28617ae945c6
Lucas Dupin [Mon, 5 Mar 2018 17:05:08 +0000 (17:05 +0000)]
Merge "Tint keyguard icons"
TreeHugger Robot [Mon, 5 Mar 2018 16:24:34 +0000 (16:24 +0000)]
Merge "Metric constant for dnd system toggle"
OSDN Git Service
