Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,835 Commits 3 Branches 0 Tags
f1930d24eb0afe4e7f5bfd086f860f4dbff72ec2
Commit Graph

760835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Presubmit Automerger Backend
f1930d24eb [automerge] Add current system language into suggestion list 2p: 729a22a2cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17700590

Bug: 228905883
Change-Id: I67a9ea739116526bf7a732a7c412b1af283a0c27
 2022-04-12 07:45:12 +00:00
Calvin Pan
729a22a2cc Add current system language into suggestion list 
Bug: 228905883
Test: Add system language and change app language

Change-Id: I7b1f78bb13902dc50f3e8ce8e1c62590ac623b9c
 2022-04-12 07:37:13 +00:00
Tiger Huang
201f94fee6 Merge "Fix WindowInsets#getStableInsets" into tm-dev am: 06b93cf997 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17691529

Change-Id: Ie6698bca95ca35ac207ecfc69cbc5b61b58f9c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 06:29:49 +00:00
Tiger Huang
06b93cf997 Merge "Fix WindowInsets#getStableInsets" into tm-dev 2022-04-12 06:09:03 +00:00
Riddle Hsu
ca20903681 Merge "Do not show animation background with wallpaper transition" into tm-dev am: dc19fc3bd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665554

Change-Id: I467743855218d81827033e4677a64dab4a158fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:47:04 +00:00
Shaowei Shen
799d807420 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control" into tm-dev am: eda5ea3e38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686878

Change-Id: I6e638113ef14b9fe827667cb0e67a54ae7232600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:46:34 +00:00
Riddle Hsu
dc19fc3bd0 Merge "Do not show animation background with wallpaper transition" into tm-dev 2022-04-12 05:45:11 +00:00
TreeHugger Robot
26f2b2a93a Merge "Post the starting of the Notification dialog" into tm-dev am: 466dcdd650 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650398

Change-Id: Ifd3fb93edbfaea5374496eb336057fae25c63378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:45:00 +00:00
Shaowei Shen
eda5ea3e38 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control" into tm-dev 2022-04-12 05:42:21 +00:00
Shaowei Shen
f436c0519c Merge changes from topic "presubmit-am-564566ba5b6d4ddbb308aff0c5330d99" into tm-mainline-prod 
* changes:
  [automerge] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control 2p: 11a776a908
  DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control
 2022-04-12 05:42:21 +00:00
TreeHugger Robot
466dcdd650 Merge "Post the starting of the Notification dialog" into tm-dev 2022-04-12 05:27:34 +00:00
TreeHugger Robot
b1116d3df9 Merge changes from topic "presubmit-am-616d8c1027a84e8c80568b9c71425b35" into tm-mainline-prod 
* changes:
  [automerge] Post the starting of the Notification dialog 2p: a866e54d14
  Post the starting of the Notification dialog
 2022-04-12 05:27:34 +00:00
TreeHugger Robot
1af3c20c6e Merge "Add config to disable Bubbles" into tm-dev am: d421a51399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665269

Change-Id: I816327624e11c8e48afacdbdf6d7f6b10d1f2c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:23:42 +00:00
TreeHugger Robot
d421a51399 Merge "Add config to disable Bubbles" into tm-dev 2022-04-12 04:57:50 +00:00
Chris Li
a3535946bc Merge "No embed activity when Task is in PIP" into tm-dev am: a6b968f887 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665556

Change-Id: Ibb15fca0bec721ea53f92df4faf4bd4b36ebe99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 03:54:57 +00:00
Chris Li
a6b968f887 Merge "No embed activity when Task is in PIP" into tm-dev 2022-04-12 03:29:37 +00:00
Chris Li
6655eef987 Merge changes from topic "presubmit-am-ea582a154fef4cbc9b57e3c967f1016b" into tm-mainline-prod 
* changes:
  [automerge] No embed activity when Task is in PIP 2p: c3b209094c
  No embed activity when Task is in PIP
 2022-04-12 03:29:37 +00:00
Shawn Lin
f61be2358f [automerger skipped] Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e am: c0d749ed90 -s ours am: 08cc104906 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11fca060847b42e016b11d59e83d6ec55eb49133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:40:08 +00:00
Shawn Lin
d6b87e3ab0 Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp am: 7337802a28 am: 24eb4b556e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875

Change-Id: I4c926df01f54f3cdb92a3cc983a504be433f9ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:39:51 +00:00
shawnlin
4703cc91ef [automerger skipped] [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c am: 1f5b53c8c4 -s ours am: 5972c1d457 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65112997307e791d6cf96b70f044ca1cfe322be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:39:43 +00:00
Arthur Hung
647340d139 Merge "Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode" into tm-dev am: 92f53fc942 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17635306

Change-Id: I81c49b10b0ceb57eb73a1edd3fd05739e921c301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:38:45 +00:00
TreeHugger Robot
290abbd37a Merge "ActivityRecordInputSink: Ensure timely release of SurfaceControl" into tm-dev am: a5e6d1e6b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694571

Change-Id: I5ac37a4d012dcd465f06c9d0932c9a0225a98746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:37:49 +00:00
Shawn Lin
08cc104906 [automerger skipped] Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e am: c0d749ed90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1135c619f99128432615ee68ce70ab1960aee0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:36:57 +00:00
Shawn Lin
f83b9f4222 Merge "Fixed status bar glitch for apps that access internal res" into tm-dev am: 455e78d8f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17534146

Change-Id: I0e96f78c6a3e026fdb457f7e0b38691d69df7e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:36:10 +00:00
Shawn Lin
24eb4b556e Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp am: 7337802a28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875

Change-Id: Ibf65c7b92a7721aa1ab3cd4a68cab05ef9981142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:36:09 +00:00
shawnlin
5972c1d457 [automerger skipped] [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c am: 1f5b53c8c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I639e5baa4da709a5347ebd035e5c3fece16b6927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:35:46 +00:00
Shawn Lin
c0d749ed90 Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875

Change-Id: Ia35e5f69b5f363b61a208b9dc949cb383c68574f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:35:45 +00:00
Arthur Hung
92f53fc942 Merge "Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode" into tm-dev 2022-04-12 02:34:17 +00:00
Arthur Hung
6b13d60abc Merge changes from topic "presubmit-am-d842c29bd1bd43a78e30c4e5c8765007" into tm-mainline-prod 
* changes:
  [automerge] Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode 2p: 66f44bd54d
  Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode
 2022-04-12 02:34:17 +00:00
TreeHugger Robot
a5e6d1e6b3 Merge "ActivityRecordInputSink: Ensure timely release of SurfaceControl" into tm-dev 2022-04-12 02:17:45 +00:00
TreeHugger Robot
6520f17388 Merge changes from topic "presubmit-am-68408850f2c84138b668069c6e3a2e5a" into tm-mainline-prod 
* changes:
  [automerge] ActivityRecordInputSink: Ensure timely release of SurfaceControl 2p: 51ae378da3
  ActivityRecordInputSink: Ensure timely release of SurfaceControl
 2022-04-12 02:17:45 +00:00
Shawn Lin
455e78d8f4 Merge "Fixed status bar glitch for apps that access internal res" into tm-dev 2022-04-12 02:15:58 +00:00
Shawn Lin
ca1832916f Merge changes from topic "tm-sbH" into tm-mainline-prod 
* changes:
  [automerge] Fixed status bar glitch for apps that access internal res 2p: 71eaca7ede
  Fixed status bar glitch for apps that access internal res
 2022-04-12 02:15:58 +00:00
Shawn Lin
7337802a28 Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c
  [DO NOT MERGE] Update to use new res status bar height dimen
 2022-04-12 02:14:40 +00:00
Shawn Lin
2f5827830e Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev 2022-04-12 02:14:40 +00:00
Minche Li
c4dddbfea8 Merge "Notifies magnification change for the transitioning target mode" into tm-dev am: b26d2ae80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17040106

Change-Id: If5c6364f1a96f7b14fac0c032500ba3fed1513cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 01:28:06 +00:00
Minche Li
b26d2ae80b Merge "Notifies magnification change for the transitioning target mode" into tm-dev 2022-04-12 01:10:41 +00:00
Minche Li
284c9ee3df Merge changes from topic "209701404" into tm-mainline-prod 
* changes:
  [automerge] Notifies magnification change for the transitioning target mode 2p: d560a73ca9
  Notifies magnification change for the transitioning target mode
 2022-04-12 01:10:41 +00:00
Shaowei Shen
e44051fed4 Merge "[Output switcher] Check current device" into tm-dev am: 49ab839806 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17608150

Change-Id: I9213292de90150d521fc80f463c66f9ecf87c5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 00:59:10 +00:00
Shaowei Shen
49ab839806 Merge "[Output switcher] Check current device" into tm-dev 2022-04-12 00:14:37 +00:00
TreeHugger Robot
46e9b1b928 Merge "Log PsdsServerConfigured in dumpsys" into tm-dev am: 887c94e629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666655

Change-Id: I9af8b4b7463df084bc0fc5b37c7a2acb41ec1132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 22:15:37 +00:00
TreeHugger Robot
887c94e629 Merge "Log PsdsServerConfigured in dumpsys" into tm-dev 2022-04-11 22:01:24 +00:00
TreeHugger Robot
bf482b7622 Merge changes from topic "presubmit-am-9fdbad9da9a94b66a07e5160c90c8535" into tm-mainline-prod 
* changes:
  [automerge] Log PsdsServerConfigured in dumpsys 2p: e80c5a134a
  Log PsdsServerConfigured in dumpsys
 2022-04-11 22:01:24 +00:00
Josh Tsuji
444742f790 Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev am: b39e1f1a67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17571000

Change-Id: I67561e369585c4eb1176091c5589b6c4c6138a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 21:55:09 +00:00
Beverly Tai
4c7027aa3e Merge "Ask user to try fingerprint after face auth fail" into tm-dev am: b121b54fb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607578

Change-Id: If90f81652f353f9b1630bae64eef33786404bd62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 21:54:22 +00:00
TreeHugger Robot
096643f535 Merge changes from topics "presubmit-am-41e144351270485b94f495fc32653e46", "presubmit-am-d52b531f305c4668b1dfe4f906403ae6" into tm-dev am: 36e2df5b5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17626108

Change-Id: I4af89c739aacba9818edbc98079cd1ff4c9d844f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 21:53:55 +00:00
Josh Tsuji
b39e1f1a67 Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev 2022-04-11 21:53:39 +00:00
Josh Tsuji
9548c68d57 Merge changes from topic "tsuji-screenoff_0329" into tm-mainline-prod 
* changes:
  [automerge] Revert "Revert "Fix shouldControlUnlockedScreenOff."" 2p: 38a5f2252d
  Revert "Revert "Fix shouldControlUnlockedScreenOff.""
 2022-04-11 21:53:39 +00:00
Beverly Tai
b121b54fb4 Merge "Ask user to try fingerprint after face auth fail" into tm-dev 2022-04-11 21:34:05 +00:00
Beverly Tai
ec071652bc Merge changes from topic "presubmit-am-03c717081b8041d984fabd05965efce5" into tm-mainline-prod 
* changes:
  [automerge] Ask user to try fingerprint after face auth fail 2p: e1aa212d2b
  Ask user to try fingerprint after face auth fail
 2022-04-11 21:34:05 +00:00