Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769,839 Commits 3 Branches 0 Tags
8aef548893f7fbf57f7cd3fa179ef88ed69e80c8
Commit Graph

769839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
8aef548893 Clear mEnterTransitionCoordinator after content shows. 
Fixes: 233975804

After content has been shown, we should clear the
mEnterTransitonCoordinator so that the exit doesn't
accidentally try to use the enter transition information
to remove Views.

Test: manually tested example from bug report
Change-Id: Ida7ca354cb75953d1d5ecffc159da0d7320d4349
 2022-06-24 15:12:38 -07:00
Alejandro Nijamkin
a55c15df95 Merge "Removes camera service prewarming from bottom area." into tm-qpr-dev 2022-06-24 17:51:25 +00:00
Hawkwood Glazier
6ed51a9469 Merge "Add wtf log for UMO being cut" into tm-qpr-dev 2022-06-24 17:24:31 +00:00
Christine Franks
6ad1f71cce Merge "Allow color mode to be NOT_SET" into tm-qpr-dev 2022-06-24 15:36:20 +00:00
Bryce Lee
a8454ad2f2 Merge "Localize date and time formats on complications." into tm-qpr-dev 2022-06-24 15:16:21 +00:00
Michał Brzeziński
2a8b3b47a4 Merge "2/2 Making bouncer shift on double tap when user chooser is visible" into tm-qpr-dev 2022-06-24 15:11:19 +00:00
Jeff DeCew
8d2776544f Merge "Reduce log spam when RankingMap is missing rankings for non-cancelled entries." into tm-qpr-dev 2022-06-24 14:52:50 +00:00
Massimo Carli
8a1e0cf16e Merge "Updates SCM restart button tooltip" into tm-qpr-dev 2022-06-24 11:32:00 +00:00
TreeHugger Robot
03fe0878d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 81222d2803 -s ours am: da2d8fe459 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3cdaa12ac21551df8b0ca393a1676725c985f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:49:00 +00:00
Bill Yi
64918b81f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84666a2a3a -s ours am: 4445ed60d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b1f7ffa42280a7a04bf9ef21177e5ca88b0c624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:59 +00:00
TreeHugger Robot
d66193f2bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e07f5e2953 -s ours am: 515e8dd9dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb0a0415f3f9dd1a235b37357c3fff45c4727896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:55 +00:00
Bill Yi
60e9d3f720 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0064bc1a7e -s ours am: bbdb8073e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia44fcea7c564f0f573808af85e8d93da6bbeae28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:51 +00:00
TreeHugger Robot
801888b120 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8c6904ecc0 -s ours am: 60e60ee81b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabecba6666fa80edb35ed8eaa536f6dcf3cd224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:44 +00:00
Bill Yi
eda6667d63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44b2921b5a -s ours am: 58c62a1e49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4273696594e987e5e1b621691d4b6e80e737343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:37 +00:00
TreeHugger Robot
b87079762c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 932644a8f6 -s ours am: 3d5e29ec32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifef2c1e93f6126e665c82c996a4963df2cbfb121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:23 +00:00
Bill Yi
289bb31fb3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd3ad0a763 -s ours am: 76bfeb9882 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ca8c01d195c44f131d9b2332496635c04ee5563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:09 +00:00
TreeHugger Robot
da2d8fe459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 81222d2803 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe951d5a6a402dc45a53b7cee9f146870f209b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:57 +00:00
Bill Yi
4445ed60d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84666a2a3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4c71376a75ee904f8d0b101125437b840f9e668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:56 +00:00
TreeHugger Robot
515e8dd9dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e07f5e2953 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida335deb909489066b07b72f4574e4a242db734e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:50 +00:00
Bill Yi
bbdb8073e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0064bc1a7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbbc1c4b5f1d0d1cf2a502c582fd5916a8f0a20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:42 +00:00
TreeHugger Robot
60e60ee81b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8c6904ecc0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a233a68d654c6c6085b0654a28e05fd8a3a9281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:39 +00:00
Bill Yi
58c62a1e49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44b2921b5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2c33002275289d366c5b6e8abd8eb284886bb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:31 +00:00
TreeHugger Robot
3d5e29ec32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 932644a8f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I869678e2f3ff78685bcb58cd636507e4700ab44e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:17 +00:00
Bill Yi
76bfeb9882 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd3ad0a763 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8916ddf0173b31ccee003731f7a0aaef5e41c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:03 +00:00
TreeHugger Robot
81222d2803 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:43 +00:00
TreeHugger Robot
e07f5e2953 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:43 +00:00
TreeHugger Robot
8c6904ecc0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:43 +00:00
TreeHugger Robot
932644a8f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:43 +00:00
Shaowei Shen
28776c2ac9 Merge "[Output Switcher] add check on animation" into tm-dev am: 81a014f029 am: 8c97b17d76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18992666

Change-Id: Ie5b47aab897d5fde8de5665541434821c64d0ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 05:17:11 +00:00
Shaowei Shen
8c97b17d76 Merge "[Output Switcher] add check on animation" into tm-dev am: 81a014f029 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18992666

Change-Id: Ic2450690e0d8d533f74826d5a2c54533f295b122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 04:51:31 +00:00
TreeHugger Robot
26e4b56837 Merge "Add KeyguardCoordinatorTest cases" into tm-qpr-dev 2022-06-24 04:45:45 +00:00
Shaowei Shen
81a014f029 Merge "[Output Switcher] add check on animation" into tm-dev 2022-06-24 04:36:07 +00:00
Evan Chen
1ced89ac97 Merge "Update AssociationInfo for VDMS test" into tm-qpr-dev 2022-06-24 04:25:45 +00:00
Evan Chen
9d147a186d Merge "Delay role revoke when the app is not visible to the user" into tm-qpr-dev 2022-06-24 04:25:45 +00:00
Tiger Huang
d610032492 Merge "Use runtime attributes for insets calculation" into tm-qpr-dev 2022-06-24 03:56:00 +00:00
Tiger Huang
cf1e9e2682 Merge "Revert "Introduce updateVisibility and updateLayout"" into tm-qpr-dev 2022-06-24 03:23:21 +00:00
Jeff DeCew
5cd0e65931 Reduce log spam when RankingMap is missing rankings for non-cancelled entries. 
Fixes: 236140753
Test: dumpsysui NotifCollection
Test: atest NotifCollectionLoggerTest
Change-Id: I7308af63ec67aa9b1b3444bfe90a3953468024ad
 2022-06-24 02:19:13 +00:00
TreeHugger Robot
e63bf1a103 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 0992057b97 -s ours am: 0e23ce5a28 -s ours am: 16f5c4448b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08dc0edf50307b7733ce9a572890b4b6933591da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:53:04 +00:00
Bill Yi
3821bcde7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c191aa247 -s ours am: b1ae0755c5 -s ours am: 6c0b793353 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefe0a518d86cba2ef9dc1f444f7cf465e6a80662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:53:01 +00:00
TreeHugger Robot
f00243ada3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8e33294989 -s ours am: cfcbe77943 -s ours am: 8cda91cffa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie30232e6e653272246e54c734c36194853f4df26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:59 +00:00
Bill Yi
154c9d6d3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f4ea53da1 -s ours am: 0819a913c2 -s ours am: 8d2904a798 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7a571ab7c92abb2ca4ad03131137d80b0e78eca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:57 +00:00
TreeHugger Robot
59645605db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: adfc359191 -s ours am: 551baa2ab9 -s ours am: 3b88f078d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90e39df52548713cb4853d8c0bac59290be2af29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:55 +00:00
Bill Yi
06c436e357 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b7d27c75c -s ours am: b4f3a4a80b -s ours am: 814e539414 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa933b36f457777d723f9f5526da2a4d5ad171fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:53 +00:00
TreeHugger Robot
bb6a564095 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 48b8f07f59 -s ours am: 6438a031cf -s ours am: 7a05219d30 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0607c601a5af11d73fdbf73f50f06be7c06a79e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:51 +00:00
Bill Yi
8569557449 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 191db2e5ee -s ours am: 8a6c10f061 -s ours am: 51c11f30d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib27a2429a95081e318b421a44e9ef052a98abb68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:49 +00:00
TreeHugger Robot
d8daf1a183 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9677eea827 -s ours am: 40bf1f0624 -s ours am: e379c62d27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54ef56e447b1a3205c13bd36537be835bf7d5908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:47 +00:00
Bill Yi
1d4f3ed107 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 40e457d36b -s ours am: 4f04b6b819 -s ours am: 645595961f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie90d20673d76be37c8572ac1998015316019869c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:45 +00:00
TreeHugger Robot
d0ab0cee6c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6a28f160f8 -s ours am: e0302c6bc3 -s ours am: a92445b594 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I533d79bd523d124682c4534183fdda30e2c7071b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:43 +00:00
Bill Yi
025e56f3cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 83d48691a9 -s ours am: d2709dc485 -s ours am: d3590691fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If91b085dc39a0adb748f7aa5ee2b956d8df7875e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:41 +00:00
TreeHugger Robot
a0b76c0ef2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3dbccb9a62 -s ours am: d5ae7eb7ab -s ours am: f08ede23bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3616557f3577f91fcbc22f76274847cf9d0d1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:38 +00:00