Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
643,044 Commits 3 Branches 0 Tags
d55dfa04d596fb8dc71085c937ede610b93c99bc
Commit Graph

643044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d55dfa04d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 61b1433328 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10de31feba50aec22d351380b8b273835c3e1ed1
 2021-06-03 20:18:32 +00:00
TreeHugger Robot
56d12af418 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9a42d15d58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ad74b469db3645da0c4b1fa8715e9ef281a5359
 2021-06-03 20:18:19 +00:00
TreeHugger Robot
93571512dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f4f1398bff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ceeec32008b8d457f399a736e3f2adabfe8c557
 2021-06-03 20:17:52 +00:00
Bill Yi
9cf056733c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7db291e859 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieaa38421f8291f856f1145d51b72bd860bede768
 2021-06-03 20:17:34 +00:00
TreeHugger Robot
61b1433328 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-03 20:04:09 +00:00
TreeHugger Robot
9a42d15d58 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-03 20:00:58 +00:00
TreeHugger Robot
f4f1398bff Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-03 19:59:38 +00:00
Galia Peycheva
e5c0adddcf Merge "Remove occurances of disable blurs sysprop" into sc-dev 2021-06-03 19:53:17 +00:00
TreeHugger Robot
a38bd10131 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7c5279c8b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49a654044ea6dac755db9b651c4cc8d348e89967
 2021-06-03 19:50:54 +00:00
TreeHugger Robot
7c5279c8b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:45:02 +00:00
TreeHugger Robot
b477bd851f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9bd46b4d77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2605d62cc00939d1db126b3a0b273518eb618ebd
 2021-06-03 19:44:13 +00:00
TreeHugger Robot
1411b4d7a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:42:53 +00:00
TreeHugger Robot
9bd46b4d77 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:37:21 +00:00
TreeHugger Robot
d1c67e26b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bf68e84223 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I636ac4b63ef2557afb9462193a50b1d06564a5f4
 2021-06-03 19:35:51 +00:00
Jayachandran Chinnakkannu
65b0d73c81 Merge "Override equals and hashCode methods for EpsBearerQosSessionAttributes and NrQosSessionAttributes" into sc-dev 2021-06-03 19:35:44 +00:00
TreeHugger Robot
abbed5aeaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7b694719e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic63746513d95058c2a52880a295956899cdd8c79
 2021-06-03 19:35:28 +00:00
TreeHugger Robot
dfa8912d4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ce42fa25fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18d8f41b05b16f904bc437c859ad1d5a1bf06388
 2021-06-03 19:35:06 +00:00
Bill Yi
38487a898d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7cef292a54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bec57889403e225ddadc87aa5b1d06c8cec7c2c
 2021-06-03 19:34:53 +00:00
Jeff DeCew
7b96af705c Merge "Fix background color (again)" into sc-dev 2021-06-03 19:32:50 +00:00
Jeff DeCew
975a46da85 Merge "Tweak CallStyle Answer button color to ensure white text" into sc-dev 2021-06-03 19:32:10 +00:00
TreeHugger Robot
6c5decbb78 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:31:52 +00:00
TreeHugger Robot
bf68e84223 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:30:58 +00:00
TreeHugger Robot
41dd5ae8e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:30:27 +00:00
TreeHugger Robot
fbd5062c89 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:27:41 +00:00
TreeHugger Robot
87be4ff20d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:27:26 +00:00
TreeHugger Robot
7b694719e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:25:28 +00:00
TreeHugger Robot
ce42fa25fb Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:25:13 +00:00
TreeHugger Robot
c7e1e9ee0a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:24:49 +00:00
TreeHugger Robot
a8ad506fa9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:16:25 +00:00
Hui Yu
f3860569fb Merge "Missed one DENIED event in ForegroundServiceStateChanged log." into sc-dev 2021-06-03 19:00:30 +00:00
Steven Ng
50b1ddceaa Merge "Fix calling identity ID in AppWidgetServiceImpl" into sc-dev 2021-06-03 18:36:34 +00:00
Kevin Chyn
c0e753076c Merge "Use custom drawable for UDFPS enrollment progress bar" into sc-dev 2021-06-03 18:22:38 +00:00
Jeff DeCew
834bf3a8e0 Merge "Always highlight unread count" into sc-dev 2021-06-03 18:16:26 +00:00
Chloris Kuo
5c98cae298 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev 2021-06-03 17:29:59 +00:00
Jeff DeCew
83b059c11d Tweak CallStyle Answer button color to ensure white text 
Fixes: 190053041
Test: post a CallStyle notification
Change-Id: Ife921d0a630fa0b05f68b9b3a0cf0dad5fb1983b
 2021-06-03 13:22:52 -04:00
Matt Pietal
de56089eed Merge "Smartspace location fix" into sc-dev 2021-06-03 17:12:31 +00:00
Galia Peycheva
2cd5b58dd4 Remove occurances of disable blurs sysprop 
The disable blurs sysprop is no longer being used

Bug: 185580298
Test: m
Change-Id: I191d88f233818d76ad8f417e2806b3f3be3bfb45
 2021-06-03 19:08:24 +02:00
Jeff DeCew
a39cdd1273 Merge "Remove redundant margin update, which caused infinite layout loop." into sc-dev 2021-06-03 17:04:50 +00:00
Dmitri Plotnikov
80efce1f41 Merge "Store binder thread CPU times in the summary parcel" into sc-dev 2021-06-03 17:04:19 +00:00
Hui Yu
ab2bf01d75 Missed one DENIED event in ForegroundServiceStateChanged log. 
The FGS start maybe denied in Context.startForegroundService() call.

Bug: 186570807
Test: build and run.
Change-Id: I2b3d190225c557e77e2c18c5b32563f0863c509c
 2021-06-03 09:51:25 -07:00
Jeff DeCew
10de71a380 Merge "Notification layout fixes:" into sc-dev 2021-06-03 16:16:25 +00:00
Jeff DeCew
7f8bcb8add Always highlight unread count 
Fixes: 188646708
Test: get unread count within a group
Change-Id: I41d67e5e488e0d3dbc3873d6d50d55ec4ab8c9f2
 2021-06-03 11:50:28 -04:00
Jason Hsu
f57262c38d Merge "Maintain the position of accessibility floating menu" into sc-dev 2021-06-03 15:45:04 +00:00
Beth Thibodeau
e77df8f538 Merge "[DO NOT MERGE] Move code to fix studio build" into sc-dev 2021-06-03 15:38:45 +00:00
Jeff DeCew
ea4b3a56b4 Fix background color (again) 
* originally fixed in ag/14189045
* regressed in ag/14140988

Bug: 185920837
Test: post conversation notifications, and look at badge or face pile background; should match notification background
Change-Id: I8ef77901ed9d43eccf89dcc1f3905f0dbb38851f
 2021-06-03 11:18:35 -04:00
TreeHugger Robot
8968116543 Merge "Teach IMMS#shouldShowImeSwitcherLocked() about shouldShowInInputMethodPicker attr" into sc-dev 2021-06-03 15:10:17 +00:00
Ryan Mitchell
dc628e77a1 Merge changes I6da18cdb,I9de6ba64,I1af88c6d,I154783ff into sc-dev 
* changes:
  idmap2: fix cpplint warnings
  OMS: include idmap data in dump
  idmap2: create in-memory FRRO before creating file
  OMS: update shell command --help
 2021-06-03 15:02:22 +00:00
Lucas Dupin
a07ad9a5ea Merge "Do not re-inflate QS and SB when CONFIG_UI_MODE" into sc-dev 2021-06-03 14:59:51 +00:00
Jeff DeCew
e0fb0e6162 Remove redundant margin update, which caused infinite layout loop. 
Fixes: 186217151
Fixes: 183970366
Test: altered build to always show feedback icons, then exhaustively tested conversation notifications.
Change-Id: I19a1428d7fcda35efc3d15b198c5b8d04a30d869
 2021-06-03 10:57:25 -04:00
Caitlin Cassidy
2cca71c0bf Merge "[Device Controls] In the device controls QS tile, have the subtitle show the preferred structure name." into sc-dev 2021-06-03 14:57:10 +00:00