OSDN Git Service
Amin Shaikh [Tue, 13 Mar 2018 17:34:02 +0000 (17:34 +0000)]
Merge "Show the H+ icon in HSPA+ network" into pi-dev
am:
b90670cf17
Change-Id: I17da2913c86c6a489ee2d31785a7518346710e14
Sundeep Ghuman [Tue, 13 Mar 2018 17:22:50 +0000 (17:22 +0000)]
Merge "Add tests to prevent NPE regression." into pi-dev
am:
4c6130ddcc
Change-Id: I5693435ef084cf66175e666aef27dcc292717dd3
TreeHugger Robot [Tue, 13 Mar 2018 17:12:37 +0000 (17:12 +0000)]
Merge "Show the H+ icon in HSPA+ network" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 16:59:52 +0000 (16:59 +0000)]
Merge "Add tests to prevent NPE regression." into pi-dev
dalyk [Tue, 13 Mar 2018 16:12:25 +0000 (16:12 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state." into pi-dev
am:
fd36a5ddea -s ours
Change-Id: If4aa6719dbd83a6ce3c2a274e894dd97536c5419
Jorim Jaggi [Tue, 13 Mar 2018 16:04:52 +0000 (16:04 +0000)]
Merge "Improve animation dump/logging" into pi-dev
am:
bc57bf307c
Change-Id: I5ec242fbfeb9ea6ae0be7d744c9ec54ea0e10ec8
Jorim Jaggi [Tue, 13 Mar 2018 15:56:52 +0000 (15:56 +0000)]
Merge "Fix SafeActivityOptions construction in startActivityFromRecents" into pi-dev
am:
0ee147406d
Change-Id: Ie005cb0fadc33748cd3e0930be2d45af25200afa
TreeHugger Robot [Tue, 13 Mar 2018 15:49:47 +0000 (15:49 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state." into pi-dev
Jorim Jaggi [Tue, 13 Mar 2018 15:35:51 +0000 (15:35 +0000)]
Merge "Improve animation dump/logging" into pi-dev
Jorim Jaggi [Tue, 13 Mar 2018 15:34:52 +0000 (15:34 +0000)]
Merge "Fix SafeActivityOptions construction in startActivityFromRecents" into pi-dev
Bernardo Rufino [Tue, 13 Mar 2018 14:35:00 +0000 (14:35 +0000)]
Merge "Add tests for TransportStats and some refactor" into pi-dev
am:
5dbde05f06
Change-Id: Ic8b377e659ffda4927b002064982213ca5d7c1c8
TreeHugger Robot [Tue, 13 Mar 2018 14:18:30 +0000 (14:18 +0000)]
Merge "Add tests for TransportStats and some refactor" into pi-dev
Jason Monk [Tue, 13 Mar 2018 14:05:56 +0000 (14:05 +0000)]
Merge "Run slice callbacks on thread they come in on" into pi-dev
am:
a033fa7fdc
Change-Id: Ibb4ff6fc540f50e585ed0dcbb5e7eb25a472ce69
TreeHugger Robot [Tue, 13 Mar 2018 13:54:18 +0000 (13:54 +0000)]
Merge "Run slice callbacks on thread they come in on" into pi-dev
dalyk [Thu, 8 Mar 2018 21:25:48 +0000 (16:25 -0500)]
Add new netd event callback for changes to private DNS validation state.
Test: None.
Bug:
71828272
Merged-In: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
Merged-In: Id88a4e846ae50536ac7b1541cf10c1fad1b1eeca
Change-Id: Ibf2683b9ff7c6cb69d7f4ad12b8bdff7cf7008f0
(cherry picked from commit
99c5029b91f17c46acd219a317b48b3ac0fe9a90)
Adrian Roos [Tue, 13 Mar 2018 13:39:07 +0000 (13:39 +0000)]
Merge changes Iff142ccd,I724080ed into pi-dev
am:
7844159deb
Change-Id: Ia02e8c988b97023079c3bfac57da338b64d3dd37
Jorim Jaggi [Fri, 9 Mar 2018 17:14:48 +0000 (18:14 +0100)]
Fix SafeActivityOptions construction in startActivityFromRecents
Otherwise we'll check the wrong permissions and try to boost
the wrong process.
Test: Open app from recents, make sure Launcher gets scheduled
as needed.
Bug:
73555925
Change-Id: I2d1a7d0c881c0182127a5b25dce0ab1a308d5e63
Erik Kline [Tue, 13 Mar 2018 13:23:08 +0000 (13:23 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state." am:
40ca5a06bf
am:
5e9725bdc7
Change-Id: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
Adrian Roos [Tue, 13 Mar 2018 13:21:17 +0000 (13:21 +0000)]
Merge changes Iff142ccd,I724080ed into pi-dev
* changes:
Multi cutout: Fix IME navigation guard
Multi Cutout: Fix more cutout issues
Erik Kline [Tue, 13 Mar 2018 13:11:37 +0000 (13:11 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state."
am:
40ca5a06bf
Change-Id: I504148b6a508b6f5e4b5dfa0976362496b91c15c
Jorim Jaggi [Tue, 27 Feb 2018 14:05:21 +0000 (15:05 +0100)]
Improve animation dump/logging
Bug:
74220420
Test: go/wm-smoke
Test: adb shell dumpsys window during animation
Change-Id: Ib8bddb4f38ad4fe7a80315d3bfdac0a80aea4cc8
Julia Reynolds [Tue, 13 Mar 2018 12:42:11 +0000 (12:42 +0000)]
Merge "Volume UI updates" into pi-dev
am:
89c4bd5f26
Change-Id: Idcc2eb1c020b86a13de4948215b4a8311ea7fff4
Hyundo Moon [Tue, 13 Mar 2018 12:26:01 +0000 (12:26 +0000)]
Merge "MediaSession2: Replace PlaybackState2" into pi-dev
am:
15d3ba624c
Change-Id: I184df5f20021ae602fae9411663c97185c1329e5
TreeHugger Robot [Tue, 13 Mar 2018 12:17:30 +0000 (12:17 +0000)]
Merge "Volume UI updates" into pi-dev
Hyundo Moon [Tue, 13 Mar 2018 12:03:55 +0000 (12:03 +0000)]
Merge "MediaSession2: Replace PlaybackState2" into pi-dev
Erik Kline [Tue, 13 Mar 2018 11:58:19 +0000 (11:58 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state."
Christofer Åkersten [Tue, 13 Mar 2018 11:16:50 +0000 (11:16 +0000)]
Merge "Ensure members are non-null in callback" into pi-dev
am:
f0927b0726
Change-Id: I15359e1ee1f5e79d29bd4408f8eb56dcf93cfd39
Leon Scroggins [Tue, 13 Mar 2018 11:00:26 +0000 (11:00 +0000)]
Merge "Encode F16 Bitmaps to 8-bit P3" into pi-dev
am:
5a0b48a13d
Change-Id: Iea3b44fcb680f1632d02595886d18145d61cf0f4
TreeHugger Robot [Tue, 13 Mar 2018 11:00:25 +0000 (11:00 +0000)]
Merge "Ensure members are non-null in callback" into pi-dev
Tony Mak [Tue, 13 Mar 2018 10:46:04 +0000 (10:46 +0000)]
Merge "Use the correct drawable to badge user icon" into pi-dev
am:
fd95ca6d2e
Change-Id: Ibd02faa61bd0e94039443d6242a706e4ed5b46b6
Leon Scroggins [Tue, 13 Mar 2018 10:40:25 +0000 (10:40 +0000)]
Merge "Encode F16 Bitmaps to 8-bit P3" into pi-dev
Tej Singh [Tue, 13 Mar 2018 10:37:43 +0000 (10:37 +0000)]
Merge "Atoms: Bluetooth" into pi-dev
am:
c154be5591
Change-Id: Ia6ca344d94ae67655116f219d5cda0f2d0a16354
TreeHugger Robot [Tue, 13 Mar 2018 10:24:15 +0000 (10:24 +0000)]
Merge "Use the correct drawable to badge user icon" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 10:22:28 +0000 (10:22 +0000)]
Merge "Atoms: Bluetooth" into pi-dev
Hyundo Moon [Wed, 7 Mar 2018 01:22:45 +0000 (10:22 +0900)]
MediaSession2: Replace PlaybackState2
This CL removes PlaybackState2 and replaces it with other APIs.
Bug:
74370608, Bug:
73971431
Test: Passed CTS
Change-Id: Ifa16b1d551957ab4bb06979ddf29b18772093035
Christofer Åkersten [Tue, 13 Mar 2018 04:30:06 +0000 (13:30 +0900)]
Ensure members are non-null in callback
Bug:
74570008
Test: runtest-cts-MediaComponents -r 100
Change-Id: I59590afae4e67fa8a90f8a7b4a6be58ce54e2806
Jovana Knezevic [Tue, 13 Mar 2018 05:42:40 +0000 (05:42 +0000)]
Merge "Removing the countdown timer and countdown progress bar from the Car User Picker." into pi-dev
am:
660a7639ca
Change-Id: I31f7ca3cdb55196df319e0e3aff9f348d7246e22
Jovana Knezevic [Tue, 13 Mar 2018 05:26:21 +0000 (05:26 +0000)]
Merge "Removing the countdown timer and countdown progress bar from the Car User Picker." into pi-dev
Jaewan Kim [Tue, 13 Mar 2018 05:19:26 +0000 (05:19 +0000)]
Merge changes from topics "session2_additem", "session2_playlistmetadata", "session2_getplaylist" into pi-dev
am:
c3efa17bdd
Change-Id: Ief5747c903ef745dc29142d3543e95945a8fcccd
Jaewan Kim [Tue, 13 Mar 2018 05:12:26 +0000 (05:12 +0000)]
MediaSession2: Implement update/getPlaylistMetadata()
am:
dc5ab8095a
Change-Id: I5cb92995715ec305cbc54b1985505889187eed18
Jaewan Kim [Tue, 13 Mar 2018 05:05:29 +0000 (05:05 +0000)]
MediaSession2: Implement get/setPlaylist()
am:
25db3cdb93
Change-Id: I64674815c02077f90a406657b4cf17199bbfa8e8
Robert Carr [Tue, 13 Mar 2018 04:46:17 +0000 (04:46 +0000)]
Merge "WindowState: Update mLastSurfaceInsets at creation time." into pi-dev
am:
9f0111c82a
Change-Id: I5d9d868ac6d1089f8442ddda04291d786cd1f83d
Jiyong Park [Tue, 13 Mar 2018 04:39:10 +0000 (04:39 +0000)]
Merge "Limit the systemconfig tags allowed to vendors" into pi-dev
am:
75029d0dbc
Change-Id: I83a2ce726c90865405099e3ecfbc2df9efede12e
Jaewan Kim [Tue, 13 Mar 2018 04:30:50 +0000 (04:30 +0000)]
Merge changes from topics "session2_additem", "session2_playlistmetadata", "session2_getplaylist" into pi-dev
* changes:
MediaSession2: Implement add/remove/replacePlaylistItem()
MediaSession2: Implement update/getPlaylistMetadata()
MediaSession2: Implement get/setPlaylist()
Kevin Chyn [Tue, 13 Mar 2018 04:28:54 +0000 (04:28 +0000)]
Merge "Update FingerprintDialog UI for landscape orientation" into pi-dev
am:
3690effd2d
Change-Id: I6ce3cccf88532cb473c65fa43c75fde7734616fe
TreeHugger Robot [Tue, 13 Mar 2018 04:09:33 +0000 (04:09 +0000)]
Merge "WindowState: Update mLastSurfaceInsets at creation time." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 04:08:33 +0000 (04:08 +0000)]
Merge "Limit the systemconfig tags allowed to vendors" into pi-dev
Kevin Chyn [Tue, 13 Mar 2018 04:06:27 +0000 (04:06 +0000)]
Merge "Update FingerprintDialog UI for landscape orientation" into pi-dev
Tej Singh [Sat, 10 Mar 2018 03:48:11 +0000 (19:48 -0800)]
Atoms: Bluetooth
Adds atom defininitions for some bluetooth atoms.
Logging will go in aosp. ag/
3668205 contained most of this change, but
is being split up and moved to pi-dev and aosp.
Bug:
74457175,
72320489
Test: build success on marlin
Change-Id: Ib14a74eabfab08bbae5d4d549244f1022e8c34f0
Sunny Goyal [Tue, 13 Mar 2018 03:38:23 +0000 (03:38 +0000)]
Merge "Passing the TaskDescription to the IconLoader" into pi-dev
am:
70d4ddece8
Change-Id: Ib2fc996edb48cf0b20a441f5855a3b375b8ba99e
Marco Nelissen [Tue, 13 Mar 2018 03:30:44 +0000 (03:30 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174 am:
b3f50c9ccb -s ours am:
b50ae71d99 -s ours am:
21e5aeefce -s ours
am:
ea89e69989 -s ours
Change-Id: I396c3978af05807c1d99d675e75c7ff9c7b68101
Lucas Dupin [Tue, 13 Mar 2018 03:16:35 +0000 (03:16 +0000)]
Merge "Do not darken scrims when unlocking with fp" into pi-dev
am:
05b3d95b65
Change-Id: I35205e0b1e3ec5d1728826028ea88a230fb174fb
TreeHugger Robot [Tue, 13 Mar 2018 03:14:59 +0000 (03:14 +0000)]
Merge "Passing the TaskDescription to the IconLoader" into pi-dev
Chong Zhang [Tue, 13 Mar 2018 03:09:15 +0000 (03:09 +0000)]
Merge "heif: add option for specifying bitmap pixel format" into pi-dev
am:
8807436378
Change-Id: If65fcb4cced51af04bdecd58fc27799dc8483b10
Jaewan Kim [Mon, 12 Mar 2018 09:04:17 +0000 (18:04 +0900)]
MediaSession2: Implement add/remove/replacePlaylistItem()
Bug:
73149584
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I29804f52eaca45de21fd66634e4eeee2c72a9a25
Jaewan Kim [Mon, 12 Mar 2018 01:49:28 +0000 (10:49 +0900)]
MediaSession2: Implement update/getPlaylistMetadata()
Bug:
74174649
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I3ac2dabfc7f532bf7d7262940e3dc309e97fd45a
Marco Nelissen [Tue, 13 Mar 2018 02:51:06 +0000 (02:51 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174 am:
b3f50c9ccb -s ours am:
b50ae71d99 -s ours
am:
21e5aeefce -s ours
Change-Id: Ib0d77d48f378c8fc345c3c50e2be8d41cd4b28db
Jaewan Kim [Thu, 8 Mar 2018 13:17:11 +0000 (22:17 +0900)]
MediaSession2: Implement get/setPlaylist()
Bug:
74326040
Test: Run CtsMediaTests for MediaSession2
Change-Id: Ib799c03edd2f79c6f9ffa989aea1137018ec55b3
Kevin Chyn [Tue, 13 Mar 2018 02:42:51 +0000 (02:42 +0000)]
Merge "Fingerprint should check current client when task stack changes" into pi-dev
am:
07c1cc1f4f
Change-Id: I6cb45c3781db90265bf8651e060f8175e4ee7105
TreeHugger Robot [Tue, 13 Mar 2018 02:40:26 +0000 (02:40 +0000)]
Merge "Do not darken scrims when unlocking with fp" into pi-dev
Bryce Lee [Tue, 13 Mar 2018 02:33:07 +0000 (02:33 +0000)]
Merge "Use isKeyguardLocked to determine whether to resume." into pi-dev
am:
5796ab29e6
Change-Id: Ib50cc7dd3e514321d4251cca1fb6fef8f9af13cd
Marco Nelissen [Tue, 13 Mar 2018 02:29:45 +0000 (02:29 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174 am:
b3f50c9ccb -s ours
am:
b50ae71d99 -s ours
Change-Id: Ic18f8e6449d4310924bac6a40acff9df4d743dc6
TreeHugger Robot [Tue, 13 Mar 2018 02:29:25 +0000 (02:29 +0000)]
Merge "heif: add option for specifying bitmap pixel format" into pi-dev
Marco Nelissen [Tue, 13 Mar 2018 02:11:30 +0000 (02:11 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174
am:
b3f50c9ccb -s ours
Change-Id: I1b214134e879310733ee40b138c29cfc0a78b32e
Jeff Davidson [Tue, 13 Mar 2018 02:11:29 +0000 (02:11 +0000)]
Merge "Allow carrier-privileged apps to access voicemail provider." into pi-dev
am:
0dba1eecd8
Change-Id: I2dd4da54be3e9b426282b5e1abddf645ab870df3
Kevin Chyn [Tue, 13 Mar 2018 02:04:59 +0000 (02:04 +0000)]
Merge "Fingerprint should check current client when task stack changes" into pi-dev
Jeff Davidson [Tue, 13 Mar 2018 02:03:22 +0000 (02:03 +0000)]
Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." into pi-dev
am:
bccb356c70
Change-Id: I08f434646119a02ec4a37f71a9484fa561c327bd
Bryce Lee [Tue, 13 Mar 2018 01:44:52 +0000 (01:44 +0000)]
Merge "Use isKeyguardLocked to determine whether to resume." into pi-dev
Bryce Lee [Mon, 12 Mar 2018 16:04:44 +0000 (09:04 -0700)]
Use isKeyguardLocked to determine whether to resume.
Previously, we used isKeyguardActive to determine whether we should
resume an activity. This does not account for the keyguard going
away, which can leads to a timing issue where we do not resume an
activity when coming out of sleep from fingerprint unlock.
This change also prevents us from pausing a stopped activity that is
is considered to be the resumed activity as it will be brought to
the resumed state.
Fixes:
73991496
Test: Open display settings, lock screen, fingerprint unlock, press
back, verify main settings page is shown immediately.
Change-Id: I3a7a33f5359a41fc958e3d8e799c39f5193ecb56
TreeHugger Robot [Tue, 13 Mar 2018 01:41:35 +0000 (01:41 +0000)]
Merge "Allow carrier-privileged apps to access voicemail provider." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 01:41:35 +0000 (01:41 +0000)]
Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." into pi-dev
Andrii Kulian [Tue, 13 Mar 2018 01:21:25 +0000 (01:21 +0000)]
Merge "Don't throw exception for duplicate resume" into pi-dev
am:
ee83dd2cd0
Change-Id: I91a3009cd6e81632f203659c21c261b00e417e15
Android Build Merger (Role) [Tue, 13 Mar 2018 01:09:41 +0000 (01:09 +0000)]
Merge "Merge "Support Dynamic ImsService Querying" am:
6fc1a2f0d4 am:
5984254b27" into pi-dev-plus-aosp
Brad Ebinger [Tue, 13 Mar 2018 01:08:18 +0000 (01:08 +0000)]
Merge "Support Dynamic ImsService Querying" am:
6fc1a2f0d4
am:
5984254b27
Change-Id: I4d7e9ba630739ade83e3242488f330ea6e73bbd7
Dongwon Kang [Tue, 13 Mar 2018 01:05:08 +0000 (01:05 +0000)]
Merge "Make MP2 operations asynchronous and send matching notifications" into pi-dev
am:
2b83982b2b
Change-Id: I4ad98268bcd594ca39a3d08824c845e339f73741
Brad Ebinger [Tue, 13 Mar 2018 00:56:32 +0000 (00:56 +0000)]
Merge "Support Dynamic ImsService Querying"
am:
6fc1a2f0d4
Change-Id: I8cfa3ae7197b135cf59085db5e8d452949346758
TreeHugger Robot [Tue, 13 Mar 2018 00:49:52 +0000 (00:49 +0000)]
Merge "Remove test/* from API stubs jars generation." into pi-dev-plus-aosp
Marco Nelissen [Tue, 13 Mar 2018 00:44:07 +0000 (00:44 +0000)]
Merge "Rework thumbnail cleanup" into oc-dr1-dev am:
30755424d1 -s ours am:
ca4a879f9d -s ours
am:
b44e3b1799 -s ours
Change-Id: Ib1ee271c54b02f1a350d27117535f075b334f130
Alan Viverette [Tue, 13 Mar 2018 00:32:45 +0000 (00:32 +0000)]
Merge "Migrate multidex to androidx" into pi-dev
am:
b5837d14c2
Change-Id: I9d1193b1387c6160daa57fd1f4c2812b3bf63824
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:54 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174
Change-Id: I9749a1bacc983ee7fff06649f55d9b91d8df54ac
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:44 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68
Change-Id: If81e264d57c533a12e270c197e99a31c895fa2dd
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:33 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94
Change-Id: Ibd9203bd7f91b9d25aaf497239e52e81bf18c295
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:25 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c
Change-Id: I36851ba644feb11c57aff0fe6bb218f5c6f14be4
Android Build Merger (Role) [Tue, 13 Mar 2018 00:23:52 +0000 (00:23 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1
Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1
Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]
Rework thumbnail cleanup
Bug:
63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Andrii Kulian [Tue, 13 Mar 2018 00:21:26 +0000 (00:21 +0000)]
Merge "Don't throw exception for duplicate resume" into pi-dev
Chen Xu [Tue, 13 Mar 2018 00:20:17 +0000 (00:20 +0000)]
Merge "Carrier id api rename" into pi-dev
am:
f78767d2f9
Change-Id: If619579e7c3bba865754b07909bc8864efd6c78b
TreeHugger Robot [Tue, 13 Mar 2018 00:09:02 +0000 (00:09 +0000)]
Merge "Make MP2 operations asynchronous and send matching notifications" into pi-dev
Adrian Roos [Mon, 12 Mar 2018 23:45:20 +0000 (23:45 +0000)]
Merge "DisplayCutout: Support more than one cutout" into pi-dev
am:
5d92e72482
Change-Id: Iadeec00a6863e307f061763d6ba7fdffb12d225d
Marco Nelissen [Mon, 12 Mar 2018 23:44:52 +0000 (23:44 +0000)]
Merge "Rework thumbnail cleanup" into oc-dr1-dev am:
30755424d1 -s ours
am:
ca4a879f9d -s ours
Change-Id: I33c98cf6058de6d52928a73a3fce7d5d7fcab5bd
Kevin Chyn [Mon, 12 Mar 2018 21:42:17 +0000 (14:42 -0700)]
Update FingerprintDialog UI for landscape orientation
Fixes:
73818869
Test: tested with modified FingerprintDialog apk
Change-Id: I59664669920c1dfaf3446b68c42de6d9dda83acc
Marco Nelissen [Mon, 12 Mar 2018 23:39:16 +0000 (23:39 +0000)]
[automerger] Rework thumbnail cleanup am:
82a2a87474 am:
97eb9d056a skipped:
cb9dd5d0e6 am:
ddfcb07714 -s ours am:
7e7681f7c3 -s ours am:
36f77be954 -s ours
am:
661ab62146 -s ours
Change-Id: I80b3ca2629301622de4857e9ddf56e297ff4eec4
Marco Nelissen [Mon, 12 Mar 2018 23:30:48 +0000 (23:30 +0000)]
Merge "Rework thumbnail cleanup" into oc-dr1-dev
am:
30755424d1 -s ours
Change-Id: I0246cd0dcb70293c1c183086334fcdea77d0a604
Beverly Tai [Mon, 12 Mar 2018 23:28:58 +0000 (23:28 +0000)]
Merge "Using zen duration preference" into pi-dev
am:
75431913ef
Change-Id: Ic50e017f72e520da141580227648a7e639cc8cea
Abodunrinwa Toki [Mon, 12 Mar 2018 23:20:56 +0000 (23:20 +0000)]
Merge "TextClassifierService.onSelectionEvent" into pi-dev
am:
197ea9e3a5
Change-Id: I2dc4e4b43ca55d45ae97f852a93458b5a2b7dbb9
David Brazdil [Mon, 12 Mar 2018 23:16:24 +0000 (23:16 +0000)]
Merge "Add more APIs on hidden API light greylist" into pi-dev
am:
34cc187561
Change-Id: I242e26f3bedff68c2e2f54ff2e1ebaf745454102
Alan Viverette [Mon, 12 Mar 2018 23:15:51 +0000 (23:15 +0000)]
Merge "Migrate multidex to androidx" into pi-dev
Lucas Dupin [Mon, 12 Mar 2018 18:08:31 +0000 (11:08 -0700)]
Do not darken scrims when unlocking with fp
Scrims would darken because notification panel would collapse.
Introduced a method to ignore the panel expansion.
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Test: unlock with fp from bouncer and AOD
Test: pull down QS after unlocking, look at scrims
Fixes:
74426737
Change-Id: I94f4a3f3b5ea1eed709c853d945e646cd3f41f78
Marco Nelissen [Mon, 12 Mar 2018 23:12:10 +0000 (23:12 +0000)]
Merge "Rework thumbnail cleanup" into oc-dr1-dev
Android Build Merger (Role) [Mon, 12 Mar 2018 23:07:52 +0000 (23:07 +0000)]
Merge "Merge "Remove getDefaultSim hidden api" am:
fdf4dd7928 am:
083986303a" into pi-dev-plus-aosp
OSDN Git Service
