Commit Graph

662977 Commits

Author SHA1 Message Date
Colin Cross
2fb12c777d Add Sv2 to aapt2 codenames
Bug: 193674948
Test: m checkbuild
Change-Id: Ibf94bae9be5767ffa1422e4d9800cc862dd64ffd
2021-08-04 23:50:25 +00:00
Colin Cross
bce33c97d4 [automerger skipped] Merge "Add Sv2 to aapt2 codenames" into sc-v2-dev am: 7936210c7f -s ours
am skip reason: Merged-In I3f136f505bce80d0eb7f8b0cca316041730a4580 with SHA-1 a1250b59ab is already in history

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

Change-Id: I23cc2b764b14a4a7eabdef486fe211bde9ab854c
2021-08-04 23:39:27 +00:00
Mohammad Islam
231fc29168 Merge "Add new owners for ApexManagerTest file" am: d2418c2839 am: a940ad425a am: 8116f29159
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786867

Change-Id: I365400fee6a986a43ba68778c47f08893a5cff2a
2021-08-04 23:39:07 +00:00
Colin Cross
7936210c7f Merge "Add Sv2 to aapt2 codenames" into sc-v2-dev 2021-08-04 23:29:30 +00:00
Mohammad Islam
8116f29159 Merge "Add new owners for ApexManagerTest file" am: d2418c2839 am: a940ad425a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786867

Change-Id: I6fbe5ba6a975dadec33be9e221d8b735ffcf759c
2021-08-04 23:26:57 +00:00
Mohammad Islam
a940ad425a Merge "Add new owners for ApexManagerTest file" am: d2418c2839
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786867

Change-Id: I0046b943d6bd7e819b4f49bd505b80a7082b5f17
2021-08-04 23:16:33 +00:00
Mohammad Islam
d2418c2839 Merge "Add new owners for ApexManagerTest file" 2021-08-04 23:00:35 +00:00
John Reck
704222ce92 Merge "Have RippleDrawable ignore non-attached RenderNodes" into sc-dev am: a633284efe am: 44d4b3b3b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463315

Change-Id: Id66c34a2c0970a8b1b9b4b7fd70e8174332a8f74
2021-08-04 22:48:19 +00:00
John Reck
defc01b45a Merge "Have RippleDrawable ignore non-attached RenderNodes" into sc-dev am: a633284efe am: e452bd6602
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463315

Change-Id: If142d3f5169f7060fbea9b24842e0f0f6174a3a7
2021-08-04 22:47:56 +00:00
John Reck
e452bd6602 Merge "Have RippleDrawable ignore non-attached RenderNodes" into sc-dev am: a633284efe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463315

Change-Id: I690b33ec82247f8f1704ebf5111a4f9ac52cd0d4
2021-08-04 22:38:42 +00:00
John Reck
44d4b3b3b8 Merge "Have RippleDrawable ignore non-attached RenderNodes" into sc-dev am: a633284efe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463315

Change-Id: I69a1b6360c877ed2b463b0164ac1be2b5a892ed3
2021-08-04 22:37:50 +00:00
John Reck
a633284efe Merge "Have RippleDrawable ignore non-attached RenderNodes" into sc-dev 2021-08-04 22:22:21 +00:00
Evan Rosky
23e4f9d4da Merge "Fix shell-transit to legacy app-cancel metrics" into sc-v2-dev am: bfe16934ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15458850

Change-Id: I06e109452af887ac416f43b760b07c7c225bfea6
2021-08-04 21:58:36 +00:00
Evan Rosky
bfe16934ec Merge "Fix shell-transit to legacy app-cancel metrics" into sc-v2-dev 2021-08-04 21:43:15 +00:00
Brad Ebinger
47fa7494af Merge "Remove SipDelegates in ImsService if Phone process crashes" into sc-dev am: 60b4b0e476 am: 69a1b911c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15448091

Change-Id: I59c5ec812654616b22dd4aae9c8c1a00e28b88b0
2021-08-04 20:53:29 +00:00
Brad Ebinger
ad05192a6b Merge "Remove SipDelegates in ImsService if Phone process crashes" into sc-dev am: 60b4b0e476 am: d03f9129cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15448091

Change-Id: I915e5263a17418f590a925c61acba96bbe222b05
2021-08-04 20:50:46 +00:00
Automerger Merge Worker
1f9b5e8bde Merge "Merge "Add new Flag class. New FlagReaderPlugin." into sc-v2-dev am: d80f48c3bd" into sc-v2-dev-plus-aosp 2021-08-04 20:50:31 +00:00
Brad Ebinger
69a1b911c8 Merge "Remove SipDelegates in ImsService if Phone process crashes" into sc-dev am: 60b4b0e476
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15448091

Change-Id: I15dd36b7bb9cc617cd673eaa4da3d558e6202c06
2021-08-04 20:50:25 +00:00
Dave Mankoff
ad6520a562 Merge "Add new Flag class. New FlagReaderPlugin." into sc-v2-dev am: d80f48c3bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405311

Change-Id: I3a0eb89ddbc436efc1ef837551f2ab5f8401c8db
2021-08-04 20:50:22 +00:00
Dave Mankoff
5dcfe406a5 Merge "Force an initial event to be sent to ProximitySensor." into sc-dev am: 831b21f456 am: b5dab969d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15455734

Change-Id: I0c24efe98f7df564bbe85fdb059d87ef43219054
2021-08-04 20:50:21 +00:00
Dave Mankoff
a1494d6287 Merge "Force an initial event to be sent to ProximitySensor." into sc-dev am: 831b21f456 am: 4bbc2bc9f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15455734

Change-Id: I882361fce1b2140b10000b018b20add5d3108151
2021-08-04 20:50:00 +00:00
Brad Ebinger
d03f9129cd Merge "Remove SipDelegates in ImsService if Phone process crashes" into sc-dev am: 60b4b0e476
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15448091

Change-Id: Iac35d1510b8c3913c700aca385b79a0ddd9c584d
2021-08-04 20:49:03 +00:00
Dave Mankoff
d80f48c3bd Merge "Add new Flag class. New FlagReaderPlugin." into sc-v2-dev 2021-08-04 20:42:31 +00:00
Brad Ebinger
60b4b0e476 Merge "Remove SipDelegates in ImsService if Phone process crashes" into sc-dev 2021-08-04 20:33:38 +00:00
Dave Mankoff
4bbc2bc9f4 Merge "Force an initial event to be sent to ProximitySensor." into sc-dev am: 831b21f456
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15455734

Change-Id: Ibc10a30a3eaba94d214afb01bbb107a77aa9db14
2021-08-04 20:29:13 +00:00
Dave Mankoff
b5dab969d1 Merge "Force an initial event to be sent to ProximitySensor." into sc-dev am: 831b21f456
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15455734

Change-Id: I18307b7b86a23a7f5271375766b0f8cd16789f30
2021-08-04 20:28:05 +00:00
Jayachandran Chinnakkannu
a1eb622ab0 Merge changes from topic "telephony-owners" into sc-dev am: f173d238fc am: 8b82e5e917
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15445866

Change-Id: I745bb22f39087d70a2414706cd41c5548c70bae4
2021-08-04 20:21:53 +00:00
Jayachandran C
f40e5b2b98 Update telephony OWNERS file am: feef48ebff am: 0c17eeb53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15449228

Change-Id: Icb86eb95f977776b57f6e1196d11c84291feab5a
2021-08-04 20:21:48 +00:00
Jayachandran C
240b0db70e Update telephony OWNERS file am: 874b716420 am: 93ae0702d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15453627

Change-Id: I16ba13ee8574b79a5c4bee7237c247570dd3bb3e
2021-08-04 20:21:42 +00:00
Jayachandran Chinnakkannu
085e1b5727 Merge changes from topic "telephony-owners" into sc-dev am: f173d238fc am: df363631ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15445866

Change-Id: I264464cc6aa5596cceb60e53e68955c97f3ad4cb
2021-08-04 20:20:52 +00:00
Dave Mankoff
831b21f456 Merge "Force an initial event to be sent to ProximitySensor." into sc-dev 2021-08-04 20:14:48 +00:00
Jayachandran Chinnakkannu
df363631ea Merge changes from topic "telephony-owners" into sc-dev am: f173d238fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15445866

Change-Id: Ia37c56f758d859e11ea685773a007ada8395a6db
2021-08-04 20:05:07 +00:00
Jayachandran Chinnakkannu
8b82e5e917 Merge changes from topic "telephony-owners" into sc-dev am: f173d238fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15445866

Change-Id: I5f1ea4005e51ac3ab6774a44a52b3bd800e9d7ce
2021-08-04 20:04:57 +00:00
Jayachandran C
0c17eeb53d Update telephony OWNERS file am: feef48ebff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15449228

Change-Id: I33e235e3bce64cd8f9e5f556a08fb4981a323ac1
2021-08-04 20:04:51 +00:00
Jayachandran C
93ae0702d7 Update telephony OWNERS file am: 874b716420
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15453627

Change-Id: I6a51637474e9f083cafe315c142377469198c9cb
2021-08-04 20:04:35 +00:00
Colin Cross
06be0817e2 Add Sv2 to aapt2 codenames
Bug: 193674948
Test: m checkbuild
Merged-In: I3f136f505bce80d0eb7f8b0cca316041730a4580
Change-Id: Ibf94bae9be5767ffa1422e4d9800cc862dd64ffd
2021-08-04 12:43:40 -07:00
Jayachandran Chinnakkannu
f173d238fc Merge changes from topic "telephony-owners" into sc-dev
* changes:
  Update telephony OWNERS file
  Update telephony OWNERS file
  Update telephony OWNERS file
2021-08-04 19:36:12 +00:00
Samiul Islam
cad14a75a0 Add new owners for ApexManagerTest file
This matches with owners of ApexManager.java file.

Test: presubmit
Change-Id: Ie34c9059abe27edc5cc6732d819ba1aea8b40a49
2021-08-04 20:20:12 +01:00
Peter Wang
5b52a5e0a6 Merge "Add switchSubscription and delete_subscription to protected broadcast" into sc-dev am: d459da6362 am: 54655f5aae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13781084

Change-Id: Iaf36221bec0e9157c5afd6992dc10fb092c15ea2
2021-08-04 18:53:20 +00:00
Peter Wang
801bbf2d04 Merge "Add switchSubscription and delete_subscription to protected broadcast" into sc-dev am: d459da6362 am: 81d84eccfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13781084

Change-Id: Ic4c97a05f5be387d39f62718ab84901a88f12d50
2021-08-04 18:52:58 +00:00
John Reck
a355e904a2 Have RippleDrawable ignore non-attached RenderNodes
Don't try to do a RenderNodeAnimation if the RenderNode
isn't attached. Although this isn't strictly speaking a
valid state to be in, it's also easy for RippleDrawable
to just ignore it.

Bug: 186864959
Test: ripples still show up, are still RT accelerated normally
Change-Id: I8127f1419508157eb83ac9bb1562745ac53d2ced
2021-08-04 18:22:16 +00:00
Peter Wang
81d84eccfc Merge "Add switchSubscription and delete_subscription to protected broadcast" into sc-dev am: d459da6362
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13781084

Change-Id: I1e92c70fb596270c2433cf78de212acd7aaadd61
2021-08-04 18:07:06 +00:00
Peter Wang
54655f5aae Merge "Add switchSubscription and delete_subscription to protected broadcast" into sc-dev am: d459da6362
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13781084

Change-Id: Ie96663c79136df9311c5b7d84aa45868ce1cdeec
2021-08-04 18:06:10 +00:00
Peter Wang
d459da6362 Merge "Add switchSubscription and delete_subscription to protected broadcast" into sc-dev 2021-08-04 17:54:03 +00:00
Dave Mankoff
06037712dd Add new Flag class. New FlagReaderPlugin.
This CL is a stepping stone towards a more complete flag system.

This cl allows for the definition of flags within systemui, each of
which have a unique id and a default value. Methods for retrieving
the value of a flag are defined.

By default, reading a flag always returns its default value.

A FlagReaderPlugin is also defined that, when loaded, allows for
returning alternate values for a given flag. The details of how an
alternate value are determined are left for the plugin to decide.

The plugin interface should be considered incomplete with this cl.
Methods for reading flags are defined, but hooks for knowing when
flags change (and hooks for knowing when a flag plugin has been
loaded), are not defined. Moreover, the flag plugin is not loaded
early in the process with this cl, so anyone who reads flags
before the plugin is may misss out on the values they care about.

More changes to come.

Bug: 194781951
Test: atest SystemUITests
Change-Id: I888d5eba82359a37878a3a4d4747990b79a77804
2021-08-04 13:46:45 -04:00
Evan Rosky
f1204289fa Fix shell-transit to legacy app-cancel metrics
When it performs a no-op, it should notify metrics-logger of
activity launch cancellations. Was blindly reporting everything
to start, now just report visible stuff.

This also fixes a problem during teardown where transition
collection wasn't waiting for pending pause.

Bug: 183993924
Test: atest ActivityMetricsLoggerTests
Change-Id: Ie0d4aea89b7e32744fdbd56a39d6266154015d32
2021-08-04 10:33:21 -07:00
Dave Mankoff
405e89be71 Force an initial event to be sent to ProximitySensor.
When registering a proximity sensor, if the sensor is a
"dual" sensor, and the device starts uncovered, we need to
alert sensor listeners. Prior to this change, we left the
ProximitySensor in an "unknown" state, even though we knew
the device was uncovered.

Add tag to DozeSensor's ProximitySensor

Bug: 194974904
Test: manual && atest SystemUITests
Change-Id: I430cd0d63de9c8f0914d5b0d0ff0d86fc38c0190
2021-08-04 17:10:09 +00:00
Louis Chang
4859b30a59 Merge "Fix testRelaunchConfigurationChangedWhileBecomingVisible flakiness" into sc-v2-dev am: bebfe77990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15460617

Change-Id: Ia00d63d4383e4b50f57ef71ce43b23a7c451f549
2021-08-04 16:42:53 +00:00
Louis Chang
bebfe77990 Merge "Fix testRelaunchConfigurationChangedWhileBecomingVisible flakiness" into sc-v2-dev 2021-08-04 16:31:19 +00:00
Vadim Caen
70dddda2f3 Merge "Fix background bleeding in splash scren image view" into sc-dev am: 7de16da32d am: 5ab5510382
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15462070

Change-Id: Ie919f306d635e0973f90783e0e0aa78d25d78297
2021-08-04 16:19:01 +00:00