Commit Graph

542466 Commits

Author SHA1 Message Date
Lyn Han
b539797234 Auto-expand bubble for priority notif
Fixes: 157072044
Test: Bubble expands after Silent/Default notif marked Priority

Merged-In: I9f6104d88693144d7e247c05a6a41ed216d0eef0
Change-Id: I9f6104d88693144d7e247c05a6a41ed216d0eef0
2020-06-19 23:21:21 +00:00
TreeHugger Robot
e155e7be7f Merge "Don't show IME on power menu popups" into rvc-dev am: 2801d98bfa am: fc4d505192 am: 2f21ab3e7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936019

Change-Id: If4914f41da87df5cb63f6ee2415ad35ade1ad79e
2020-06-19 23:20:40 +00:00
TreeHugger Robot
144298c8ec Merge "Statsd notif logs: important conversations." into rvc-dev am: 263c7f9bc1 am: 9f2ca7567b am: 58c5521712
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931359

Change-Id: I09d31c7e84510f974dacf667fd8ebe97d7d01d35
2020-06-19 23:20:30 +00:00
Winson Chung
e5c9d58ebc Merge "Fix issue with" into rvc-dev am: a1596ea543 am: f0b669056a am: fc8e80d01d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933639

Change-Id: I0bb2af3db51ec99eda79eb941c0eeb17938c901e
2020-06-19 23:19:31 +00:00
Automerger Merge Worker
eb87819d96 Merge "Merge "Fix file descriptor ownership." am: 72376bf05d am: c495455b80" into rvc-dev-plus-aosp am: 62e0c8cd6b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344037

Change-Id: I6ec3dbf32aaf5f3b3a1b385ac2c298dc24884329
2020-06-19 23:08:51 +00:00
TreeHugger Robot
254c27bc25 Merge "Don't show IME on power menu popups" into rvc-dev am: 2801d98bfa am: 71d0d7e77e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936019

Change-Id: If6a3b368b048bb22bdef86dab02721d6df058cc6
2020-06-19 23:08:33 +00:00
TreeHugger Robot
1fdc92be6c Merge "Statsd notif logs: important conversations." into rvc-dev am: 263c7f9bc1 am: c10dd8bbca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931359

Change-Id: I18a2fd829205844bca412648d9ad6ec4f711106b
2020-06-19 23:08:15 +00:00
TreeHugger Robot
2bca6ebd69 Merge "Don't show IME on power menu popups" into rvc-dev am: 2801d98bfa am: fc4d505192
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936019

Change-Id: Id7b7e198e03d532fa87b383126a3a3737a07aedb
2020-06-19 23:07:40 +00:00
TreeHugger Robot
2f21ab3e7c Merge "Don't show IME on power menu popups" into rvc-dev am: 2801d98bfa am: fc4d505192
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936019

Change-Id: I57bf335d074b84b2722ffc35c0d8d3fb30a5c2c2
2020-06-19 23:07:39 +00:00
Automerger Merge Worker
ace86bd554 Merge "Merge "Fix issue with" into rvc-dev am: a1596ea543 am: 89dc94eba9" into rvc-d1-dev-plus-aosp 2020-06-19 23:07:32 +00:00
Winson Chung
bfc4517289 Merge "Fix issue with" into rvc-dev am: a1596ea543 am: 89dc94eba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933639

Change-Id: If3d4570a85dabd138fddd3eff1e75f75984bdfa7
2020-06-19 23:07:21 +00:00
TreeHugger Robot
8097bc3a58 Merge "Statsd notif logs: important conversations." into rvc-dev am: 263c7f9bc1 am: 9f2ca7567b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931359

Change-Id: If2fdc5c58b29685fa3853d9ffa4295492564971a
2020-06-19 23:07:18 +00:00
TreeHugger Robot
58c5521712 Merge "Statsd notif logs: important conversations." into rvc-dev am: 263c7f9bc1 am: 9f2ca7567b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931359

Change-Id: Ic52844ac188c05e1e613c5aa15179621057137c2
2020-06-19 23:07:18 +00:00
Winson Chung
2d3f656073 Merge "Fix issue with" into rvc-dev am: a1596ea543 am: f0b669056a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933639

Change-Id: I810b33f0f71c2fa85c6bc04bd297e88066c30813
2020-06-19 23:07:02 +00:00
Winson Chung
fc8e80d01d Merge "Fix issue with" into rvc-dev am: a1596ea543 am: f0b669056a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933639

Change-Id: I0d024bdfea526274b1412e23e11878c96d66c833
2020-06-19 23:07:00 +00:00
Automerger Merge Worker
62e0c8cd6b Merge "Merge "Fix file descriptor ownership." am: 72376bf05d am: c495455b80" into rvc-dev-plus-aosp 2020-06-19 23:00:39 +00:00
TreeHugger Robot
71d0d7e77e Merge "Don't show IME on power menu popups" into rvc-dev am: 2801d98bfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936019

Change-Id: Idd8646378e321324bc7f137fb8970ce65df1face
2020-06-19 23:00:31 +00:00
Josh Gao
7522b463fa Merge "Fix file descriptor ownership." am: 72376bf05d am: c495455b80
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344037

Change-Id: Ic0209450f65f516a2a02ac3d8d9c87f2a38d975a
2020-06-19 23:00:30 +00:00
TreeHugger Robot
fc4d505192 Merge "Don't show IME on power menu popups" into rvc-dev am: 2801d98bfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936019

Change-Id: I7680076ffb75829390e25f8c3c15221edeb05138
2020-06-19 23:00:29 +00:00
TreeHugger Robot
f8fcd83cd5 Merge "Updated NotificationPanelViewController to listen to animateExpandNotificationsPanel and animateCollapsePanels." into rvc-dev am: 489dd7154c am: 4eaf0a6694 am: 88620f039f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921452

Change-Id: I4a86ab9bc110135750c77e4827cf2fc47ed26586
2020-06-19 22:58:51 +00:00
TreeHugger Robot
2549b71227 Merge "Updated NotificationPanelViewController to listen to animateExpandNotificationsPanel and animateCollapsePanels." into rvc-dev am: 489dd7154c am: 10fa646785 am: ec78b9c995
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921452

Change-Id: Id5be30a8d1b65d71b86eca3629a19b93fe0766c4
2020-06-19 22:58:27 +00:00
Josh Tsuji
fa7c945455 Merge "Pass resize touch events to the touch state." into rvc-dev am: 9d431fbc70 am: b9f003b04f am: 62cb0f6acc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916196

Change-Id: Ifbe6d1a9a6d0055af9bc359574b9b58d9440c5dd
2020-06-19 22:57:58 +00:00
Josh Tsuji
0c8500867d Merge "Pass resize touch events to the touch state." into rvc-dev am: 9d431fbc70 am: 95093334c1 am: 1f695969b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916196

Change-Id: I4e010b419d32119b7ac332b910e54266fdc0308c
2020-06-19 22:57:46 +00:00
Automerger Merge Worker
486ffb22f3 Merge "Merge "Updated NotificationPanelViewController to listen to animateExpandNotificationsPanel and animateCollapsePanels." into rvc-dev am: 489dd7154c am: 4eaf0a6694" into rvc-d1-dev-plus-aosp am: 85225462c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921452

Change-Id: Ifa402b1fc1712c8796bfbe86d324a609d3bdd031
2020-06-19 22:57:34 +00:00
Automerger Merge Worker
8ba176adc3 Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp
* changes:
  Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7facdf am: a3103b1c80 am: 639f947935
  [DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce am: b11486a94b am: 1ec1cb0a37
2020-06-19 22:57:11 +00:00
Beth Thibodeau
e639ec7625 Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7facdf am: a3103b1c80 am: 639f947935
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Ibfd7c0f2fbb24322fa60be7c24043788f8afadd3
2020-06-19 22:56:56 +00:00
Automerger Merge Worker
fe47d509a4 Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 5a60f5cdb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Ic4f705ebb2d72af57d375615227e8aa5d785d700
2020-06-19 22:56:55 +00:00
Beth Thibodeau
5a8d0f3d1d Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7facdf am: edfb2eddf9 am: dcbdf55094
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Ide56d9b9898be6684939832d7dd79da5c299a86b
2020-06-19 22:56:50 +00:00
Beth Thibodeau
31e8ad21b8 [DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce am: b11486a94b am: 1ec1cb0a37
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Icf2aaa9f6249e8986bd92df6931027a638456b61
2020-06-19 22:56:46 +00:00
TreeHugger Robot
2801d98bfa Merge "Don't show IME on power menu popups" into rvc-dev 2020-06-19 22:56:15 +00:00
Josh Tsuji
6bbac7f90b Merge "Pass resize touch events to the touch state." into rvc-dev am: 9d431fbc70 am: b9f003b04f am: f4a453db6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916196

Change-Id: I2a2ea7f45c9da648f4be9086107cd8be0a7ab853
2020-06-19 22:56:02 +00:00
Beth Thibodeau
ad40be1d3e Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7facdf am: a3103b1c80 am: 6b727733ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: I6f24e3c12e40db0ed47700c2553d392c17f36b90
2020-06-19 22:55:40 +00:00
Beth Thibodeau
86cdc5b342 [DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce am: b11486a94b am: c650c10758
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Ic7cbaa18247f9c1a338345765db06c88e023b103
2020-06-19 22:55:36 +00:00
TreeHugger Robot
9f2ca7567b Merge "Statsd notif logs: important conversations." into rvc-dev am: 263c7f9bc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931359

Change-Id: I23ceed6f13b748d91fe104fd0f966e23acffd6e2
2020-06-19 22:55:33 +00:00
Automerger Merge Worker
3034f9f732 Merge "[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b -s ours am: dd183df437 -s ours am: bb5d15bd76 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-19 22:55:21 +00:00
TreeHugger Robot
c10dd8bbca Merge "Statsd notif logs: important conversations." into rvc-dev am: 263c7f9bc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931359

Change-Id: Ia5a8345f679b20f410857eef9227ceca7b573d94
2020-06-19 22:55:14 +00:00
TreeHugger Robot
ec3b4deb1e [automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b -s ours am: dd183df437 -s ours am: bb5d15bd76 -s ours
am skip reason: Change-Id Id571b990f4e45aea5bbab0dbadce48dda7b2bc56 with SHA-1 88fb45c1a9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896412

Change-Id: I602634197431deb4bd53846fa5d030a3ee3ca724
2020-06-19 22:55:10 +00:00
Automerger Merge Worker
65edfa84ca Merge "[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b am: 29eae58c31 am: 08214e125b -s ours" into rvc-qpr-dev-plus-aosp 2020-06-19 22:55:06 +00:00
Winson Chung
89dc94eba9 Merge "Fix issue with" into rvc-dev am: a1596ea543
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933639

Change-Id: Ia3873c6da6e9479e1ace13f8e58c073b0607fd8b
2020-06-19 22:55:00 +00:00
Winson Chung
f0b669056a Merge "Fix issue with" into rvc-dev am: a1596ea543
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933639

Change-Id: I87f35d36107373e5e50d8fbf048ce5b5882d99cb
2020-06-19 22:54:57 +00:00
TreeHugger Robot
d789ed14a4 [automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b am: 29eae58c31 am: 08214e125b -s ours
am skip reason: Change-Id Id571b990f4e45aea5bbab0dbadce48dda7b2bc56 with SHA-1 e9c44278c5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896412

Change-Id: Ie490fcec73a28c905433be750f028b1a48c3a576
2020-06-19 22:54:44 +00:00
TreeHugger Robot
153988ff18 [automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b am: 29eae58c31 -s ours am: 2488afb327 -s ours
am skip reason: Change-Id Id571b990f4e45aea5bbab0dbadce48dda7b2bc56 with SHA-1 e9c44278c5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896412

Change-Id: I2ca0b2699e2780cf29dfeaf64aa1b17cfd6f06cc
2020-06-19 22:54:37 +00:00
Sudheer Shanka
fbda8d7078 Delay deleting the blob after the last lease is released.
Bug: 159485704
Test: atest --test-mapping apex/blobstore
Change-Id: Iab153ae00107ee35705d7c17a3e51e7308e2e823
2020-06-19 15:49:15 -07:00
TreeHugger Robot
263c7f9bc1 Merge "Statsd notif logs: important conversations." into rvc-dev 2020-06-19 22:48:49 +00:00
Nate Jiang
9b39089eba Use installed keystore alias to check if enterprise config is insure
Bug: 158582707
Test: atest WifiEnterpriseConfigTest
Change-Id: Ic5818db5eac19b9480e1b30a8e596b176fdbee4b
2020-06-19 22:48:31 +00:00
Winson Chung
a1596ea543 Merge "Fix issue with" into rvc-dev 2020-06-19 22:45:36 +00:00
TreeHugger Robot
ec78b9c995 Merge "Updated NotificationPanelViewController to listen to animateExpandNotificationsPanel and animateCollapsePanels." into rvc-dev am: 489dd7154c am: 10fa646785
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921452

Change-Id: I66b5a18868c07e01f5a7b21dcc71f8106bfdec11
2020-06-19 22:45:14 +00:00
Josh Tsuji
1f695969b5 Merge "Pass resize touch events to the touch state." into rvc-dev am: 9d431fbc70 am: 95093334c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916196

Change-Id: I5582965c7607477e9496e9cb8d5a93ef00e85590
2020-06-19 22:45:02 +00:00
Automerger Merge Worker
85225462c6 Merge "Merge "Updated NotificationPanelViewController to listen to animateExpandNotificationsPanel and animateCollapsePanels." into rvc-dev am: 489dd7154c am: 4eaf0a6694" into rvc-d1-dev-plus-aosp 2020-06-19 22:44:39 +00:00
TreeHugger Robot
b72149a1ab Merge "Updated NotificationPanelViewController to listen to animateExpandNotificationsPanel and animateCollapsePanels." into rvc-dev am: 489dd7154c am: 4eaf0a6694
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921452

Change-Id: If205791382fbdb959420d868ad2e502745832a96
2020-06-19 22:44:21 +00:00