Commit Graph

15242 Commits

Author SHA1 Message Date
Lais Andrade
8fc8732db1 Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004 am: 655eb212ec am: 388881b89a am: 0e81d7ec8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: I3dc67195e436645fc62f875e8b9c3f03c565086b
2020-08-05 13:15:28 +00:00
Lais Andrade
0e81d7ec8e Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004 am: 655eb212ec am: 388881b89a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: Iad15300f86c480874afc71a291eb698a70c9fd52
2020-08-05 13:05:19 +00:00
Lais Andrade
655eb212ec Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: Ie8720fc2f94420e5d01b03047aa1579c46f8f203
2020-08-05 12:21:32 +00:00
Lais Andrade
50ef151f8b Fix typo on View.verifyDrawable method javadoc
Fix: b/157335615
Test: N/A, only changing documentation
Change-Id: I30f869bdaac5fb6b87ea56a4416e619b46565113
2020-08-05 08:20:08 +00:00
Siarhei Vishniakou
736e4b0668 Merge "Unify dispatching timeout constants" 2020-08-04 22:56:50 +00:00
Siarhei Vishniakou
1971ba5dc8 Unify dispatching timeout constants
The same constant is defined today with slightly different names in both
WindowMananagerService and ActivityTaskManagerService. To prevent
proliferation, make a constant in aidl and use it here.

Also, the two constants used to be in either nanoseconds or
milliseconds.

Make all constants in milliseconds because aidl does not support "const
long", and 5 seconds' worth of nanoseconds does not fit into an int.

Bug: 143459140
Test: interact with device after booting
Test: adb shell dumpsys input

Change-Id: Ia9b3f56d8eddcc6f2f0132bac9254655b180837f

Change-Id: If4d40b63c41f6fb54b99d167da8db1924945f3ef
2020-08-04 09:55:35 -05:00
Chavi Weingarten
4c36541078 Merge "Updated layer capture in JNI to match updated function" 2020-08-04 00:13:10 +00:00
Kevin Hufnagle
63f2d44d6b Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c am: b4937f485e am: 46128203a5 am: 8cdf49be4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: I27683ef9ec178681a0b22360f4537d1cc1523dbc
2020-08-03 23:38:31 +00:00
Kevin Hufnagle
8cdf49be4c Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c am: b4937f485e am: 46128203a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: I9381dd6d6ef0a03178c50704f524ca68e08eee83
2020-08-03 23:28:40 +00:00
Kevin Hufnagle
46128203a5 Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c am: b4937f485e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: If1a6f104218936954bdd5d689fcc762efca2b99b
2020-08-03 23:03:00 +00:00
Kevin Hufnagle
772d87c0e1 Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: Icce4c3e0a7029fc9e31b4f767a5da0c3034ed08f
2020-08-03 22:51:34 +00:00
Kevin Hufnagle
24ed56bd0c Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev 2020-08-03 22:26:36 +00:00
Chavi Weingarten
a55ddc9603 Merge "Updated display capture and screencap to match native functions" 2020-08-03 20:59:11 +00:00
Issei Suzuki
8a8b142449 Merge "Disable overriding task transit animation." 2020-08-03 12:37:09 +00:00
Charles Chen
1a364965ee Merge "Annotating context in framework base" 2020-08-03 06:13:18 +00:00
Charles Chen
6591174401 Annotating context in framework base
Bug: 151414704
Test: build & run
Change-Id: I42c8ab699433c51158a1af201da0521413d74dcd
2020-08-03 11:36:54 +08:00
Kevin Hufnagle
e39427591a docs: Changes "their" to "the" in 2 places
When referring to a client (piece of software), it's better not to use
a personified pronoun, such as "his" or "their". Changed to "the".

Change-Id: I5d79e70a9135d6f1e8da493fcdd50921b9696e31
Test: none (docs-only change)
Bug: 160937339
2020-07-31 23:28:24 +00:00
chaviw
45acebc87c Updated layer capture in JNI to match updated function
Modified Java and JNI layer capture functions to match the new
function in SurfaceComposerClient. The Java method will send an args
object instead of individual arguments to SurfaceComposerClient

Test: Layer screenshots in recents
Bug: 162367424
Change-Id: Ib060a0238e47edfc19f6f34a5c6a508fc6c9f7fd
2020-07-31 10:56:52 -07:00
chaviw
bc27bc7189 Updated display capture and screencap to match native functions
Modified Java and JNI display capture functions to match the new
function in SurfaceComposerClient. The Java method will send an args
object instead of individual arguments to SurfaceComposerClient

Test: display screenshots working
Test: adb shell screencap
Bug: 162367424

Change-Id: Ic8d9cbc626e9ef73300304ce155a50f76f017dfc
2020-07-31 10:56:04 -07:00
Treehugger Robot
271a28c3c3 Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a am: d89a8edb77 am: 8ecdbfaafa am: 439cf37042
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382387

Change-Id: Iad1c9da61e897f1b0ff5cf24e40eb48845ef46cb
2020-07-31 16:26:21 +00:00
Treehugger Robot
439cf37042 Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a am: d89a8edb77 am: 8ecdbfaafa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382387

Change-Id: I80cba3d6eca00c23f158563209de1f288d152f82
2020-07-31 16:09:35 +00:00
Treehugger Robot
d89a8edb77 Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382387

Change-Id: I29dbd2c00e3e4f22e14024ed61e4eb931063d48a
2020-07-31 15:32:40 +00:00
Issei Suzuki
99b1155175 Disable overriding task transit animation.
Activities can override transition animation when starting or finishing
activity by calling Activity#overridePendingAppTransition. This change
restricts it in a way such that an activity can do it only when the
transition happens within a same task.

Note that this change is guarded by a property, so by default,
activities can still override any transition animation. In order to
restrict it, the following property must be set:
persist.wm.disable_custom_task_animation

Bug: 162066454
Test: atest ActivityTransitionTests
Change-Id: I235adf73af75883d8e943b6f85d841a729f5bb6b
2020-07-31 16:57:26 +02:00
Lais Andrade
a0670fa770 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

#inclusivefixit

BUG=162536543

Change-Id: I4fbb7bba633c90c66c95117d17fde5a6c7374fde
2020-07-31 13:25:44 +00:00
TreeHugger Robot
ec37956cb2 Merge "Wire-up colorMode="hdr"" 2020-07-31 00:02:05 +00:00
TreeHugger Robot
3f42e58b95 Merge "Update FocusFinder" into rvc-qpr-dev am: 5b88562f8c am: 7033cedb69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12228031

Change-Id: I28d94b80ba7baf1c339fa7692c6616c61ff5ad51
2020-07-30 19:42:18 +00:00
TreeHugger Robot
7033cedb69 Merge "Update FocusFinder" into rvc-qpr-dev am: 5b88562f8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12228031

Change-Id: I76c548a63aba55e34601fec2a2a0ed8c44ef7a19
2020-07-30 19:18:05 +00:00
TreeHugger Robot
5b88562f8c Merge "Update FocusFinder" into rvc-qpr-dev 2020-07-30 19:07:05 +00:00
John Reck
b36bfddb1e Wire-up colorMode="hdr"
Fow now it uses a fixed white point of 150nits
TBD if this is disabled or adjusted

Test: Demo app
Change-Id: Iac13597b3d7633fdef3feaf7ec1da0c27c87904c
2020-07-30 08:54:03 -07:00
Chavi Weingarten
69fb8a4b9d Merge "Added ScreenCaptureArgs and LayerCaptureArgs" 2020-07-30 00:44:19 +00:00
Adam He
81e4ee1a46 Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36 am: f336feb6df am: adfe4b5116 am: a0fcfe76ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: I5e8253177e26f2eadc635bb59c8fecfdddc600c4
2020-07-29 22:49:45 +00:00
chaviw
fa09f2614d Added ScreenCaptureArgs and LayerCaptureArgs
Created builders for each class to make it simpler to add optional
arguments

Test: Builds
Bug: 162367424
Change-Id: I0f06cebe698fe744a1af39dfb623d53c38c21ea6
2020-07-29 15:49:24 -07:00
Adam He
a0fcfe76ed Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36 am: f336feb6df am: adfe4b5116
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: I78b7abc79fb695913bca2439a56da6ea77a0d726
2020-07-29 22:34:43 +00:00
Chavi Weingarten
39cab79228 Merge "Screenshot secure layers in ColorFade" 2020-07-29 22:15:26 +00:00
Adam He
7276e5680b Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36 am: f336feb6df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: I2f89dced04d50430651faf8a80036452da413768
2020-07-29 22:15:23 +00:00
Adam He
adfe4b5116 Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36 am: f336feb6df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: I8c4d50150824f8f64b2c961663e19bf15331acb0
2020-07-29 22:13:52 +00:00
Adam He
6ebc2cc95a Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: Ic53a949c233347006124174fc07f0f802be51fed
2020-07-29 21:56:38 +00:00
Adam He
3532bdaa36 Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev 2020-07-29 21:45:59 +00:00
Ryan Lin
6fcbdf03b2 Merge "Add source bounds change callback" 2020-07-28 23:55:30 +00:00
TreeHugger Robot
5948d5c209 Merge changes from topic "max_bounds"
* changes:
  Verify DisplayArea bounds in WindowMetricsTests
  Add DisplayArea support for WM#getMaximumWindowMetrics
2020-07-28 09:11:34 +00:00
ryanlwlin
d934df6bbd Add source bounds change callback
Add sourcebounds change callback so that A11yFramwork could know
the center. It is also for magnification public API callback

Bug: 161669184
Test: WindowMagnificationControllerTest
Change-Id: I08c1f9c6f9f5eb540d960c89388b93437d79871a
2020-07-28 12:53:46 +08:00
Adam He
edc354d399 Updated docs with clarifications on specific limitations with the new
Inline APIs.

* limitations with multiple locales.
* limit on max number of suggestions.
* guidance on managing the order of inline suggestions when inflating.

Fixes: 161486684
Test: atest android.autofillservice.cts.inline
Change-Id: Ia560d48f95730d79bc340ff9eb0cf4a5909bf0d3
2020-07-27 16:18:15 -07:00
TreeHugger Robot
bde58d21a3 Merge "Offset dirty rect for surface insets correctly." 2020-07-27 00:22:59 +00:00
Yabin Huang
18048e074b Update FocusFinder
Don't return the current view when finding the next or previous view.

Bug: 158492287
Test: atest cts/tests/tests/view/src/android/view/cts/FocusFinderTest.java
atest frameworks/base/core/tests/coretests/src/android/view/FocusFinderTest.java

Change-Id: Ib5c1854d1a13b9469ca55dfbf0be61bead47e29e
(cherry picked from commit 713af5fdd3)
2020-07-24 22:03:51 +00:00
Xin Li
6177a513ce Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd658d am: cd85e10058 am: 8f75424d27 am: 5cf151b9da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203661

Change-Id: I9ca6ee43c445104a7e6b4dd6444b9cb9dc2dab19
2020-07-24 09:19:17 +00:00
Xin Li
5cf151b9da Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd658d am: cd85e10058 am: 8f75424d27
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203661

Change-Id: Id3cf8034c08d231c4dcb91a836150f94c17c9e02
2020-07-24 09:01:22 +00:00
Xin Li
8f75424d27 Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd658d am: cd85e10058
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203661

Change-Id: Icedef80125545e1b9c54133718763e559b00629d
2020-07-24 08:45:41 +00:00
chaviw
3ce0539bd3 Screenshot secure layers in ColorFade
When taking a screenshot for ColorFade, allow the screenshot to capture
secure layers, but ensure the SurfaceControl is also marked as secure.
This is to ensure that the screenshot that contains the secure layer
can't itself be screenshotted.

Also cleaned up some unused SurfaceControl.screenshot methods that are
no longer used due to this change

Fixes: 155744498
Test: Turn screen off with secure layers on screen
Change-Id: I064a93f5210af696d52df21380801134b57acc9f
2020-07-23 17:31:23 -07:00
TreeHugger Robot
8b39a57457 Merge "Undo the initialization if TimeoutException occurred." 2020-07-23 16:20:31 +00:00
Joanne Chung
3cc809b0d9 Undo the initialization if TimeoutException occurred.
If TimeoutException occurred, we don't know whether mService.addClient
succeeded. We should call mService.removeClient() to make service to
unregister the client if exists and reset the mServiceClient.

Bug: 156044027
Test: atest CtsAutoFillServiceTestCases
Test: Run adb shell dumpsys -T 60000 activity -v all to see log

Change-Id: I10ce988603f47117d0efddcc014ec51b72d3b3b4
2020-07-23 20:26:12 +08:00