Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
684,870 Commits 3 Branches 0 Tags
2511ec37ee07cd5ba95ce2bfeb3cfe4ebb44ca6a
Commit Graph

2504 Commits

Author SHA1 Message Date
Hongwei Wang
7abf467d0a Merge changes from topic "presubmit-am-3741432fa32f48a290800d57fe4e6e74" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Add leash check in PipTaskOrganizer#fadeExistingPip 2p: 4353053c87
  Add leash check in PipTaskOrganizer#fadeExistingPip
 2022-02-02 01:31:37 +00:00
Mady Mellor
3b54e697be [automerge] Use the orientation from the config object not resources 2p: b73f1acdab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16763691

Bug: 216643100
Change-Id: If021132cd31b3213c66932b96056821661962afb
 2022-01-31 18:11:12 +00:00
Mady Mellor
b73f1acdab Use the orientation from the config object not resources 
Test: manual - reboot the device, rotate, drag stuff into split
             => verify that the orientation of split while dragging is
                correct
Bug: 216643100
Change-Id: I300ad7263bf2ac18575d92f057fdd9c13ef736a7
(cherry picked from commit 4a79d7cb97)
 2022-01-31 18:11:06 +00:00
TreeHugger Robot
0b193b27b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-27 13:11:00 +00:00
TreeHugger Robot
9e23d9d309 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-27 12:13:37 +00:00
Winson Chung
dcca7075d9 Merge "Remove the previous animation split tasks container when recreating" into sc-v2-dev 2022-01-26 07:52:23 +00:00
Winson Chung
7aa9ae3d6d Merge changes from topic "presubmit-am-4b93111e023146348958d97ed22a1550" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Remove the previous animation split tasks container when recreating 2p: ea468e0a95
  Remove the previous animation split tasks container when recreating
 2022-01-26 07:52:23 +00:00
Bill Yi
af1516e0a0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0279f475b5e3e1fbc32e3d2c29b0d31931a18b9b
 2022-01-26 01:36:20 +00:00
Bill Yi
e199f3d903 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id9ade68095a8101384cd4a000da706d33155ddae
 2022-01-26 01:31:06 +00:00
Tony Huang
175aa192cf Merge changes from topic "presubmit-am-8fe06d94db0b4326ab412885caecafc6" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] DO NOT MERGE Fix divider animation from overview screen 2p: 7214fd7e2e
  DO NOT MERGE Fix divider animation from overview screen
 2022-01-26 01:18:40 +00:00
Presubmit Automerger Backend
bfa82564ec [automerge] Remove the previous animation split tasks container when recreating 2p: ea468e0a95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16692579

Bug: 197919703
Change-Id: I18e70b717a462bdee86093dd63e18f355c72163b
Merged-In: Iad8b9d9a0d75bdaaa2a7255a33208c2c0c3fc25b
 2022-01-26 00:38:47 +00:00
Winson Chung
ea468e0a95 Remove the previous animation split tasks container when recreating 
Bug: 197919703
Test: Invoke split and swipe up a couple times, ensure the sf dump
      doesn't show multiple lingering split containers layers
Change-Id: Iad8b9d9a0d75bdaaa2a7255a33208c2c0c3fc25b
Merged-In: Iad8b9d9a0d75bdaaa2a7255a33208c2c0c3fc25b
 2022-01-25 23:24:15 +00:00
Hongwei Wang
3cda688f63 [automerge] Add leash check in PipTaskOrganizer#fadeExistingPip 2p: 4353053c87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16719697

Bug: 197319184
Change-Id: I08c012637e1e7c38c579bec2175d69e4cf4e63a6
 2022-01-25 21:21:51 +00:00
Hongwei Wang
4353053c87 Add leash check in PipTaskOrganizer#fadeExistingPip 
Bug: 197319184
Test: N/A, not sable to reproduce the issue, adding protection based on
      the stack trace
Change-Id: I6363dd425eac6332f59fe1fed074c6518227580f
 2022-01-25 13:21:14 -08:00
Treehugger Robot
9e5539c793 Merge "Create owner test files for subpackages" am: 9e8cfbac2c am: 05bc30f21c am: a39bb54fdd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952387

Change-Id: I94c28df75a0af1ea24dcc388fee84c093268ffd0
 2022-01-21 15:56:50 +00:00
Treehugger Robot
a39bb54fdd Merge "Create owner test files for subpackages" am: 9e8cfbac2c am: 05bc30f21c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952387

Change-Id: I5a4f26de3f474fe5794d94ca1f581b317ac1bb37
 2022-01-21 15:46:05 +00:00
Tony Huang
65988b4bba [automerge] DO NOT MERGE Fix divider animation from overview screen 2p: 7214fd7e2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16689762

Change-Id: I134abce4b81e965adc062410717256de9d9a20a3
 2022-01-21 10:03:26 +00:00
Tony Huang
7214fd7e2e DO NOT MERGE Fix divider animation from overview screen 
Divider leash is create too quickly to make it show before the
animtation. Fix it by only create leash but don't show it before
animation start and set it to visible after animation end.

Fix: 215322621
Test: manual
Test: pass existing tests
Change-Id: Iaa068d5a6186cac1e1aad4b30d6f5e76943ebd08
 2022-01-21 10:03:17 +00:00
Ben Lin
6c5c7f6fb8 Merge "PiP: Disable enterSplit for now." into sc-v2-dev am: b80e7c46da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16458641

Change-Id: Ieff5dcb48b157c401818ff981b1b1eedc15183cc
 2022-01-20 23:13:14 +00:00
Nataniel Borges
4e4babec1a Create owner test files for subpackages 
Now failures can be automatically directed to the correct buganizer components and forwarded directly to the correct assignees, instead of being all created into the Winscope for further triage

Test: check owners file
Change-Id: I6876a702b4f46443328aab027f7fee994b2bb819
 2022-01-20 10:21:40 +00:00
Ben Lin
eab029ce8d PiP: Disable enterSplit for now. 
Bug: 206645013
Test: Enter split button no longer appears
Change-Id: I6237dd1c88f50733ab24e45806c413d5777032e9
 2022-01-20 02:15:21 +00:00
Bill Yi
c8a4f437c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaf42323ce36547d1209961307cdc93c65a64066e
 2022-01-14 02:14:50 +00:00
Mariia Sandrikova
a274e1a7d4 DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." am: 7617679a61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16571392

Change-Id: I0adf2bf45c5f7d7349e9c0f180aea9d10f70645d
 2022-01-13 22:55:51 +00:00
Mariia Sandrikova
04ce06bb79 Merge changes from topic "revert-16468379-CXJTAENUWN" into sc-v2-dev 
* changes:
  DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..."
  DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control."
  DO NOT MERGE Revert "Log the CameraCompatControlEventReported atom."
 2022-01-13 22:41:22 +00:00
Mariia Sandrikova
7617679a61 DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." 
Revert submission 16468379

Reason for revert: Feature development is moving to T.

Reverted Changes:
Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro...
Id6be4a954:Enable a camera app compat control on Large screen...
I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-...

Bug: 206602997

Change-Id: I9ad876043fd61f708a8f468fffd1ef371bfa0866
 2022-01-13 15:21:38 +00:00
Aurimas Liutikas
aec26c4f68 DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control." 
Revert submission 16468379

Reason for revert: Feature development is moving to T.

Reverted Changes:
Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro...
Id6be4a954:Enable a camera app compat control on Large screen...
I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-...

Bug: 206602997

Change-Id: I318b89b87cd3b05a3f3dcd428e3d80fe81465011
 2022-01-13 15:16:51 +00:00
Winson Chung
bab740d0b4 Merge "Return non-null empty list if the controller is already invalidated" into sc-v2-dev am: a76e46ee03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16615270

Change-Id: I9f09acee30f935206973774fcb143d58f470b9b2
 2022-01-13 01:57:27 +00:00
Winson Chung
a76e46ee03 Merge "Return non-null empty list if the controller is already invalidated" into sc-v2-dev 2022-01-13 01:42:19 +00:00
Tony Huang
1343931512 Merge "Avoid NPE while drag divider bar" into sc-v2-dev am: fcfa227cf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602936

Change-Id: I3fe73e84b92c87ec6f009bc7b671d529a857820f
 2022-01-12 01:41:24 +00:00
Tony Huang
fcfa227cf7 Merge "Avoid NPE while drag divider bar" into sc-v2-dev 2022-01-12 01:21:28 +00:00
Winson Chung
d0823fc830 Return non-null empty list if the controller is already invalidated 
- In the off chance that the controller is already invalidated (due to
  service reconnection to launcher for example), then any calls through
  the previous binder should just return an empty task list.

Bug: 206648922
Test: Manual (haven't been able to repro)
Change-Id: Iff6193fa89c2baecc527e589f17ae41b82575a48
 2022-01-11 19:57:26 +00:00
Mady Mellor
04b46aed49 Merge "Fix possible NPE" into sc-v2-dev am: d76f9c199c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16603090

Change-Id: I50140f087019333fc4ca5b3668cddc20a2ead3b9
 2022-01-11 17:53:27 +00:00
Mady Mellor
d76f9c199c Merge "Fix possible NPE" into sc-v2-dev 2022-01-11 17:36:43 +00:00
Tony Huang
f0d69e7d47 Avoid NPE while drag divider bar 
Task topActivityInfo is nullable, we should check it is null or
not before access it.

Bug: 213894166
Test: pass existing tests
Change-Id: Iedda57145586b6d5c2e151308ddca1e2e36035c0
 2022-01-11 14:58:17 +08:00
Winson Chung
049cf6bb1e Merge "Ensure only single pip dismiss magnetized target exists" into sc-v2-dev am: f92999a5e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602749

Change-Id: Ibe881d27475564731817bd7b868118e6333d9614
 2022-01-11 06:21:52 +00:00
Winson Chung
f92999a5e1 Merge "Ensure only single pip dismiss magnetized target exists" into sc-v2-dev 2022-01-11 06:08:29 +00:00
Treehugger Robot
80a8bec986 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:50:18 +00:00
Winson Chung
b5e0878776 Ensure only single pip dismiss magnetized target exists 
- If init() is called multiple times, the previous magnetized targets
  can cause the wrong target position to be calculated when trying (or
  not trying) to dismiss

Bug: 213348722
Test: Manual
Change-Id: Ic1f972cc60eafca2302ad168065c974c8a0ee924
 2022-01-11 00:22:42 +00:00
Mady Mellor
0be1b45d64 Fix possible NPE 
Test: manual - make sure dot works normally / no regression
Bug: 213027822
Change-Id: I819f73cb8c7d613796c3d3bb4b55b80b337c6126
 2022-01-10 21:07:31 +00:00
Bill Yi
4c1a6f5c0c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I630367ef968c6c243fdfaf74c3454a5b2317c28f
 2022-01-10 14:56:26 +00:00
Bill Yi
a3da5ba222 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb329a7d407da9b8dc2bf002d706636c319a881f
 2022-01-10 14:54:59 +00:00
TreeHugger Robot
581ad142f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:21:03 +00:00
TreeHugger Robot
34171e053d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:20:12 +00:00
Bill Yi
9f612755b6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifab08e6f5047b918b9d9eb318085f9e281b7fb4a
 2022-01-08 05:06:10 +00:00
Bill Yi
301d5c5963 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I97d5ca669c13fda5f3c25b97f42ee359953fe172
 2022-01-08 05:00:53 +00:00
Mariia Sandrikova
0cb2c45802 Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev am: b6c52ec273 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16527687

Change-Id: Ib282c2fc1fd01d26841ee2003cd604d4150e569f
 2022-01-07 11:02:56 +00:00
Mariia Sandrikova
b6c52ec273 Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev 2022-01-07 10:49:20 +00:00
Bill Yi
6042a19c72 Merge sc-qpr1 to aosp-master - DO NOT MERGE 
Merged-In: I90ca5ccbf686a975f479c2488ff34f82af12946a
Merged-In: I128f5ed6c1bad350ea449bba5da21123de3ea31b
Change-Id: Ib18c8042f735dceeee5e6ab9f1c963cf630913a6
 2022-01-06 18:38:32 -08:00
Tony Huang
c015533563 Merge "Fix updateRecentTasksSplitPair unexpectly" into sc-v2-dev am: 588771a9de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16564588

Change-Id: Iee0b86019c26a215834b0d34b9778083c38f3dec
 2022-01-05 04:13:13 +00:00
Tony Huang
588771a9de Merge "Fix updateRecentTasksSplitPair unexpectly" into sc-v2-dev 2022-01-05 03:58:53 +00:00