Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
502,303 Commits 3 Branches 0 Tags
a2b703c95752b8c41b2eacd444bc51d8a46bbd21
Commit Graph

6698 Commits

Author SHA1 Message Date
Alex Spradlin
10700dceea Merge "Fix DecorView error about non-visual context" into rvc-dev 
Automerger is stuck on this

Change-Id: Ia4cdfbb83787521e8eb32993dc6dd2cb2dbde96b
 2020-03-30 20:57:09 +00:00
TreeHugger Robot
d08a399a81 Merge "Fix DecorView error about non-visual context" into rvc-dev am: 8927986f3b am: 64b0a51b1b am: 776ff41d18 am: aaec840228 
Change-Id: I7a3e288a6634da4d26120edcbbb0024bd1cf5146
 2020-03-30 18:12:32 +00:00
TreeHugger Robot
8927986f3b Merge "Fix DecorView error about non-visual context" into rvc-dev 2020-03-30 07:20:00 +00:00
Charles Chen
828c498904 Fix DecorView error about non-visual context 
This error showed because DecorContext uses application context
to get WindowManager. This CL changes to use context to do so.
Also rename fields in DecorContext because we actually can pass any
context in "activityContext."
Note that most cases of misuse WindowManager is covered by [1].
We can guarantee that WindowManager can be obtained by mContext.

[1]:I52aa0c4a02b7da018aa10f1473e1616564296e41

Bug: 150632074
Test: manual - enable strict mode and check the error log not shown.
Test: atest DecorContextTest
Change-Id: I558a2819e5928a802b897a130cfc3262115b9935
 2020-03-30 11:24:48 +08:00
Jorim Jaggi
4b341663e7 Merge "Make caption a insets source" into rvc-dev am: ac30aafd29 am: 0263c7b06a 
Change-Id: Iceed9646a2f1466065a2932e894bc3a09ff2301a
 2020-03-27 17:59:35 +00:00
Fabian Kozynski
2b23a4f74a Merge "Add a config resource for controls package" into rvc-dev am: bce4b444e3 am: ff99d96cdc am: 902d92c1c6 am: 734da30c26 
Change-Id: I07f1c705a97deecb7ed87b5496bd97735328b4ec
 2020-03-27 17:55:17 +00:00
Jorim Jaggi
ac30aafd29 Merge "Make caption a insets source" into rvc-dev 2020-03-27 17:27:01 +00:00
Fabian Kozynski
ff99d96cdc Merge "Add a config resource for controls package" into rvc-dev am: bce4b444e3 
Change-Id: I4e10ed48abd35ba5686b4a9ea920b045164617c9
 2020-03-27 17:06:40 +00:00
Fabian Kozynski
bce4b444e3 Merge "Add a config resource for controls package" into rvc-dev 2020-03-27 16:53:07 +00:00
Fabian Kozynski
a9be39d224 Add a config resource for controls package 
This allows to configure the recipient of the ADD_CONTROL intent.

Test: manual
Test: atest ControlProviderServiceTest
Fixes: 152549957
Change-Id: I29b549271da53d844d564df819cf9c1c9bc81968
 2020-03-27 10:31:38 -04:00
TreeHugger Robot
6551128716 Merge "Make caption a insets source" 2020-03-27 07:39:45 +00:00
Automerger Merge Worker
7e8cceadd8 Merge "Merge "Suppress flaky test in EditorCursorDragTest" into rvc-dev am: 3413d084c3 am: de0454cec2" into rvc-d1-dev-plus-aosp am: 6124c660f4 am: 19b63796a3 
Change-Id: I665d1753a01f277aa7f8e1b43151dd23c76f9f60
 2020-03-27 07:25:46 +00:00
Nikita Dubrovsky
8116fd86fd Merge "Suppress flaky test in EditorCursorDragTest" into rvc-dev am: 3413d084c3 am: de0454cec2 
Change-Id: Ie74eb99bccdfeb4deeff693653bc0ddae7cd2a81
 2020-03-27 07:04:00 +00:00
Nikita Dubrovsky
a8552e3be2 Merge "Suppress flaky test in EditorCursorDragTest" into rvc-dev am: 3413d084c3 
Change-Id: I3cb6b051d64124526e97c873aab192f777e7d69e
 2020-03-27 06:53:09 +00:00
Nikita Dubrovsky
e8b3b31968 Suppress flaky test in EditorCursorDragTest 
Bug: 152560519
Test: Presubmit
Change-Id: I07785daa6c031801bb5793923836c5345205e4bc
 2020-03-26 21:23:34 -07:00
Andrii Kulian
6a62eaac3f Merge "Report bounds instead of size in WindowMetrics" into rvc-dev am: 363edf449a am: f8bb4fef74 am: 7e9a4c2f34 am: f68ab26611 
Change-Id: I37268426928fa1da47ddb3ba68f080e1824dfedd
 2020-03-27 01:46:40 +00:00
Andrii Kulian
5c13904c68 Merge "Report bounds instead of size in WindowMetrics" into rvc-dev am: 363edf449a 
Change-Id: I80833bd0256a350662a90c2c4f73b9d1fee9273e
 2020-03-27 01:16:24 +00:00
Andrii Kulian
7e9a4c2f34 Merge "Report bounds instead of size in WindowMetrics" into rvc-dev am: 363edf449a am: f8bb4fef74 
Change-Id: I03b8e519c34c4c9318239540a20d6923672b2272
 2020-03-27 01:15:53 +00:00
Andrii Kulian
363edf449a Merge "Report bounds instead of size in WindowMetrics" into rvc-dev 2020-03-27 01:08:37 +00:00
Dmitri Plotnikov
28db144f87 Merge "Propagate exception thrown by ContentProvider.canonicalize" into rvc-dev am: f7b0b5a373 am: 59e9279749 am: 571716c3e3 am: 7d21a21b23 
Change-Id: I33dad7364541f20c7e830dfa05f706df8456b1ac
 2020-03-26 23:56:29 +00:00
Dmitri Plotnikov
571716c3e3 Merge "Propagate exception thrown by ContentProvider.canonicalize" into rvc-dev am: f7b0b5a373 am: 59e9279749 
Change-Id: I34ea7f30d0b8b73dd0f20ec5333443a451678129
 2020-03-26 23:24:17 +00:00
Dmitri Plotnikov
a0912a95bd Merge "Propagate exception thrown by ContentProvider.canonicalize" into rvc-dev am: f7b0b5a373 
Change-Id: I89376c81183f6e2b689269a376ba39e503609801
 2020-03-26 23:20:13 +00:00
Dmitri Plotnikov
f7b0b5a373 Merge "Propagate exception thrown by ContentProvider.canonicalize" into rvc-dev 2020-03-26 23:03:31 +00:00
Nikita Dubrovsky
66ec85e435 Merge "Add tests for editor state and cursor drag to presubmits" into rvc-dev am: 42d682e077 am: f0d0dc8be3 am: fac868868b am: f8a19acb77 
Change-Id: I88cfa642974e0bd74a148041c11231e1e928c77a
 2020-03-26 22:45:39 +00:00
Nikita Dubrovsky
fac868868b Merge "Add tests for editor state and cursor drag to presubmits" into rvc-dev am: 42d682e077 am: f0d0dc8be3 
Change-Id: I2548e9d89f5854d3cb72f9a959b4e7e6c741c271
 2020-03-26 22:10:27 +00:00
Nikita Dubrovsky
a500553b5b Merge "Add tests for editor state and cursor drag to presubmits" into rvc-dev am: 42d682e077 
Change-Id: I933c76ba2aff33c5881c0cffeb2d51d364160d97
 2020-03-26 22:00:03 +00:00
Nikita Dubrovsky
42d682e077 Merge "Add tests for editor state and cursor drag to presubmits" into rvc-dev 2020-03-26 21:27:58 +00:00
Yunfan Chen
fae0aeabe0 Make caption a insets source 
This patch introduced setCaptionInsets, and set the Insets in
ViewRootImpl when dispatch the insets if there's a caption.

Modification is made in Window and DecorCaptionView to make caption
overlay with the app content, and pass the value to ViewRootImpl to
apply when dispatch. It is necessary to trigger a dispatch when caption
enabled status chanaged, otherwise sometimes it will not be updated.
Because caption is now updated locally on the client side.

Some old logic to deal with the overlay caption without insets are
removed, including the touch event dispatch override, the color
override.

Bug: 134531136
Test: go/wm-smoke
Test: Manually change the value in dispatchApplyInsets, can observe a
      blank content area when there's a caption bar.
Test: atest InsetsStateTest
Test: atest InsetsControllerTest
Change-Id: I356344a13c8569512d8f51f7ea19a5603f778252
 2020-03-26 06:58:07 +00:00
Yunfan Chen
4f7ebe3bce Make caption a insets source 
This patch introduced setCaptionInsets, and set the Insets in
ViewRootImpl when dispatch the insets if there's a caption.

Modification is made in Window and DecorCaptionView to make caption
overlay with the app content, and pass the value to ViewRootImpl to
apply when dispatch. It is necessary to trigger a dispatch when caption
enabled status chanaged, otherwise sometimes it will not be updated.
Because caption is now updated locally on the client side.

Some old logic to deal with the overlay caption without insets are
removed, including the touch event dispatch override, the color
override.

Bug: 134531136
Test: go/wm-smoke
Test: Manually change the value in dispatchApplyInsets, can observe a
      blank content area when there's a caption bar.
Test: atest InsetsStateTest
Test: atest InsetsControllerTest
Change-Id: I356344a13c8569512d8f51f7ea19a5603f778252
 2020-03-26 15:56:25 +09:00
Automerger Merge Worker
3b4ff35e1a Merge "Merge "Rename createBaseActivityResources to createBaseTokenResources" into rvc-dev am: 0cb6d3fd3d am: dbba801bcb" into rvc-d1-dev-plus-aosp am: 90c12439ce am: 051bb1ae45 
Change-Id: I20c28c57e86a9d76a0c8f872bb74402f77bd73d6
 2020-03-26 03:26:46 +00:00
Charles Chen
88c5b9205f Merge "Rename createBaseActivityResources to createBaseTokenResources" into rvc-dev am: 0cb6d3fd3d am: dbba801bcb 
Change-Id: I7ab72143719fc564fb7deef6966fc1f0157fff29
 2020-03-26 02:53:35 +00:00
Charles Chen
f46d21bb0f Merge "Rename createBaseActivityResources to createBaseTokenResources" into rvc-dev am: 0cb6d3fd3d 
Change-Id: Id06e5833d203df88550fe400a739dcd288b67494
 2020-03-26 02:45:49 +00:00
Charles Chen
0cb6d3fd3d Merge "Rename createBaseActivityResources to createBaseTokenResources" into rvc-dev 2020-03-26 02:40:47 +00:00
Dmitri Plotnikov
da4f3c8353 Propagate exception thrown by ContentProvider.canonicalize 
Test: atest FrameworksCoreTests:android.content.ContentResolverTest
Fixes: 149184281
Change-Id: Id200748c9d54222aaf669209a43cbaa5675d8331
 2020-03-25 18:34:11 -07:00
Menghan Li
ec65a6a138 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: fea8d184c2 am: 5664cb5315 am: 21f36c7bfb am: b10fbb7a4e 
Change-Id: I995d4e7e20d12235d6fd57c8e8d437c8cb727fb6
 2020-03-26 01:27:47 +00:00
Menghan Li
21f36c7bfb Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: fea8d184c2 am: 5664cb5315 
Change-Id: Ibb1c94b1c8fc5df59caba66d2a16215800297a00
 2020-03-26 00:54:21 +00:00
Menghan Li
835bda5744 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: fea8d184c2 
Change-Id: I276c3ab248480a37ae4905fc364a3e8325be0d7e
 2020-03-26 00:38:20 +00:00
Menghan Li
fea8d184c2 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev 2020-03-26 00:21:50 +00:00
Dmitri Plotnikov
90dbbdcdb4 Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev am: f903ef10e5 am: 84a2bbf8b9 am: 15ff963c63 am: 4dacc75262 
Change-Id: I320c81243d3bdf0fdc04b2c5a06342fb2293c0d6
 2020-03-25 18:19:14 +00:00
Dmitri Plotnikov
84a2bbf8b9 Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev am: f903ef10e5 
Change-Id: Ie8d5a35e9c0c8d52555578c720b423c5ebe12b73
 2020-03-25 17:26:28 +00:00
Dmitri Plotnikov
f903ef10e5 Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev 2020-03-25 17:24:31 +00:00
Shu Chen
79812eedc1 Merge "Calculates the slop values per upper/lower line height." into rvc-dev am: 27daeb0307 am: 1bb808525d am: 06e177368b am: 01755d22e8 
Change-Id: I77430e4dbcfee7bc81b6e836594dcd43d7aa453e
 2020-03-25 11:08:37 +00:00
Shu Chen
06e177368b Merge "Calculates the slop values per upper/lower line height." into rvc-dev am: 27daeb0307 am: 1bb808525d 
Change-Id: I265291d390e6d3fcb7081381841a0de5877f434f
 2020-03-25 10:33:13 +00:00
Shu Chen
256ed59b8b Merge "Calculates the slop values per upper/lower line height." into rvc-dev am: 27daeb0307 
Change-Id: I91975fe6da4220322c248970f5e9ebf702047c86
 2020-03-25 10:11:53 +00:00
Shu Chen
27daeb0307 Merge "Calculates the slop values per upper/lower line height." into rvc-dev 2020-03-25 09:54:48 +00:00
Shu Chen
afbcf851d3 Calculates the slop values per upper/lower line height. 
Also applies the max/min damping range for slop.
The max/min damping range includes lineHeight + slop.
Note: slop must >= zero.

Bug: 150531840
Test: manual & automated tests
  atest FrameworksCoreTests:EditorCursorDragTest
  atest FrameworksCoreTests:TextViewActivityTest

Change-Id: I26cdf69fd2cf7d4514dd2a902ed34c480c9e8781
 2020-03-25 15:56:06 +08:00
Joanne Chung
b345f0876f Merge "Fix ContentCaptureManagerTest test fail." into rvc-dev am: 3361dd2ad3 am: 1b734738f9 am: 08f635a366 am: 70338d31fc 
Change-Id: Ia4d70032b92e587f6fc6ea1b9ef6a2330d974d3f
 2020-03-25 02:52:47 +00:00
Joanne Chung
08f635a366 Merge "Fix ContentCaptureManagerTest test fail." into rvc-dev am: 3361dd2ad3 am: 1b734738f9 
Change-Id: Ib8be020bb513a93656ae4c769055a8059411baef
 2020-03-25 02:28:36 +00:00
Joanne Chung
92f31e7b70 Merge "Fix ContentCaptureManagerTest test fail." into rvc-dev am: 3361dd2ad3 
Change-Id: Ic63fe3cf733a0920409b6fe80f6d9dd17995f196
 2020-03-25 02:27:55 +00:00
Joanne Chung
3361dd2ad3 Merge "Fix ContentCaptureManagerTest test fail." into rvc-dev 2020-03-25 02:16:05 +00:00