Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
5a60f5cdb4 Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp 
* changes:
  Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7facdf am: edfb2eddf9
  [DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce am: 7a2dfd3422
 2020-06-19 22:44:20 +00:00
Josh Tsuji
f4a453db6d Merge "Pass resize touch events to the touch state." into rvc-dev am: 9d431fbc70 am: b9f003b04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916196

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

Change-Id: I82f7cbce64a5eee5d6871a4070ca78d56630c835
 2020-06-19 22:44:02 +00:00
Beth Thibodeau
3a24d7b173 [DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce am: 7a2dfd3422 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Ia9520bad1aec1de76763207e0b4a636cf8ae608c
 2020-06-19 22:43:58 +00:00
Josh Gao
c495455b80 Merge "Fix file descriptor ownership." am: 72376bf05d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344037

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

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

Change-Id: I126022bf27da392e0e8c5bdb20e35ea4f8b192cb
 2020-06-19 22:43:44 +00:00
TreeHugger Robot
88620f039f 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: I2f433eee3d844767816372128650680968c2fd0c
 2020-06-19 22:41:45 +00:00
TreeHugger Robot
10fa646785 Merge "Updated NotificationPanelViewController to listen to animateExpandNotificationsPanel and animateCollapsePanels." into rvc-dev am: 489dd7154c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921452

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

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

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

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

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

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

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

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

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

Change-Id: Id3a517864e33dfc9d6d8b2431d1acef78577e420
 2020-06-19 22:40:31 +00:00
TreeHugger Robot
08214e125b Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b am: 29eae58c31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896412

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

Change-Id: Ib1a556d8e8a7d24d049d62f6628ab38163b21c79
 2020-06-19 22:40:24 +00:00
TreeHugger Robot
bb5d15bd76 [automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b -s ours am: dd183df437 -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: If9b719304f640808d38a5ad20364a1c756e1e488
 2020-06-19 22:40:21 +00:00
TreeHugger Robot
489dd7154c Merge "Updated NotificationPanelViewController to listen to animateExpandNotificationsPanel and animateCollapsePanels." into rvc-dev 2020-06-19 22:40:06 +00:00
TreeHugger Robot
2488afb327 [automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b am: 29eae58c31 -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: I874c25539f4681a89f21e8b1019418d9c4284268
 2020-06-19 22:39:58 +00:00
Joshua Tsuji
334773975b Remove bubbles if their shortcuts are removed or if the app is uninstalled. 
Bug: 157755828
Test: modded bubble test app to remove shortcuts
Change-Id: I19acce432013a86695eb3b28c8fe59ab23a4fa88
 2020-06-19 18:35:38 -04:00
Josh Gao
72376bf05d Merge "Fix file descriptor ownership." 2020-06-19 22:31:53 +00:00
Josh Tsuji
9d431fbc70 Merge "Pass resize touch events to the touch state." into rvc-dev 2020-06-19 22:27:56 +00:00
Beth Thibodeau
ab9e7facdf Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev 2020-06-19 22:26:57 +00:00
Eino-Ville Talvala
14c753626e Camera: Adjust documentation and comments for insensitive language. 
Test: Builds
Bug: 159480149
Change-Id: I0daadbfa6505339bdcec4a49c6e4577424832f75
 2020-06-19 15:26:39 -07:00
Calin Juravle
f44c588c45 Update preloaded-classes-blacklist 
To match what was used for RVC profile.

Bug: 152574358
Test: Config file used in boot image profile generation
Merged-In: I5be50e9ec2a43d82dd5225b2f685897afa40d818
Change-Id: I5be50e9ec2a43d82dd5225b2f685897afa40d818
 2020-06-19 15:24:38 -07:00
TreeHugger Robot
d1f64b2430 Merge "Fix inconsistent widths in manage menu." into rvc-dev am: 87117a3a07 am: b8e87ca145 am: a2ea69f6a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931371

Change-Id: Icf64f6052eb24586d4617fef717f6faad98b240e
 2020-06-19 22:23:02 +00:00
TreeHugger Robot
439ce7d6c5 Merge "Fix media artist color" into rvc-dev am: d516053da9 am: 97098d722c am: 40d7c8de11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931370

Change-Id: Ifd55b124ffea31ff5c855eda216cd313ba3125d2
 2020-06-19 22:22:46 +00:00
Automerger Merge Worker
a814b77e41 Merge "Merge "Fix song title size in media controls" into rvc-dev am: ebfd3e9df3 am: 4922fc5d94" into rvc-d1-dev-plus-aosp am: 2c223335f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11935091

Change-Id: I1b43e4abbe79a4b7a62e1c6a503541af60edc769
 2020-06-19 22:22:39 +00:00
TreeHugger Robot
ef32fb4fb4 Merge "Fix inconsistent widths in manage menu." into rvc-dev am: 87117a3a07 am: ef9de2363a am: 1ffe89a454 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931371

Change-Id: I1a4a1b1794c770be12303b0994d84a78d14aa890
 2020-06-19 22:22:16 +00:00
Robert Snoeberger
daf50b5998 Don't show badge for media style notifications 
Fixes: 156834522
Test: manual - Play audio with Castbox. Verify that a badge does not
appear on the app icon.
Test: atest uiservicestests/src/com/android/server/notification/BadgeExtractorTest.java
Test: atest uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java

Change-Id: Ie1ade943215c0b7895956d65064c310d555c6c88
 2020-06-19 18:21:55 -04:00
TreeHugger Robot
6f32fca82a Merge "Fix media artist color" into rvc-dev am: d516053da9 am: 016c409687 am: 05ee3a61f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931370

Change-Id: I280c1869fe86faef90223ed3ebcf601c2ad5c569
 2020-06-19 22:21:49 +00:00
TreeHugger Robot
ccabb5cd9b Merge "Fix song title size in media controls" into rvc-dev am: ebfd3e9df3 am: 86640e239b am: f2412820c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11935091

Change-Id: I36d60ab41ebd5b527b0569fc7f47b683e3486ead
 2020-06-19 22:21:20 +00:00
Automerger Merge Worker
fb068f3818 Merge "Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 4b94dff328" into rvc-d1-dev-plus-aosp am: 6e89bb1347 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: If87c626b824466cbb9dccd229a193a3529980679
 2020-06-19 22:21:09 +00:00
TreeHugger Robot
c5be3856d4 Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 319a6644f3 am: bb3ebce4c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: Ic2c3653c9897f1d7123eeca8b36886232153ce9e
 2020-06-19 22:19:58 +00:00
Automerger Merge Worker
7de6728d0c Merge "Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 am: ebd5983e16" into rvc-d1-dev-plus-aosp am: 8d4e43da80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923901

Change-Id: I1bb0d8b7322e52b0490d28882c4a93d5d6344bad
 2020-06-19 22:19:40 +00:00
TreeHugger Robot
29fe0b2b83 Merge "Fix inconsistent widths in manage menu." into rvc-dev am: 87117a3a07 am: b8e87ca145 am: a71b968552 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931371

Change-Id: I2a783ce392937aa1516a7ff6c5a6b147fcdba3cf
 2020-06-19 22:19:12 +00:00
TreeHugger Robot
ab17a31ac2 Merge "Fix media artist color" into rvc-dev am: d516053da9 am: 97098d722c am: c3f70c134c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931370

Change-Id: Idf1f8396a65dd98663fca34ae53178020f7a4107
 2020-06-19 22:19:03 +00:00
TreeHugger Robot
29eae58c31 Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896412

Change-Id: I101d53831bdf6bf4f083e5ff17baad4c014c5eee
 2020-06-19 22:18:42 +00:00
TreeHugger Robot
bf7fed5700 Merge "Fix song title size in media controls" into rvc-dev am: ebfd3e9df3 am: 4922fc5d94 am: 4593695463 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11935091

Change-Id: I48a2579923da17d56e5b20881b980cc854c4527a
 2020-06-19 22:18:41 +00:00
Automerger Merge Worker
49cc74c60e Merge "Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 4b94dff328 am: b41ace7709" into rvc-qpr-dev-plus-aosp 2020-06-19 22:18:36 +00:00
TreeHugger Robot
dd183df437 [automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b -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: I5f4399b3efd42de2f15c869e9dfa5fa7baf6dd4e
 2020-06-19 22:18:33 +00:00
TreeHugger Robot
c2623c38d3 Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 4b94dff328 am: b41ace7709 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: Iba3af539238fbc97e0c7a251723c4d50d31ee92a
 2020-06-19 22:18:25 +00:00
Automerger Merge Worker
268dbe948c Merge "Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 am: 407047743c am: fcf5a9c782" into rvc-qpr-dev-plus-aosp 2020-06-19 22:18:22 +00:00
Evan Rosky
9754ddce6e Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 am: 407047743c am: 3712df59f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923901

Change-Id: I043ff382993caac3b62102728d351c987cb4fe8a
 2020-06-19 22:18:13 +00:00
Evan Rosky
b8b84245f1 Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 am: 407047743c am: fcf5a9c782 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923901

Change-Id: Iab99f9374d201a217922842094273014a2f4f6fe
 2020-06-19 22:18:08 +00:00
TreeHugger Robot
a2ea69f6a2 Merge "Fix inconsistent widths in manage menu." into rvc-dev am: 87117a3a07 am: b8e87ca145 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931371

Change-Id: Iee39e948f193b1d8f5910ba7c67f28d5af387e5a
 2020-06-19 22:04:26 +00:00