Commit Graph

13957 Commits

Author SHA1 Message Date
TreeHugger Robot
6ee339746b Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev am: bc000662c3 am: bc76a634d7 am: de8d91473c am: 119958ecb4
Change-Id: I9a8c2d788dcde9b93bc9dee8b10ed6c197980db2
2020-04-28 20:45:29 +00:00
TreeHugger Robot
de8d91473c Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev am: bc000662c3 am: bc76a634d7
Change-Id: I95368c02043e3a8d173c7cf84670d22d9cf02932
2020-04-28 20:33:57 +00:00
TreeHugger Robot
bc000662c3 Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev 2020-04-28 20:17:02 +00:00
Automerger Merge Worker
2fae11a347 Merge "Merge "Don't pass initial intents to the inactive profile." into rvc-dev am: 04ccfdfae7 am: e1cdf50bc2" into rvc-d1-dev-plus-aosp am: b459a0407c am: b84aea71e3
Change-Id: I4901e450999d174dc10a04133edc0430539e619b
2020-04-28 20:07:09 +00:00
TreeHugger Robot
89bfb17e2f Merge "Move conversation app name into header" into rvc-dev am: 821b7f21b0 am: 83b97589b4 am: c233896a84 am: c4988ae74d
Change-Id: I53de712beaabbe7777aa2b4b05431ba245da0339
2020-04-28 20:05:26 +00:00
TreeHugger Robot
41002251ad Merge "Don't pass initial intents to the inactive profile." into rvc-dev am: 04ccfdfae7 am: e1cdf50bc2
Change-Id: Iaefa29e196577b3d676d70c5f53148fcd4dfd15e
2020-04-28 19:31:29 +00:00
TreeHugger Robot
c233896a84 Merge "Move conversation app name into header" into rvc-dev am: 821b7f21b0 am: 83b97589b4
Change-Id: I05d003d11f6edef088553547f9fbaa1768188690
2020-04-28 19:31:03 +00:00
TreeHugger Robot
04ccfdfae7 Merge "Don't pass initial intents to the inactive profile." into rvc-dev 2020-04-28 19:19:17 +00:00
TreeHugger Robot
821b7f21b0 Merge "Move conversation app name into header" into rvc-dev 2020-04-28 18:51:35 +00:00
Feng Cao
ca8cf2776d Fix a bug in InlinePresentationStyleUtils#bundleEquals
* before the fix, the method would return false if the two bundles both
  contains a nested bundle for the same key, and the nested bundles are
  equal. i.e. the test case
  InlinePresentationStyleUtilsTest#testBundleEquals_nestedBundle_equal
  would fail.

Test: atest InlinePresentationStyleUtilsTest
Bug: 154957669

Change-Id: Ia2cf682619fa245d846972a8683d03333551df78
2020-04-28 11:27:59 -07:00
arangelov
acc8243564 Don't pass initial intents to the inactive profile.
Otherwise the initial intents will be shown in the other
profile as share targets. This would cause a crash when
the user selects the app, as the activity cannot
be resolved.

Fixes: 155088755
Test: manual
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: I0604c15c35ecddf163460286b84c27daf6ca9a5b
2020-04-28 18:52:54 +01:00
Automerger Merge Worker
b8a9dfd029 Merge "Merge "Only perform autolaunch if list has completely rebuilt" into rvc-dev am: 8862ee3891 am: 904ccaa4c0" into rvc-d1-dev-plus-aosp am: 210f5b4b8c am: b28a7f7396
Change-Id: If94394bbc149c6f429356739f762aaaf9e19b244
2020-04-28 14:36:21 +00:00
TreeHugger Robot
043ef6b7d5 Merge "Only perform autolaunch if list has completely rebuilt" into rvc-dev am: 8862ee3891 am: 904ccaa4c0
Change-Id: Id47a1e6a47daa62148215fb01c386444b7239f57
2020-04-28 14:08:29 +00:00
TreeHugger Robot
8862ee3891 Merge "Only perform autolaunch if list has completely rebuilt" into rvc-dev 2020-04-28 13:59:33 +00:00
arangelov
1b11cc1a17 Only perform autolaunch if list has completely rebuilt
Previously we would check for autolaunch the first time
onPostListReady is called, but that is too early in the case
when we start the async task for sorting the targets. In
that case onPostListReady is called twice - once before
task is launched, and once after task is finished.

We fix this by passing the rebuildListCompleted parameter to
the onPostListReady callback and use it to check for autolaunch.

Test: atest ChooserActivity
Test: atest ResolverActivity
Test: manual
Fixes: 154728817
Change-Id: Ib1b049af00d791898b908bdb65971c07c558f3ac
2020-04-28 12:59:18 +01:00
Alec Mouri
dd097c3e12 Merge "Remove exposed hidden apis in Point.java" 2020-04-28 01:29:02 +00:00
TreeHugger Robot
713e9bdb88 Merge "Support WRAP_CONTENT in InlineSuggestion#inflate" into rvc-dev am: 5e9aed81d0 am: 820cf90774 am: be1ec62c81 am: ad5f34069a
Change-Id: I021c1d5c7adafc1590bba0a1ec431051b7b3883e
2020-04-28 00:40:43 +00:00
TreeHugger Robot
be1ec62c81 Merge "Support WRAP_CONTENT in InlineSuggestion#inflate" into rvc-dev am: 5e9aed81d0 am: 820cf90774
Change-Id: Ib059073aa08dda11cf97d52aa926f0d5254d3330
2020-04-28 00:05:51 +00:00
TreeHugger Robot
5e9aed81d0 Merge "Support WRAP_CONTENT in InlineSuggestion#inflate" into rvc-dev 2020-04-27 23:52:59 +00:00
Collin Fijalkovich
affdc7fb06 Merge "Cache getPhoneId and getSlotIndex binder calls." 2020-04-27 23:31:51 +00:00
Feng Cao
bd26abbc5b Support WRAP_CONTENT in InlineSuggestion#inflate
Test: atest android.autofillservice.cts.inline
Bug: 154887895

Change-Id: Ie420bd40e8f0fb7d6e6b1e47ed0f41dc3f85b25e
2020-04-27 15:12:14 -07:00
TreeHugger Robot
4c074f1e9e Merge "Keep the intent resolver button bar stuck to the bottom." into rvc-dev am: 1ef9f259c4 am: b1f1b2fe92 am: ce6663465f am: 6f056ec326
Change-Id: I5ebbd3ab7324822ac6213b2f1492e15034050f26
2020-04-27 20:47:02 +00:00
TreeHugger Robot
6d5d83f3ea Merge "Update one-line layout for conversation notifs" into rvc-dev am: 9153a323fd am: 48026065ac am: 7a5c47fb92 am: 352bfd1d4b
Change-Id: I1eb7ca86b3d0d49e4c6301f1f24cdb2ca93e9066
2020-04-27 20:46:14 +00:00
TreeHugger Robot
ce6663465f Merge "Keep the intent resolver button bar stuck to the bottom." into rvc-dev am: 1ef9f259c4 am: b1f1b2fe92
Change-Id: I612ffc559c6342aa10eb8fc61148b841d65db16a
2020-04-27 20:09:56 +00:00
TreeHugger Robot
7a5c47fb92 Merge "Update one-line layout for conversation notifs" into rvc-dev am: 9153a323fd am: 48026065ac
Change-Id: I1ba44c6877a775396e6530308713f13b9ec393f0
2020-04-27 20:09:25 +00:00
TreeHugger Robot
1ef9f259c4 Merge "Keep the intent resolver button bar stuck to the bottom." into rvc-dev 2020-04-27 19:53:32 +00:00
TreeHugger Robot
9153a323fd Merge "Update one-line layout for conversation notifs" into rvc-dev 2020-04-27 19:53:23 +00:00
Steve Elliott
f7ef4efeda Move conversation app name into header
Bug: 154511267
Test: visual, manual, atest
Change-Id: I929569a5e3f39df69258f1ec5ee58057c95d2387
2020-04-27 15:40:18 -04:00
Miranda Kephart
dd3e7aee3c Merge "Keep screenshot process bound" into rvc-dev am: c8f22beefe am: e538f40bf1 am: ee95ffefad am: 5581f9cfbd
Change-Id: I7e5d3fb77c44d20cc7cdc95dac8c539173b15781
2020-04-27 18:40:42 +00:00
Miranda Kephart
ee95ffefad Merge "Keep screenshot process bound" into rvc-dev am: c8f22beefe am: e538f40bf1
Change-Id: Idd4f9cc5e18eca3ad87f8ac432adb525f6334d02
2020-04-27 18:23:59 +00:00
Miranda Kephart
c8f22beefe Merge "Keep screenshot process bound" into rvc-dev 2020-04-27 18:00:43 +00:00
arangelov
27b997491e Keep the intent resolver button bar stuck to the bottom.
Fixes: 154939990
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Test: manual
Change-Id: Ia450701650dfca55488ed7bf1f9bebcae5b72c2c
2020-04-27 18:40:47 +01:00
TreeHugger Robot
93b0f2a943 Merge "Implement direct share targets quota based onto app share score in ChooserTarget ranking protorype." into rvc-dev am: 2133dc6e73 am: 6a76b2a29e am: f560015f24 am: ddb262cc33
Change-Id: I9ca097d1644b9de1d39281569e306ee189bfe0e3
2020-04-27 17:21:46 +00:00
TreeHugger Robot
6a76b2a29e Merge "Implement direct share targets quota based onto app share score in ChooserTarget ranking protorype." into rvc-dev am: 2133dc6e73
Change-Id: I3a0a2781b7537ff56ebc63dad19530c6e28f5a28
2020-04-27 16:28:15 +00:00
TreeHugger Robot
2133dc6e73 Merge "Implement direct share targets quota based onto app share score in ChooserTarget ranking protorype." into rvc-dev 2020-04-27 16:17:27 +00:00
Steve Elliott
936df15c79 Update one-line layout for conversation notifs
Fixes: 152770837
Test: manual, visual
Change-Id: I8433d5e26be4e6fe0c16acc87b29bac334011cbf
2020-04-27 11:49:13 -04:00
Charles Chen
cc6013812e Merge changes Ida26b961,I1d416b9c into rvc-dev am: 413ce328e5 am: f8bc6fe4fa am: 2ca88b4ce2 am: b88c351a7a
Change-Id: I9a6f82f7274dba074dcf699009bcfff167e1fe76
2020-04-27 10:08:12 +00:00
Charles Chen
2ca88b4ce2 Merge changes Ida26b961,I1d416b9c into rvc-dev am: 413ce328e5 am: f8bc6fe4fa
Change-Id: I6f251b0656c782141f17b2721163d72edd748596
2020-04-27 09:31:18 +00:00
Charles Chen
edfff9e687 Merge changes Ida26b961,I1d416b9c into rvc-dev am: 413ce328e5
Change-Id: I2acbd395c60b36242106f8c0f282182dbe54b7ef
2020-04-27 09:12:33 +00:00
Charles Chen
413ce328e5 Merge changes Ida26b961,I1d416b9c into rvc-dev
* changes:
  Fix error in DecorView's ViewConfiguration
  Fix DecorView error about non-visual context
2020-04-27 08:57:58 +00:00
Charles Chen
441efaec07 Fix error in DecorView's ViewConfiguration
In ViewConfiguration, we use isUiContext to verify if a context
is an visual context. However, DecorContext uses Application
context as a base context and return false as intended.
This patch overrides isUiContext to report context#isUiContext
instead.

fixes: 153664027
Test: atest DecorContextTest#testIsUiContextFromVisualDecorContext
Change-Id: Ida26b9617c74dc6997fc2c00d97d3420a0978fc7
2020-04-27 16:37:52 +08:00
Charles Chen
6661575791 Fix DecorView error about non-visual context
This error showed because DecorContext uses application context
to get WindowManager. This CL changes to use PhoneWindow to obtain
WindowManager instance. Also refactor ctr to obtain context from
PhoneWindow.

Bug: 152806048
Test: manual - enable strict mode and check the error log not shown.
Test: atest DecorContextTest
Test: atest MemoryTests#testActivityRecreation
Change-Id: I1d416b9cdb015c9bc3553571041f3b14bb9da5da
2020-04-27 16:37:46 +08:00
Song Hu
6f42281c7f Implement direct share targets quota based onto app share score in
ChooserTarget ranking protorype.

Bug: 151112858
Test: atest CtsSharesheetTestCases:android.sharesheet.cts.CtsSharesheetDeviceTest
Change-Id: I740d102d27b29fdf2af591593a619f3b60ef0f89
2020-04-26 22:07:03 -07:00
Nick Chalko
c2b6938c2e Merge "Use HdmiProperties class for ro.hdmi.*" 2020-04-26 17:18:44 +00:00
Jing Ji
f57d848081 Merge "Fix test failure in testProcessStateByPulling" into rvc-dev am: b344e0ac95 am: 9ef42068a4 am: 47061a4cd7 am: 36d755b79f
Change-Id: I2ebb573d22bf538b5579a8bcc3710aa4bea3a143
2020-04-24 23:55:04 +00:00
Jing Ji
47061a4cd7 Merge "Fix test failure in testProcessStateByPulling" into rvc-dev am: b344e0ac95 am: 9ef42068a4
Change-Id: I31d85c49c19c1636949569e4a885830e25c41a04
2020-04-24 23:14:36 +00:00
Jing Ji
47ae64c03f Merge "Fix test failure in testProcessStateByPulling" into rvc-dev am: b344e0ac95
Change-Id: I0e850a76c5c56d3d0eb7790f7726330ce7a9f694
2020-04-24 23:13:17 +00:00
Jing Ji
b344e0ac95 Merge "Fix test failure in testProcessStateByPulling" into rvc-dev 2020-04-24 23:05:08 +00:00
Miranda Kephart
a4c79758fb Keep screenshot process bound
Currently, the screenshot process only remains bound to SysUI
(by ScreenshotHelper) until the screenshot finishes saving. This
makes it vulnerable to getting cached and frozen. Since the process
now includes UI with touch focus for longer than that, this can
cause ANRs in the screenshot process, if it is frozen while it's
supposed to be accepting touch input.

Retaining the binding for the entire lifecycle of the screenshot
UI fixes this problem.

Test: manual -- used the steps in b/153577093 to verify the
freezing behavior and verified that it no longer occurred after
the change
Bug: 153418099
Fix: 153418099

Change-Id: Idca24a69274af3d633e1243b46b602613cb04d50
2020-04-24 15:43:02 -04:00
Collin Fijalkovich
fae7c9798d Cache getPhoneId and getSlotIndex binder calls.
Use PropertyInvalidatedCache to avoid redundant calls to
SubscriptionController getSlotIndex and getPhoneId.
Bug: 151953109
Test: Verified cache operated correctly when phone process is killed.
Test: atest SubscriptionControllerTest
Test: atest android.telephony.cts.SubscriptionManagerTest

Change-Id: I70552537af44f3e05b156cd190ebb28f0d940bf6
2020-04-24 11:21:49 -07:00