Commit Graph

21012 Commits

Author SHA1 Message Date
Soonil Nagarkar
ec54079e9d Merge "Add support for excluding tags from restrictions" into sc-dev am: fe40442304 am: b2ea76cc02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14503384

Change-Id: If836e070472cfe80f701313537abe5ab8dd43639
2021-05-19 23:18:40 +00:00
Neil Fuller
03632f3418 Merge "Provide a new command line for host tests" into sc-dev am: 629d1f3ec2 am: fd08e82abb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550422

Change-Id: Icb4b902986aff5a68255119fee1aab7eeb666478
2021-05-19 22:52:42 +00:00
Jeff Sharkey
3e006db10d Merge changes from topic "may15" into sc-dev am: 63a1453832 am: b1b4de9ed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14515460

Change-Id: I2d1036ca3b7876e5f07c267ae8b884368d60c599
2021-05-19 22:47:24 +00:00
Jeff Sharkey
e97c037d19 Apply AttributionSource during Intent delivery. am: dd6dd3b1fb am: 2d0e8e3d5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14470318

Change-Id: Iac0646b8065a4e70ec0366db19943db33ba2e40b
2021-05-19 22:47:13 +00:00
Junyu Lai
7f303717b8 Merge changes I3ba50cbd,I970ee365 am: 37f2408143 am: ed64c29783 am: 8354c4531a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: I9ce9369b30bc568a63321de8764bd49c263b9ea6
2021-05-19 22:47:04 +00:00
Soonil Nagarkar
b2ea76cc02 Merge "Add support for excluding tags from restrictions" into sc-dev am: fe40442304
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14503384

Change-Id: Iccc7f519dfcfe9429067249dce36ade6e4f2a0f5
2021-05-17 17:11:57 +00:00
Soonil Nagarkar
fe40442304 Merge "Add support for excluding tags from restrictions" into sc-dev 2021-05-17 16:46:55 +00:00
Neil Fuller
fd08e82abb Merge "Provide a new command line for host tests" into sc-dev am: 629d1f3ec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550422

Change-Id: I18559be1d90c97d4050213fb472d623e81598701
2021-05-17 16:36:33 +00:00
Neil Fuller
629d1f3ec2 Merge "Provide a new command line for host tests" into sc-dev 2021-05-17 16:16:40 +00:00
Jeff Sharkey
b1b4de9ed7 Merge changes from topic "may15" into sc-dev am: 63a1453832
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14515460

Change-Id: I1b6a4d66134d09219ef255984336766eba7b387e
2021-05-16 18:15:34 +00:00
Jeff Sharkey
2d0e8e3d5d Apply AttributionSource during Intent delivery. am: dd6dd3b1fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14470318

Change-Id: Iac85c2e538b7e7fd9bcbd4e286e5df04da0013d4
2021-05-16 18:15:32 +00:00
Jeff Sharkey
5014fbd644 Apply "attributionTags" to all component types.
Components within an application are often a good boundary for
developers to declare "attribution" information, such as an Activity
or Service used to offer a specific sub-feature.

This change expands the "android:attributionTags" manifest attribute
to apply to all component types, and it then automatically configures
the associated Context with Context.createAttributionContext() with
no additional developer action required.  Developers can still
manually use Context.createAttributionContext() to adjust the
attribution tag again if desired.

Bug: 187097694
Test: atest CtsAppOpsTestCases:AttributionTest
Test: atest CtsAppTestCases:android.app.cts.AttributionTagsTest
Change-Id: Ia16c66e7b63bcbfb8c0d7348e9b5d4adb2a1f45d
2021-05-15 12:11:03 -06:00
Junyu Lai
8354c4531a Merge changes I3ba50cbd,I970ee365 am: 37f2408143 am: ed64c29783
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: If9a3e37e5359b955e330002d81cbeb48f90ee22b
2021-05-15 17:24:42 +00:00
Jeff Sharkey
dd6dd3b1fb Apply AttributionSource during Intent delivery.
There are some Parcelables which offer to perform Binder calls, and
when these are delivered via Intent extras they fallback to
ActivityThread.currentAttributionSource(), instead of being tagged
based on the relevant app component.

This change begins using Intent.prepareToEnterProcess() as a hook to
fix-up AttributionSource when those extras finally land in the
destination process.  It uses the relevant AttributionSource based
on the Activity or Service the Intent is delivered to, which
developers have control over via AppComponentFactory.

In the case of <receiver> manifest elements, this change applies the
first android:attributionTags value to the Context used for that
BroadcastReceiver.

Bug: 187097694
Test: atest AttributionTest
Change-Id: I8f5197db7e8d7277d34f0ef2bb90bfdf1871186a
2021-05-15 09:48:14 -06:00
Soonil Nagarkar
393d109f64 Add support for excluding tags from restrictions
Allow user restrictions to provide an excluded map of packages and tags
rather than just packages.

Bug: 187421886
Test: manual
Change-Id: I8f90ba6cdd288068664b352fdb540d0f11fe3dfc
2021-05-14 10:35:46 -07:00
Neil Fuller
dd4d561984 Provide a new command line for host tests
This adds a new cmd verb for time_zone_detector that reports whether
telephony time zone detection is supported. This enables a host side CTS
test to properly determine expected behavior on non-telephony devices
like Android Auto.

Bug: 187907947
Test: See associated cts change
Change-Id: Ie118459c704112a259d38cb246882f11f8c5dee0
2021-05-14 17:36:45 +01:00
junyulai
9c964b11e6 [FUI27] Fix internal naming of notifyNetworkStatus
Test: TH
Bug: 174123988
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
2021-05-14 19:48:17 +08:00
Jeff DeCew
1dd2f05895 Merge "Set the height of the right_icon in addition to the width" into sc-dev am: a5b0ed3b0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14517041

Change-Id: I9a39fba206626d102a2eafb4c0d9acd071f88c81
2021-05-13 19:53:38 +00:00
Jeff DeCew
a5b0ed3b0c Merge "Set the height of the right_icon in addition to the width" into sc-dev 2021-05-13 19:48:40 +00:00
Jeff DeCew
0fb49d82a6 Set the height of the right_icon in addition to the width
This ensures that the Notification fully specifies the size of the notification in the RemoteViews, and ensures that CTS tests pass.

Fixes: 180652028
Test: atest NotificationTemplateApi30Test
Change-Id: Ie5715880437f1e42b16226196cf67ca52bc09ee1
2021-05-13 12:25:56 -04:00
Ahaan Ugale
824e387465 Merge "Pipe UiTranslationSpec through to the UiTranslationController." into sc-dev am: cc4fa5f3b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14510558

Change-Id: Id006d635005a08b619a99742b7b8d41ad950a7f8
2021-05-13 15:37:30 +00:00
Ahaan Ugale
cc4fa5f3b6 Merge "Pipe UiTranslationSpec through to the UiTranslationController." into sc-dev 2021-05-13 15:24:12 +00:00
Jeff DeCew
77a19bed9f Merge "Allow populating left_icon independently of right_icon." into sc-dev am: cd86f38402
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14519486

Change-Id: Idf12863d566a9de68c3d8e486efd66c2c7a22992
2021-05-12 23:39:20 +00:00
Jeff DeCew
cd86f38402 Merge "Allow populating left_icon independently of right_icon." into sc-dev 2021-05-12 23:32:35 +00:00
Makoto Onuki
9305afd315 Merge "Clean up setForegroundServiceBehavior()" into sc-dev am: b5ddeefc09
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14518585

Change-Id: Iaa4d0fc3c2ce7ba9448e1e1d22e60aaf6a79e513
2021-05-12 20:19:31 +00:00
Makoto Onuki
b5ddeefc09 Merge "Clean up setForegroundServiceBehavior()" into sc-dev 2021-05-12 19:59:44 +00:00
Jeff DeCew
b85d1f4f39 Allow populating left_icon independently of right_icon.
* Mainly this fixes a "bug" with the BigPictureStyle.showBigPictureWhenCollapsed() that would cause the big picture, which is known to be important for the notification, to be hidden on the right and shown on the left.  Instead the BigPicture will now remain visible in its large form on the right, and the left icon will be populated with the large icon.
* Additionally, this fixes some quirks with other layouts, such as MediaStyle and MessagingStyle that the largeIcon would be missing (sometimes only in one expansion state) when it could be shown in the left column.
* Finally, this fixes a few bugs in the expansion animation that were caused by logic for determining the showing icon being inconsistent between Notification.java and the notification view wrappers.

Bug: 186421651
Test: post notifications of all these types in and outside of groups.
Change-Id: Ifd1d817afcb1b6fa8cfb79baee96364af8c7af3c
2021-05-12 15:57:43 -04:00
Ahaan Ugale
f765882432 Pipe UiTranslationSpec through to the UiTranslationController.
And use it to conditionally enable content padding for requested views.

Fix: 179693024
Test: atest android.translation.cts.UiTranslationManagerTest
Test: adb shell dumpsys activity <ACTIVITY> --translation
Change-Id: I23fb29a60525d736f2dcf9d11b548c62332c412c
2021-05-12 11:47:15 -07:00
Jeff DeCew
e07dcedf9b Merge "Show minimized header text with the correct text weight" into sc-dev am: 9e30756592
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14506599

Change-Id: Ifa55cc928ea55696eb9fc46f8878710bd1d71a90
2021-05-12 18:00:25 +00:00
Jeff DeCew
9e30756592 Merge "Show minimized header text with the correct text weight" into sc-dev 2021-05-12 17:57:57 +00:00
Makoto Onuki
f0a6659080 Clean up setForegroundServiceBehavior()
Test: build
Bug: 186433888
Change-Id: Ie27cc91cf013bdfb90ab9c60a8c56370f226b87d
2021-05-12 08:22:41 -07:00
Ryan Mitchell
d12c50729d Merge "Use internal lock for ResourcesManager" into sc-dev am: 75baeda560
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14425147

Change-Id: I4613e35c73e3f3df73d5b395ad4b466eb0a7afed
2021-05-12 15:12:43 +00:00
Ryan Mitchell
75baeda560 Merge "Use internal lock for ResourcesManager" into sc-dev 2021-05-12 15:02:06 +00:00
Jeff DeCew
2f44158f48 Merge changes I11400a55,I49461363,Ia18b2dc3,I8c554755 into sc-dev am: aeddbdc7c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14492078

Change-Id: I1ef35ad6e81a211422c30972c970e191ac9d984f
2021-05-11 22:41:29 +00:00
Jeff DeCew
aeddbdc7c9 Merge changes I11400a55,I49461363,Ia18b2dc3,I8c554755 into sc-dev
* changes:
  Simplify SmartReplyView padding layout logic
  Smart action buttons now have 8dp corner radius
  Fix measure logic so that priority children can have more than 1/N space.
  Update the style of emphasized notification actions.
2021-05-11 22:35:37 +00:00
Jeff DeCew
9c1f4e12c9 Show minimized header text with the correct text weight
Fixes: 184863420
Test: visual
Change-Id: Ic16f9e88e118e7ea5fe14054cf1c35318d4a6ddd
2021-05-11 17:10:34 -04:00
Kholoud Mohamed
ed8e57b593 Merge "Allow forceUpdateUserSetupComplete for non system users" into sc-dev am: 80ed0ced6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14487533

Change-Id: I16d1865bcd6deb125062562850f4e9776866a65d
2021-05-11 14:56:50 +00:00
Kholoud Mohamed
80ed0ced6c Merge "Allow forceUpdateUserSetupComplete for non system users" into sc-dev 2021-05-11 14:50:38 +00:00
Rubin Xu
624060d8e4 Merge "Update SecurityLog javadoc" into sc-dev am: c91f0da4fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14487856

Change-Id: I2970c04a0216fbfaa36675faa459d473df7b438c
2021-05-11 09:41:45 +00:00
Rubin Xu
c91f0da4fd Merge "Update SecurityLog javadoc" into sc-dev 2021-05-11 09:31:51 +00:00
kholoud mohamed
158dd8fc09 Allow forceUpdateUserSetupComplete for non system users
Test: atest android.devicepolicy.cts.DevicePolicyManagerTest
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Bug: 183716601
Change-Id: Id2340ac1c6404ac41ca7b5a31c6fbb1577804595
2021-05-11 09:25:20 +01:00
Charles Chen
3db473fb61 Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev am: c8bf38ce25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14305130

Change-Id: I014c3f314db5fe6c166e9833f5e8cadb15d01e96
2021-05-11 04:19:23 +00:00
Charles Chen
c8bf38ce25 Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev 2021-05-11 04:08:49 +00:00
Jeff DeCew
2ca6b4399a Update the style of emphasized notification actions.
* This removed many of the differences between CallStyle and emphasized actions.
* These actions are now pill shaped with a solid bg color, no stroke, less height, less spacing between, and wrapping content instead of splitting space equally.

Fixes: 187533622
Test: manual testing with Notify, Notify2, and Clock (using timers and alarms)
Change-Id: I8c554755755c59f2756870f7cd2e0c533d22d823
2021-05-10 21:41:52 -04:00
Jing Ji
975fbad614 Merge "Add support to log app kill stats into statsd" into sc-dev am: 0ec24536c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14417792

Change-Id: I6c83da95a39aadd036ea5b36827d1a06626eb4c0
2021-05-10 16:43:25 +00:00
Jing Ji
0ec24536c5 Merge "Add support to log app kill stats into statsd" into sc-dev 2021-05-10 16:34:21 +00:00
Rubin Xu
b59d8e1e21 Update SecurityLog javadoc
Bug: 183695861
Test: m -j docs
Change-Id: Idf05e69bda53ffe205683898984b6aa4677f2466
2021-05-10 15:20:45 +01:00
Jeff DeCew
32db70f729 Merge "Remove exception whe Colorized notificiation uses COLOR_DEFAULT." into sc-dev am: 0601cb9bd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14468736

Change-Id: I41c292252f01e1a65b72abb470f4c23a0acf371e
2021-05-10 13:43:27 +00:00
Jeff DeCew
0601cb9bd7 Merge "Remove exception whe Colorized notificiation uses COLOR_DEFAULT." into sc-dev 2021-05-10 13:29:08 +00:00
Ruslan Tkhakokhov
a9222e953b Merge "Don't restore notification channel if its sound is unavailable" into sc-dev am: c4646c09ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14424418

Change-Id: Ibfa45a607eaa6193ad25f1dcad333567140d07aa
2021-05-09 21:03:18 +00:00