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

643756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff DeCew
d64a7d3594 Merge "Notification layout fixes:" into sc-dev am: 10de71a380 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805134

Change-Id: I216b323adfc4c470a0aaf9f1690a6a1da6467314
 2021-06-03 16:34:17 +00:00
Jeff DeCew
10de71a380 Merge "Notification layout fixes:" into sc-dev 2021-06-03 16:16:25 +00:00
Jason Hsu
c4606fec0e Merge "Maintain the position of accessibility floating menu" into sc-dev am: f57262c38d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14427396

Change-Id: Ifac48147026497f72868af82c174c8b3f0172c85
 2021-06-03 16:04:23 +00:00
Beth Thibodeau
60fb7d6c4e [automerger skipped] Merge "[DO NOT MERGE] Move code to fix studio build" into sc-dev am: e77df8f538 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6223d9a5909a6a2376dba75d9436199e2b9bcdbc
 2021-06-03 16:04:08 +00: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
TreeHugger Robot
e25f1773e4 Merge "Teach IMMS#shouldShowImeSwitcherLocked() about shouldShowInInputMethodPicker attr" into sc-dev am: 8968116543 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14811983

Change-Id: I1ba676c6b240752a6fbd91b93c49d7cb46ea2eb8
 2021-06-03 15:16:56 +00:00
TreeHugger Robot
8968116543 Merge "Teach IMMS#shouldShowImeSwitcherLocked() about shouldShowInInputMethodPicker attr" into sc-dev 2021-06-03 15:10:17 +00:00
Ryan Mitchell
fc8003e616 Merge changes I6da18cdb,I9de6ba64,I1af88c6d,I154783ff into sc-dev am: dc628e77a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14752601

Change-Id: I41eefc32ca4fef58ca3c04ebf11a6c62147a19ed
 2021-06-03 15:07:44 +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
04a69d78b3 Merge "Do not re-inflate QS and SB when CONFIG_UI_MODE" into sc-dev am: a07ad9a5ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14806638

Change-Id: I77dba34fb10cebffa70ca619fdaaf2c5d2b1d80d
 2021-06-03 15:00:30 +00:00
Caitlin Cassidy
a47f746d4c Merge "[Device Controls] In the device controls QS tile, have the subtitle show the preferred structure name." into sc-dev am: 2cca71c0bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14801410

Change-Id: I6b990f8bb6317de21fa0d0c91bd3530ea35ddf33
 2021-06-03 15:00:16 +00:00
Colin Cross
81569bfa6a Merge "Set dist_group: "android" for frameworks/base java_sdk_libraries" into sc-dev am: d1251db40d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489963

Change-Id: Ifa63509ac57f1c610d337015c973db7dcbb061fe
 2021-06-03 14:59:57 +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
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
Colin Cross
d1251db40d Merge "Set dist_group: "android" for frameworks/base java_sdk_libraries" into sc-dev 2021-06-03 14:37:38 +00:00
Dave Mankoff
db6d80dff7 Merge "Don't destroy the FalsingManager in Wallet." into sc-dev am: d3cd5bb67b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14788974

Change-Id: I38253197b089799dacbceacf975a5e9c2866a870
 2021-06-03 14:16:11 +00:00
Dave Mankoff
d3cd5bb67b Merge "Don't destroy the FalsingManager in Wallet." into sc-dev 2021-06-03 13:58:12 +00:00
Julia Reynolds
7fcf9ce1de Merge "Add missing lock" into sc-dev am: b0375bd924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14803706

Change-Id: I537b893472a305650ca4f1285af4f9383d9156ff
 2021-06-03 13:44:25 +00:00
TreeHugger Robot
311719e282 Merge "Fix double tap power key to launch camera locks phone" into sc-dev am: f981ebdf92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14791880

Change-Id: If29bb1c6450c05d59967d362f6c8dc1c42730602
 2021-06-03 13:44:14 +00:00
jasonwshsu
d2f7022ad1 Maintain the position of accessibility floating menu 
* Use percentage of X-aixs and Y-axis as last position, so it could be
restored at approximately position when device screen size changed.
* Fine-tune AccessibilityFloatingMenuViewTest

Bug: 183342667
Test: atest AccessibilityFloatingMenuViewTest PositionTest
Change-Id: I58ed608a03bc20f15a9d0852c95907107516c9ba
 2021-06-03 21:41:27 +08:00
Shivam Agrawal
caf03a848f Merge "Respect App Requested Orientation on Close-to-Square Displays" into sc-v2-dev 2021-06-03 13:36:40 +00:00
Julia Reynolds
b0375bd924 Merge "Add missing lock" into sc-dev 2021-06-03 13:24:36 +00:00
TreeHugger Robot
f981ebdf92 Merge "Fix double tap power key to launch camera locks phone" into sc-dev 2021-06-03 13:20:50 +00:00
Sidath Senanayake
d7fcdb26b3 Merge "Remove color font and icons overlays" into sc-dev am: 3b8007a26c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14806921

Change-Id: If7dcc08c2af8cebb73964177419b688b01f4fc4b
 2021-06-03 13:05:57 +00:00
Sidath Senanayake
3b8007a26c Merge "Remove color font and icons overlays" into sc-dev 2021-06-03 12:43:17 +00:00
Shawn Lin
f6d1591a2a Merge "Reset the flag of attaching nav to app to prevent flickering" into sc-dev am: 680d09ed8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14809880

Change-Id: I3c06748a095e02dcb300f85bcee2ab09308a315c
 2021-06-03 12:04:36 +00:00
Alex Florescu
0e79969bd4 Merge "Prevent crash when switching displays with screen off" into sc-v2-dev 2021-06-03 12:03:55 +00:00
Shawn Lin
680d09ed8d Merge "Reset the flag of attaching nav to app to prevent flickering" into sc-dev 2021-06-03 11:47:49 +00:00
Stanley Wang
166d07a5d5 Merge "Switch control should not be activated after event happens off of the target region." into sc-dev am: 3f0812ea7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14809881

Change-Id: Ib615baaf7f7c3226ec85c0a05f5c5fec6e73121d
 2021-06-03 11:01:28 +00:00
tim peng
7a3781fcb5 Merge "The Cast volume UI doesn't show up" into sc-dev am: 5050fdd9df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14796823

Change-Id: Iecd208e0b6dba823b89ceb5b41e71bf96ae73917
 2021-06-03 11:00:51 +00:00
tim peng
8a6d554423 Merge "The Cast volume UI doesn't show up" into sc-dev am: 5bf43b249f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14791878

Change-Id: I03f80360a96bfe594bf1401309d6ae299cf82350
 2021-06-03 11:00:49 +00:00
Stanley Wang
3f0812ea7c Merge "Switch control should not be activated after event happens off of the target region." into sc-dev 2021-06-03 10:29:29 +00:00
tim peng
5050fdd9df Merge "The Cast volume UI doesn't show up" into sc-dev 2021-06-03 10:17:07 +00:00
tim peng
5bf43b249f Merge "The Cast volume UI doesn't show up" into sc-dev 2021-06-03 10:17:07 +00:00
Yandry Perez Clemente
283a8c38ed Merge "Add error id when build is debuggable." into sc-dev am: 0f7f3f233c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717691

Change-Id: I76af03636fff1365c4739ce054adc2ce2bcfd1ab
 2021-06-03 10:04:44 +00:00
Yandry Perez Clemente
4ee96ea47d Merge "Add a unique id to Perfetto trace and Watchdog dropbox header." into sc-dev am: 8b366b9b8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621136

Change-Id: I759837395d1b1175b7a477fdd158b2be9f6874a4
 2021-06-03 10:04:27 +00:00
Yandry Perez Clemente
0f7f3f233c Merge "Add error id when build is debuggable." into sc-dev 2021-06-03 09:44:12 +00:00
Yandry Perez Clemente
8b366b9b8e Merge "Add a unique id to Perfetto trace and Watchdog dropbox header." into sc-dev 2021-06-03 09:43:37 +00:00
TreeHugger Robot
c906bf48d2 Merge "Implement a callback to report HotwordDetectionService status" into sc-dev am: 822d0b7f77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14747457

Change-Id: Ib4aa56c56d8975f4e06dc672a4f103448e425a5a
 2021-06-03 09:32:32 +00:00
Galia Peycheva
ca21d14a94 Merge "[SettingsLib] Add window blurs dev option title" into sc-dev am: 1276d95bd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14733695

Change-Id: If6fbfce6092dd234be610e6038aa1541b6efb38f
 2021-06-03 09:32:06 +00:00
TreeHugger Robot
822d0b7f77 Merge "Implement a callback to report HotwordDetectionService status" into sc-dev 2021-06-03 09:15:11 +00:00
Galia Peycheva
1276d95bd2 Merge "[SettingsLib] Add window blurs dev option title" into sc-dev 2021-06-03 09:12:36 +00:00
Alex Florescu
50be0fb14e Prevent crash when switching displays with screen off 
Bug: 189942712
Test: manual
Change-Id: I0f3fd02f284e1d7509eb6f12cf8b87de9304e2a1
 2021-06-03 10:09:30 +01:00
TreeHugger Robot
97e0c715a4 Merge "Make child window inherit the scale of parent" into sc-dev am: 4a443bc2c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13990308

Change-Id: I3fb11fd2fc1a8ba22f10a5ca4e5981bb827f98c4
 2021-06-03 08:58:58 +00:00
TreeHugger Robot
4a443bc2c1 Merge "Make child window inherit the scale of parent" into sc-dev 2021-06-03 08:38:19 +00:00
Yandry Perez Clemente
647ea2a033 Merge "Log atom ANROccurredProcessingStarted" into sc-dev am: 996de53b6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14690892

Change-Id: I4ada5b36b7d26a47d2aade786c72b6c9097cdc5f
 2021-06-03 07:46:13 +00:00
Yandry Perez Clemente
996de53b6e Merge "Log atom ANROccurredProcessingStarted" into sc-dev 2021-06-03 07:39:56 +00:00
tim peng
89c26e04b5 Merge "Disable group volume control bar" into sc-dev am: 076dfc8370 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14779546

Change-Id: I812ff5ede3418ab032ce6d47fd6112233c9c51ed
 2021-06-03 07:39:11 +00:00
Riddle Hsu
26ffc71db1 Merge "Fix freeform task surface is not shown" into sc-dev am: bb3fa41e60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14809875

Change-Id: I82be859b932b8ead2f2d65d67d69075a2f9cfc65
 2021-06-03 07:38:53 +00:00