Commit Graph

14135 Commits

Author SHA1 Message Date
TreeHugger Robot
8d32be7e28 Merge "Set calling user as intent extra to indicate intent resolver edge case" into rvc-dev am: c235831ae5 am: e12aa6fadb am: a9b41a8e94 am: 1867ddfa83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689273

Change-Id: I8e2a3f8cdbb4790225b758eb65becdc8844084ae
2020-06-03 20:30:56 +00:00
Automerger Merge Worker
875adc7b85 Merge "Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev am: 31a2e1ba46 am: a825b17dfe" into rvc-d1-dev-plus-aosp am: 3cfe1e9bf4 am: 803648e9a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689597

Change-Id: I3ba76f1ccb568ddf1e55160a60d3e70666d5cd07
2020-06-03 19:51:49 +00:00
TreeHugger Robot
e12aa6fadb Merge "Set calling user as intent extra to indicate intent resolver edge case" into rvc-dev am: c235831ae5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689273

Change-Id: If46fad4d1d60e7c2465e671c188cc2e22385b808
2020-06-03 19:46:31 +00:00
TreeHugger Robot
c235831ae5 Merge "Set calling user as intent extra to indicate intent resolver edge case" into rvc-dev 2020-06-03 19:33:26 +00:00
TreeHugger Robot
a825b17dfe Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev am: 31a2e1ba46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689597

Change-Id: I733564e57c23b14e88ae2339e2d513ac5da77501
2020-06-03 19:18:22 +00:00
TreeHugger Robot
31a2e1ba46 Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev 2020-06-03 19:16:31 +00:00
Will Brockman
bbd80b70e1 Merge "Add RankingSelected to UiEventLogger." into rvc-dev am: c66aeed213 am: b97ec7aa49 am: cb1a01e27b am: ef806235fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692386

Change-Id: I32bf4b036c55814e62430a7ff1eca9c27e4fe4cc
2020-06-03 18:21:22 +00:00
Will Brockman
ef806235fa Merge "Add RankingSelected to UiEventLogger." into rvc-dev am: c66aeed213 am: b97ec7aa49 am: cb1a01e27b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692386

Change-Id: I210574ba4301af4b0abeb547e9bb91945a24d75a
2020-06-03 18:13:58 +00:00
Will Brockman
c5af32b2d8 Merge "Add RankingSelected to UiEventLogger." into rvc-dev am: c66aeed213
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692386

Change-Id: I6b4322e38ba674a06dbe86da72316c71f75978a2
2020-06-03 17:58:37 +00:00
Will Brockman
c66aeed213 Merge "Add RankingSelected to UiEventLogger." into rvc-dev 2020-06-03 17:55:47 +00:00
arangelov
738034ba6c Set calling user as intent extra to indicate intent resolver edge case
Instead of relying on the user hint in the intent, we now explicitly
set the calling user as an intent extra.

Fixes: 149741820
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Test: manual
Change-Id: Iaa37fc1330abbb419035d899fad166afc53aaea8
2020-06-03 18:46:28 +01:00
arangelov
7c510c2227 Also call Intent#fixUris for the intent resolver case
Fixes: 158082179
Test: manual
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: I74c97f5d2f3bbbcd35df20151a455877562f34ad
2020-06-03 18:24:40 +01:00
Antoan Angelov
3a013f5056 Merge "Only allow scroll in one direction at a time" into rvc-dev am: 5f7043db84 am: cbe82da541 am: 829233f789 am: 8e8c59496c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691616

Change-Id: I1dcaa6b75a19927ae4a810770ce0f75accac6fe5
2020-06-03 15:22:43 +00:00
Antoan Angelov
829233f789 Merge "Only allow scroll in one direction at a time" into rvc-dev am: 5f7043db84 am: cbe82da541
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691616

Change-Id: I4d501407fd3e3a16f90af6c89edfe2ed2351149d
2020-06-03 14:57:39 +00:00
Antoan Angelov
ccfaf52f97 Merge "Only allow scroll in one direction at a time" into rvc-dev am: 5f7043db84
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691616

Change-Id: I10ac3e0329d024c96720493d03f1f7eca380eb60
2020-06-03 14:44:43 +00:00
arangelov
d85a74a473 Only allow scroll in one direction at a time
Fixes: 156605289
Test: manual
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: Ibf301f7aa4440e4483355829d0e24fc8e53350e7
2020-06-03 13:19:36 +01:00
Antoan Angelov
088c93be82 Merge "Add bottom offset to empty state screens for chooser" into rvc-dev am: 3b31c14eb5 am: f03fafc76a am: cdca75a189 am: 0b10d2b4c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11623666

Change-Id: Idbbc81103548648d77186bb4dc654ab687469a24
2020-06-03 12:17:54 +00:00
Antoan Angelov
0b10d2b4c3 Merge "Add bottom offset to empty state screens for chooser" into rvc-dev am: 3b31c14eb5 am: f03fafc76a am: cdca75a189
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11623666

Change-Id: I9d8c9d5b7612af17d56735670f2fc61a0178b3f6
2020-06-03 12:04:06 +00:00
Antoan Angelov
d9b47e0530 Merge "Add bottom offset to empty state screens for chooser" into rvc-dev am: 3b31c14eb5 am: f03fafc76a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11623666

Change-Id: I1a6ae40dd12f24f1eefc3456088b2eefe8c8e36c
2020-06-03 11:49:58 +00:00
Antoan Angelov
8341cc605f Merge "Add bottom offset to empty state screens for chooser" into rvc-dev am: 3b31c14eb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11623666

Change-Id: I31dd481e358227c863b1b3abb7c3595bfb374a9b
2020-06-03 11:35:03 +00:00
Antoan Angelov
3b31c14eb5 Merge "Add bottom offset to empty state screens for chooser" into rvc-dev 2020-06-03 11:32:24 +00:00
Steve Elliott
0bc7867b71 Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc1937581a am: 4c42f40c1f am: ad14c752c4 am: aa9275bb9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11662920

Change-Id: I2aaa8cb531c0d44f6d6f167ef3a9f2c14840e75d
2020-06-02 19:21:01 +00:00
Steve Elliott
aa9275bb9d Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc1937581a am: 4c42f40c1f am: ad14c752c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11662920

Change-Id: I44cd9b7cc4298067f6aef83716bfcf797f1b6edf
2020-06-02 18:54:49 +00:00
Steve Elliott
841ddf9dd2 Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc1937581a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11662920

Change-Id: I4a8979618900abb1e13547d67e6fe2539203b3e8
2020-06-02 18:53:14 +00:00
Steve Elliott
cc1937581a Merge "Always use Shortcut Icon in conversation if available" into rvc-dev 2020-06-02 18:46:38 +00:00
arangelov
28bb4fe9d4 Add bottom offset to empty state screens for chooser
Test: manual
Test: atest ResolverActivityTest
Test: atest ChooserActivityTest
Fixes: 153654313
Change-Id: I36f55425a2c4daff52d7732d5c71445eb2c03527
2020-06-02 17:58:28 +01:00
Will Brockman
56973c2b47 Add RankingSelected to UiEventLogger.
Allow logging of the RankingSelected variant of UiEventReported.

Change-Id: Ibe1b7bfe4798cdaf07cf87ec8efefb0006909872
Bug: 155061525
Test: atest SystemUiTests
2020-06-02 10:16:22 -04:00
TreeHugger Robot
9c01211d8f Merge "Fix app stack issue: send the selected target info into AppPredictionService and UsageStatsManager, when user share from app stack on sharesheet." into rvc-dev am: 22e135e17c am: 8549324e42 am: 4472c5f9a0 am: 3480da7103
Original change: undetermined

Change-Id: Idefd84661db33a0466c3db4a826ceff3873ffbc3
2020-06-02 14:07:05 +00:00
TreeHugger Robot
3480da7103 Merge "Fix app stack issue: send the selected target info into AppPredictionService and UsageStatsManager, when user share from app stack on sharesheet." into rvc-dev am: 22e135e17c am: 8549324e42 am: 4472c5f9a0
Original change: undetermined

Change-Id: Icf4d4d30f3218934f128e7f064a3bffc64f7e8c9
2020-06-02 13:51:05 +00:00
TreeHugger Robot
625ed8e4a2 Merge "Fix app stack issue: send the selected target info into AppPredictionService and UsageStatsManager, when user share from app stack on sharesheet." into rvc-dev am: 22e135e17c
Original change: undetermined

Change-Id: I2a1d52c4295e1b239bc174ee5f06bcbaa02d3610
2020-06-02 13:42:52 +00:00
TreeHugger Robot
22e135e17c Merge "Fix app stack issue: send the selected target info into AppPredictionService and UsageStatsManager, when user share from app stack on sharesheet." into rvc-dev 2020-06-02 13:35:51 +00:00
Antoan Angelov
d55f9221b3 Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev am: 6d5e349bcd am: 0cc6086757 am: c80bb1f31e am: 5cf58a5ef8
Original change: undetermined

Change-Id: Ide4287374801d6e81906a4a06339196d590e6d43
2020-06-02 11:37:48 +00:00
Antoan Angelov
1f72e54624 Merge "Don't query direct share for work profile when its turned off" into rvc-dev am: 1a0d72eaa9 am: 2db1073bf0 am: f8623d4a5f am: d589cdeb17
Original change: undetermined

Change-Id: I7ca12e962c1e28750fbffab9933beb01c575c81c
2020-06-02 11:36:59 +00:00
Antoan Angelov
c80bb1f31e Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev am: 6d5e349bcd am: 0cc6086757
Original change: undetermined

Change-Id: If2ae5a93f45abc390c68bd9244bbf54802f9a820
2020-06-02 11:01:50 +00:00
Antoan Angelov
f8623d4a5f Merge "Don't query direct share for work profile when its turned off" into rvc-dev am: 1a0d72eaa9 am: 2db1073bf0
Original change: undetermined

Change-Id: I5d46c85d90a960aa4d14a0e7d14277f0326fad5e
2020-06-02 11:01:30 +00:00
Antoan Angelov
a27b48776e Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev am: 6d5e349bcd
Original change: undetermined

Change-Id: Ic17cdd26febc197fc6deb3c465fb01e578ac63bb
2020-06-02 10:56:52 +00:00
Antoan Angelov
6d5e349bcd Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev 2020-06-02 10:52:04 +00:00
Antoan Angelov
267e554d5e Merge "Don't query direct share for work profile when its turned off" into rvc-dev am: 1a0d72eaa9
Original change: undetermined

Change-Id: Ida0084a4b2dc9eb400f082f526b0df5a70249b4d
2020-06-02 10:49:51 +00:00
Antoan Angelov
1a0d72eaa9 Merge "Don't query direct share for work profile when its turned off" into rvc-dev 2020-06-02 10:33:55 +00:00
Song Hu
026ddd5688 Merge "Update the default score for direct share targets." into rvc-dev am: 060eff0716 am: b07bb870c8 am: f1480f878a am: 2fd56b5b51
Change-Id: I68b9894e49c0a5e7cf45b6036b1a3daa349449a6
2020-06-01 20:14:25 +00:00
Song Hu
f1480f878a Merge "Update the default score for direct share targets." into rvc-dev am: 060eff0716 am: b07bb870c8
Change-Id: Ic2a3fa3ea7da42333f27c4dda01aea5321daca04
2020-06-01 19:39:27 +00:00
Song Hu
03265c0f68 Merge "Update the default score for direct share targets." into rvc-dev am: 060eff0716
Change-Id: Iccf12b32f4e1fcaea803832491677cf775ce3871
2020-06-01 19:08:56 +00:00
Song Hu
060eff0716 Merge "Update the default score for direct share targets." into rvc-dev 2020-06-01 18:51:49 +00:00
Song Hu
b6039994d2 Fix app stack issue: send the selected target info into AppPredictionService and
UsageStatsManager, when user share from app stack on sharesheet.

Fix: 157917956
Test: atest CtsSharesheetTestCases:android.sharesheet.cts.CtsSharesheetDeviceTest
Change-Id: I268af5d996dcca275014fba1cace2c54930b9b0c
2020-06-01 11:51:17 -07:00
arangelov
9e811f9064 Don't query direct share for work profile when its turned off
Test: manual
Test: atest ChooserActivity
Test: atest ResolverActivity
Fixes: 157902213
Change-Id: I1e48d5a10ee2099c945254fce905086349ebfc41
2020-06-01 17:37:28 +01:00
Song Hu
93cefaac1c Update the default score for direct share targets.
Bug: 151112858
Test: atest CtsSharesheetTestCases:android.sharesheet.cts.CtsSharesheetDeviceTest
Change-Id: I700bebf19bbaf208efaccf97ab77472d43c1b34a
2020-06-01 09:07:19 -07:00
arangelov
9a8a6744ef Only add user id to content uri if launching cross-profile target
Test: manual
Test: atest ResolverActivityTest
Test: atest ChooserActivityTest
Bug: 156552093
Change-Id: Icbdf0ea33f35785322eb6bfb23e88dfdacf7fd34
2020-06-01 14:17:32 +01:00
Soonil Nagarkar
7f78f206b7 Adopt new ListenerTransport framework
This makes all LM listeners static, saving memory across LM instances in
an application. In addition, listeners for rarely used APIs such as GNSS
APIs are now initialized on-demand to save memory. Finally, the new
transport framework is adopted for location listeners, which means a new
transport object will be used for every location request, eliminating
several edge case bugs around listener removal.

Test: manual + cts
Change-Id: I1f374248baf695323177f347873fed72841f85d0
2020-05-31 23:12:47 -07:00
Steve Elliott
6373829000 Always use Shortcut Icon in conversation if available
Bug: 153751740
Test: manual
Change-Id: Ib1002b53d700d2857f69cd476de79a4e34f90559
2020-05-29 15:56:00 -04:00
Ryan Mitchell
fd30295b29 Merge "Install system app in greatest priority partition" into rvc-dev am: d32418a72a am: d5bfbd0f27 am: 4053dfca5e am: cedef20a54
Change-Id: I3785b1e11a70127cd30b080e9a26b527f738ddc8
2020-05-29 18:29:29 +00:00