Commit Graph

157 Commits

Author SHA1 Message Date
Jay Aliomer
4951390af2 Merge "Revert "Revert "setup robolectric for sysui""" into tm-qpr-dev-plus-aosp am: 982e468f1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20580786

Change-Id: I702c9669471bcc00f358517b61e7b3a7f872580d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30 19:53:00 +00:00
Jay Aliomer
9b13ae141c Revert "Revert "setup robolectric for sysui""
This reverts commit 84a7ad2a39.

Reason for revert: re-submitting CL

Change-Id: I8f31f99e612f4aaaadcb6c8df9f46d9388cfec9b
2022-11-28 22:07:45 +00:00
Krzysztof Kosiński
7b57978a86 Merge "Revert "setup robolectric for sysui"" into tm-qpr-dev-plus-aosp am: 4ed034f28a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20556457

Change-Id: I994feb2556a4c8594a415dfac6fe2d0a5c39118b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25 02:47:58 +00:00
Krzysztof Kosiński
84a7ad2a39 Revert "setup robolectric for sysui"
This reverts commit fac84d7fdf.

Reason for revert: Causes an exception in errorprone. Example log:
https://android-build.googleplex.com/builds/pending/P44757438/errorprone/latest/view/logs/error.log

Change-Id: I9fe91baf83641ae0c2e94b5bb049cb99c39cfde6
2022-11-25 00:35:37 +00:00
Jay Aliomer
80d27880a0 setup robolectric for sysui am: fac84d7fdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20385101

Change-Id: I7db60773410137fe261d4518737ed2b936d0dd3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 18:49:59 +00:00
Jay Aliomer
fac84d7fdf setup robolectric for sysui
re-organize tests based on categories: on-device and robolectric

Fixes: 257246579
Test: SysuiResourceLoadingTest
Change-Id: I2f47fdce97d58d0deebe52e46570396b8c4ead3d
2022-11-23 16:35:52 +00:00
Hawkwood Glazier
f19409d1ea Add Customization Lib am: b8eef87bc2 am: ee8cc9a2b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20448929

Change-Id: I943e5df4635e4cab995621a4e88400129018ea8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 21:37:02 +00:00
Hawkwood Glazier
ee8cc9a2b4 Add Customization Lib am: b8eef87bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20448929

Change-Id: Ifbd5ce3b734325f5974f23d8debbeba12a32df61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 21:26:36 +00:00
Hawkwood Glazier
b8eef87bc2 Add Customization Lib
Bug: 258424862
Test: Manually rebuilt everything
Change-Id: If683023d2f592bb09827a50fbc79559b5b57cb3a
2022-11-18 21:13:35 +00:00
Dave Mankoff
13f0ffc61f Merge changes I29bf2065,Ic858826c,I7fe0bd12 into tm-qpr-dev am: 2dcc550cb7 am: df1cee3f22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20414824

Change-Id: Id6d2e970541f246a2ec6f1510b9ebdd85f3107b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 02:51:52 +00:00
Dave Mankoff
df1cee3f22 Merge changes I29bf2065,Ic858826c,I7fe0bd12 into tm-qpr-dev am: 2dcc550cb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20414824

Change-Id: If053320b02960ffbc57c4d88316e16d3284481f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 02:04:33 +00:00
Dave Mankoff
57d1b2afa2 Define server flag names for all existing flags.
Removes reflection from our flag infrastructure.

Bug: 249121873
Fixes: 258235428
Test: manual
Change-Id: I29bf2065ba5885789e3fe94c0d6cdbae5e42a4d0
2022-11-09 17:10:09 +00:00
Rahul Banerjee
9873e79ec7 Merge "Migrate Controls{ProviderSelector,Favoriting,Editing}Activities" into tm-qpr-dev am: 10861bf19d am: 23bc5e6bcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342393

Change-Id: I3d5aec2c028bbf5cd7a4015400ca2f667aae1e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 01:35:07 +00:00
Rahul Banerjee
23bc5e6bcb Merge "Migrate Controls{ProviderSelector,Favoriting,Editing}Activities" into tm-qpr-dev am: 10861bf19d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342393

Change-Id: I67c0fc052b410f3a5499fd399779afb64ff265cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 01:16:34 +00:00
Rahul Banerjee
10861bf19d Merge "Migrate Controls{ProviderSelector,Favoriting,Editing}Activities" into tm-qpr-dev 2022-11-09 01:08:55 +00:00
Rahul Banerjee
326c2507ed Migrate Controls{ProviderSelector,Favoriting,Editing}Activities
This moves the activities to the new Predictive Back dispatch mechanism.
Added unit tests for each (note: used a latch to synchronize the test and ui threads)

Bug: 255355028
Test: Passed atest <testname>
Change-Id: I775f636f8679abfd50a595dd56fb8fa3f23e0fef
2022-11-08 11:04:41 -08:00
Dave Mankoff
d99c94977d Merge "Include all flags in our flag list." into tm-qpr-dev am: 8fd3032fce am: 1becd8179a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20318731

Change-Id: Ia3bc2402a607fea56234fece38f8214c253e3bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 15:09:59 +00:00
Dave Mankoff
1becd8179a Merge "Include all flags in our flag list." into tm-qpr-dev am: 8fd3032fce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20318731

Change-Id: I02c36fb40401663a7028b8f745dc6e5ff4f06405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 14:38:44 +00:00
Dave Mankoff
8fd3032fce Merge "Include all flags in our flag list." into tm-qpr-dev 2022-11-06 14:12:44 +00:00
Dave Mankoff
9f825a8ba1 Include all flags in our flag list.
This improves the use of reflection to include all the flags listed
in Flags.kt. One interseting finding: I can't figure out how to
get the value of a field marked with just `@Keep`. It needs to
also have `@JvmField` or not have any annotations at all.

More changes to this code will come in follow up cls, using string
names where appropriate, but this improves existing functionality.

Key takeaways:
- Reflection is terrible
- Reflection in Kotlin is worse
- Reflection on `object` instances is worse still
- Reflection mixing Java with Kotlin follows the trend line
- Reflection on annotated fields is nigh impossible

Bug: 249121873
Test: adb shell cmd statusbar flag
Change-Id: I69a96501876b01570233c3fd80b6bc7334d9fe73
2022-11-05 23:57:51 +00:00
Omar Miatello
62c75293ae Merge "Add support for Predictive Back in CreateUserActivity" into tm-qpr-dev am: 78b5de4a42 am: bfb8c6855a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20257566

Change-Id: I8996821b473012fda827bbebdcebf34f9a997c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05 09:46:06 +00:00
Omar Miatello
bfb8c6855a Merge "Add support for Predictive Back in CreateUserActivity" into tm-qpr-dev am: 78b5de4a42
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20257566

Change-Id: I520bce546449d17df380b6fe2f2a54468c0d6bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05 08:57:54 +00:00
omarmt
d1c43eaa15 Add support for Predictive Back in CreateUserActivity
Test: atest CreateUserActivityTest
Bug: 254840316
Change-Id: I9d00c114ae38e72f11678dab93d3feaf222463d1
2022-11-04 15:56:02 +00:00
Johannes Gallmann
3ee972ae82 Merge "Implement MotionTool Interface using ViewCapture library" into tm-qpr-dev am: e95b375dd1 am: f1501b0096
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20111438

Change-Id: I341dded983070313a94778dde99720ee1d2ba376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 18:40:00 +00:00
Johannes Gallmann
f1501b0096 Merge "Implement MotionTool Interface using ViewCapture library" into tm-qpr-dev am: e95b375dd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20111438

Change-Id: Ib636895770d74eb505d55f056c65a18d0238010d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 17:27:03 +00:00
Johannes Gallmann
0d5183cb9d Implement MotionTool Interface using ViewCapture library
Bug: 255929005
Test: atest frameworks/libs/systemui/motiontoollib/tests/com/android/app/motiontool
Change-Id: I2e7de355d7749a273b9454b8bbee117059ee7a10
2022-11-03 10:28:37 +00:00
Daniel Peykov
6af45b8fab Merge "Update uiautomator references in frameworks/base" am: b6d9367bc9 am: 089f7d6380 am: dfe7fc99a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219973

Change-Id: I23e11be0d0c897f4da759941ca5b7741d8398165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:24:27 +00:00
Daniel Peykov
dfe7fc99a3 Merge "Update uiautomator references in frameworks/base" am: b6d9367bc9 am: 089f7d6380
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219973

Change-Id: Idd3875bea82b67b9f2d03c7cbbcdb18b2bb39175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 18:09:05 +00:00
Daniel Peykov
089f7d6380 Merge "Update uiautomator references in frameworks/base" am: b6d9367bc9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219973

Change-Id: I486de09a1db184012ae42d1e9c923e443bbd2dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:59:25 +00:00
Hongwei Wang
3f89423c33 Merge "Save ProtoLog viewer configuration in WMShell" into tm-qpr-dev am: a1db600e04 am: 4222f4e320
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19830265

Change-Id: Ib6fddf6dfa3f1e96fb5a67d00394bcbc0548fc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 18:12:06 +00:00
Hongwei Wang
4222f4e320 Merge "Save ProtoLog viewer configuration in WMShell" into tm-qpr-dev am: a1db600e04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19830265

Change-Id: Ib965ad51cc660f55c24fb90c59888454d4635e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 17:38:13 +00:00
Daniel Peykov
6d91c980e3 Update uiautomator references in frameworks/base
* Replace "androidx.test.uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 247008528
Test: presubmit
Change-Id: I3d4de8bd97144d44f6b699a5c4e0acde380d9d60
2022-10-05 16:58:37 +00:00
Hongwei Wang
2b227ee11d Save ProtoLog viewer configuration in WMShell
In this changeset topic
- Build WMShell with protolog viewer config
    - it's built with SystemUI{,Google} packages and installed as
      /system_ext/etc/wmshell.protolog.json.gz
- Deprecated the viewer configuration as a bundled resource
- The `required` keyword in Android.bp does not propagate, need to add
  it in individual Android.bp file such as SystemUIGoogle/Android.bp
- Push the generated viewer config file onto device in makepush script
  (in a separate CL)

Bug: 244642224
Test: mp sysuig
Change-Id: Ib7f37ec55d12493d6beec3aba66883415966b521
2022-10-05 09:36:42 -07:00
Lucas Silva
00a4f69a91 Merge "Hide the status bar dream overlay when low light is active." into tm-qpr-dev am: 2da886cb7d am: 09217538b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993591

Change-Id: I3fd503a05d4ca1be80e7b50d44c5be315adb04b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:23:38 +00:00
Lucas Silva
09217538b9 Merge "Hide the status bar dream overlay when low light is active." into tm-qpr-dev am: 2da886cb7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993591

Change-Id: Idd4f82b99bbe8dacb59568c44ebe9f65e7712d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:49:46 +00:00
Lucas Silva
0bfb405bd3 Hide the status bar dream overlay when low light is active.
We pipe the component name of the currently active dream into the
overlay service, and when the active dream is lowlight, we hide the
status bar.

Test: atest DreamOverlayStateControllerTest
Test: atest DreamOverlayStatusBarViewControllerTest
Test: manually on device by entering/exiting low light and ensuring the
status bar is hidden
Fixes: 245386662

Change-Id: I22973538bea19ef108360a319c70c878cfd81800
2022-09-22 13:12:53 -04:00
TreeHugger Robot
ef50a0d697 Merge "Log UiEvents whenever FaceAuth is triggered." into tm-qpr-dev am: f506a90735
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867009

Change-Id: Ie5be18841ae62cca9546fd3c0133efbe4fa62083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 21:09:32 +00:00
Chandru
917e4bc214 Log UiEvents whenever FaceAuth is triggered.
Test: atest KeyguardUpdateMonitor passes
Test: $ANDROID_HOST_OUT/bin/statsd_testdrive -terse 90  shows the
Test: atest FaceAuthReaonTest passes
triggered face auth UI events.
Bug: 238809124

Change-Id: I6cb04f7cccdaf92e77b8e5691bf5ac458928ff86
Merged-In: I6cb04f7cccdaf92e77b8e5691bf5ac458928ff86
2022-09-07 18:51:51 +00:00
Chandru S
997a17f0df Merge "Log UiEvents whenever FaceAuth is triggered." 2022-09-07 15:34:50 +00:00
TreeHugger Robot
01a7eb3c87 Merge "Update SystemUI R8 documentation" into tm-qpr-dev am: 5c2403298f am: 09ef09f8a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539265

Change-Id: I8bd8cbc8f58f64472dc3f81d5c00e19e32147499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 22:52:51 +00:00
TreeHugger Robot
09ef09f8a1 Merge "Update SystemUI R8 documentation" into tm-qpr-dev am: 5c2403298f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539265

Change-Id: I2b614aec2612ee11233b69ea66d18efce666236e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 21:56:26 +00:00
TreeHugger Robot
5c2403298f Merge "Update SystemUI R8 documentation" into tm-qpr-dev 2022-09-06 21:27:52 +00:00
Chandru
5a5e533fde Log UiEvents whenever FaceAuth is triggered.
Test: atest KeyguardUpdateMonitor passes
Test: $ANDROID_HOST_OUT/bin/statsd_testdrive -terse 90  shows the
Test: atest FaceAuthReaonTest passes
triggered face auth UI events.
Bug: 238809124

Change-Id: I6cb04f7cccdaf92e77b8e5691bf5ac458928ff86
2022-09-06 19:26:00 +00:00
Chandru S
03575ded69 Revert "Log UiEvents whenever FaceAuth is triggered."
This reverts commit 81fe7f64d7.

Reason for revert: Broke the build on master while still having presubmit-verified +1 :( 

Change-Id: I2cf6a05b7187552d9df43fe96cda458b1fdd7631
2022-09-06 18:34:33 +00:00
Chandru
81fe7f64d7 Log UiEvents whenever FaceAuth is triggered.
Test: atest KeyguardUpdateMonitor passes
Test: $ANDROID_HOST_OUT/bin/statsd_testdrive -terse 90  shows the
Test: atest FaceAuthReaonTest passes
triggered face auth UI events.
Bug: 238809124

Change-Id: I0ed5151760ba7706bb5c937e4828e5d303b475b8
2022-09-05 09:39:25 +00:00
Jordan Demeulenaere
5dcaa51b7d Implementation of the FooterActions following the MAD (1/3) am: 6fb22d4b16 am: f8aaf7ab5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19678215

Change-Id: I951b320e422e9171ae638bb0a93daa6009db5003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 16:27:29 +00:00
Jordan Demeulenaere
f8aaf7ab5f Implementation of the FooterActions following the MAD (1/3) am: 6fb22d4b16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19678215

Change-Id: I71cb9668445f277fadc69294e60bf2ff63a46cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 07:09:54 +00:00
Jordan Demeulenaere
6fb22d4b16 Implementation of the FooterActions following the MAD (1/3)
This CL provides most of the implementation of the QS FooterActions
following the modern Android architecture. In particular, this CL
includes:
 - repositories in the data layer.
 - an interactor in the domain layer.
 - a view model in the ui layer.

The ViewBinder is added in ag/19674347, given that it comes together
with changes to the existing XML files.

Note that after this CL, the new implementation will still not be used
as it won't be wired yet. This is done in ag/19674347.

The highest value of the tests is in FooterActionsViewModelTest, which
focuses on testing the *state* (view model) of the footer actions using
the *real implementation* of the repositories, interactor and viewModel
all together. To do so, I implemented a FooterActionsUtils class that
allows to *easily* create real implementations of those repositories,
interactor and view model, without requiring the caller to provide any
parameter. I believe that this is even better than introducing new
fakes, and it should hopefully lead us towards using more and more of
the real implementations in our tests, and less and less of fakes/mocks,
making the tests much more useful. Of course, I still had to use fake &
mocks for the classes I'm calling to and for which instantiating the
actual object is too painful. As you can see, there are no test files
for the repositories: given that we already use the real implementations
in the ViewModel tests, they are defacto already tested.

I still added some tests on *interactions* (not *state*) in
FooterActionsInteractorTest. Even though I believe those tests don't
provide much value (they are merely a copy/paste of the implementation),
I preferred keeping the same coverage as the current tests (some of
which are going to be removed in ag/19674347).

Note that the business logic contained in this CL was mostly copy/pasted
from the current implementation, as I wanted to make sure that this is
going to be a pure refactoring that does not change the logic of this
feature. Still, I left some TODOs in the code for potential
improvements.

Bug: 242040009
Test: atest FooterActionsViewModelTest
Test: atest FooterActionsInteractorTest
Change-Id: Ia0bdf9824e098ad6604709f5db87576437b0a904
2022-08-25 16:24:00 +02:00
Cole Faust
43c6d3dd17 Merge "Mark SystemUI-tests as test code for lint" am: 0b33d054b3 am: f214872067 am: 5954744b9c am: d4e5c17068 am: 93e7ddd44e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2184008

Change-Id: Ibcc256aad0046eaedf631091bd07441328d9f9ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 22:55:10 +00:00
Cole Faust
93e7ddd44e Merge "Mark SystemUI-tests as test code for lint" am: 0b33d054b3 am: f214872067 am: 5954744b9c am: d4e5c17068
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2184008

Change-Id: Iecb83dcb0c2051141b8c1a7a173433da97918784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 22:28:04 +00:00