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

756958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miguel Aranda
bfb23e7107 Merge "Correct AdditionPerfTest to return void." am: 4e7f5518f1 am: c7c95e1859 am: e25e36ace0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059947

Change-Id: I25d820c331eaa65ff3beccf29ff43c3d1aad821e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 10:04:05 +00:00
Vadim Caen
7d7fa82fe4 Merge "Fix splashscreen listener not being called" into tm-dev 2022-04-11 09:58:15 +00:00
Louis Chang
bfccc9fdcd Merge "Start a visible requested activity if still in initializing state" into tm-dev 2022-04-11 09:30:58 +00:00
Miguel Aranda
e25e36ace0 Merge "Correct AdditionPerfTest to return void." am: 4e7f5518f1 am: c7c95e1859 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059947

Change-Id: I7ce700c813572c6bd18a7af35f83194bdeb1734e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:30:17 +00:00
TreeHugger Robot
6b87f761a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 09:27:18 +00:00
TreeHugger Robot
48431be341 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4bd91cb160 -s ours am: b43f0b7af0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5cdaa0ecaddfa1d9395d581e7268d4b83475f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:09:49 +00:00
TreeHugger Robot
4f945246ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d6a17d9cb6 -s ours am: 054e990639 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81e2a04fad5453784311e878c83b5848f40b5dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:09:33 +00:00
TreeHugger Robot
8f67552116 Merge changes from topic "presubmit-am-8d82581c75db40948a1ed7924f5762d5" into sc-v2-dev-plus-aosp am: c69fe213a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17684196

Change-Id: I02271679ed8a1c5323665c7f5b484fba4da130b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:09:02 +00:00
Bill Yi
711ba0c075 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6058c01cce am: f21a24411b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iedb4ad2eb1dc66f25e73b19c57f99c261cc30a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:08:23 +00:00
TreeHugger Robot
b43f0b7af0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4bd91cb160 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71e00a43f80e4c2358c6eb438f9943616bfd9c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:08:10 +00:00
TreeHugger Robot
20d649efeb Merge changes from topic "presubmit-am-b691d4ec59ca4f32b52225122b2677e9" into sc-v2-dev-plus-aosp am: dec787ddaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17678981

Change-Id: I502e8ec9ce2e4a86e7c875f0352e6534c86c9ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:07:41 +00:00
Miguel Aranda
c7c95e1859 Merge "Correct AdditionPerfTest to return void." am: 4e7f5518f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059947

Change-Id: I61ac0fdf471ae9f00a30a02b13848879144b7b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:07:37 +00:00
TreeHugger Robot
054e990639 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d6a17d9cb6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f2b36cfd159b3a427b4465e79268686f609e777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:07:17 +00:00
Bill Yi
6b9cf03843 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 55efed825a am: 92ed75dc60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb48aa392d1b4b56860e2acbe96d0e3fa0d41871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:07:14 +00:00
TreeHugger Robot
c69fe213a7 Merge changes from topic "presubmit-am-8d82581c75db40948a1ed7924f5762d5" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6058c01cce
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-11 08:55:49 +00:00
TreeHugger Robot
4bd91cb160 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 08:55:49 +00:00
Riddle Hsu
2e495889be Merge "Clear ZBoost when removing animation leash" into tm-dev 2022-04-11 08:43:44 +00:00
Miguel Aranda
4e7f5518f1 Merge "Correct AdditionPerfTest to return void." 2022-04-11 08:37:13 +00:00
TreeHugger Robot
dec787ddaa Merge changes from topic "presubmit-am-b691d4ec59ca4f32b52225122b2677e9" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 55efed825a
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-11 08:30:32 +00:00
TreeHugger Robot
d6a17d9cb6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 08:30:32 +00:00
TreeHugger Robot
0bc526772e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 08:19:45 +00:00
TreeHugger Robot
67936291f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 07:35:27 +00:00
Chris Li
b05c7291ea Merge "Support enter PIP on Task switch for TaskFragment" into tm-dev 2022-04-11 07:19:07 +00:00
TreeHugger Robot
bb61650be8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 94547db97a -s ours am: 268453bb51 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac3f203281720dff6281fa0c50b0b4805d312598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:53:04 +00:00
Bill Yi
d0a05192fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf0b5b659c -s ours am: bc42cde3b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2cd052638432e7b35ca96c7c0a36f26cb4d8bf97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:52:53 +00:00
TreeHugger Robot
8ba256033d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 06:35:52 +00:00
TreeHugger Robot
268453bb51 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 94547db97a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I844e28ef13f47168e7d78fe4844fdc0d2cdef9a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:30:26 +00:00
Bill Yi
bc42cde3b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf0b5b659c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51aef20703f893f53cac0f4a446a926e50038421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:30:17 +00:00
TreeHugger Robot
331472243c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 06:23:54 +00:00
TreeHugger Robot
7f426aa071 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 06:22:31 +00:00
TreeHugger Robot
80dabe696b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 06:16:21 +00:00
TreeHugger Robot
94547db97a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 06:08:16 +00:00
Jerry Chang
efb263d1a4 Merge "Include all not occluded leaf tasks while wrapping animation target" into tm-dev 2022-04-11 05:37:04 +00:00
Automerger Merge Worker
fd01ec1577 Merge changes from topic "am-e7d4389ef3ef43ae9be71a000cf7211c" into tm-dev 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fa2e1e18e -s ours am: 1d763bbb72 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61ac557e2f -s ours am: 6fa5b10ca7 -s ours
 2022-04-11 05:28:44 +00:00
Automerger Merge Worker
c8734dcf2a Merge changes from topic "am-99e33d185d7f4240849743d5d7f8a703" into tm-dev 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 62bd1b9832 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de597790e4 -s ours
 2022-04-11 05:28:34 +00:00
TreeHugger Robot
82ffe5de7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fa2e1e18e -s ours am: 1d763bbb72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c53ed0d3f47293cf857b39d7ed55facb718bb25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:28:30 +00:00
TreeHugger Robot
6aa66a39b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 62bd1b9832 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee9bbc44ba5ca241c9e70154a22aeabf53f89acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:28:21 +00:00
Bill Yi
77ba4b9812 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61ac557e2f -s ours am: 6fa5b10ca7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07592c8c8ec9d5fbf5872f688df0f6a85f2501c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:28:20 +00:00
Bill Yi
eb5638f0b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de597790e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f2ea9802bbdb64993660e195fc3be1a9d677d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:28:11 +00:00
TreeHugger Robot
c2cfd4bdf2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5bb4697dcd -s ours am: f97843403b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a324d62c046b3d45fa43d33b984e4b14bc613f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:28:04 +00:00
Automerger Merge Worker
44111953b2 Merge changes from topic "am-9245448a62854e9389f901c56a0f0322" into tm-dev 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 43eca9e7e5 -s ours am: f1fcc724d1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b1539e47 -s ours am: b87cc23d17 -s ours
 2022-04-11 05:27:58 +00:00
TreeHugger Robot
772c076fb2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 43eca9e7e5 -s ours am: f1fcc724d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie645dc92201cbb75a4073e025a86b9b93c669376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:27:45 +00:00
TreeHugger Robot
a481f14fda [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 7ed8493402 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d65c0c8c90ec57703bd0e4f563c2e01935d4d2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:27:44 +00:00
TreeHugger Robot
62bd1b9832 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-11 05:27:41 +00:00
Bill Yi
45053e4e7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b1539e47 -s ours am: b87cc23d17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73a0f2aa192cc7b476c44de88bb1683bfd694593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:27:33 +00:00
TreeHugger Robot
402f04c92d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 02952b1609 -s ours am: 338c95d300 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d76026d6ded311de7ac9ff6072022c6c970c24d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:27:14 +00:00
Bill Yi
8821be3d19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39c58eb945 -s ours am: 3332d891cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib49acf47b514764bfd13d39b8c3ddb31fe10d849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:27:03 +00:00
TreeHugger Robot
e3361a70a7 Merge changes from topic "presubmit-am-ed7698d9c5f74c86a36cd43a83b9a1a8" into sc-v2-dev-plus-aosp am: 4067daa417 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17678812

Change-Id: I581385ce2cd13e141fb8aaf2236af67f8ccad843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:26:25 +00:00
Bill Yi
b8cee81d54 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 79664db756 am: 0aaf5d00cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b8996b7bac8143d35264e3e25cb94bb978ce86c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:26:14 +00:00
Shivakumar Neginal
9d37dae0dd Merge "[eSIM] Get sim state for active port index instead of DEFAULT_PORT_INDEX 0." into tm-dev 2022-04-11 05:22:22 +00:00