Commit Graph

67351 Commits

Author SHA1 Message Date
TreeHugger Robot
4bb32b6c58 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev 2020-06-03 17:11:45 +00:00
TreeHugger Robot
7a6ed345aa Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-06-03 14:59:14 +00:00
Automerger Merge Worker
a1ce22e1e0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: 83d07425f4 -s ours" into rvc-d1-dev-plus-aosp 2020-06-03 14:58:31 +00:00
TreeHugger Robot
014b1dc5c0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: 83d07425f4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902

Change-Id: Ia8301abffa4aa6c932187d2b99859d1afc8548d5
2020-06-03 14:58:27 +00:00
TreeHugger Robot
6fa00750af [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713510

Change-Id: Idcc36cc463d959e850ec09e790799750042fa988
2020-06-03 14:58:23 +00:00
TreeHugger Robot
14d5d07f76 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902

Change-Id: I422f46004a638318ead120466b91150a11fde0e1
2020-06-03 14:58:17 +00:00
TreeHugger Robot
36da31b9e4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716969

Change-Id: I6ab0716d3d9008326846d8afdbcc1365553a6040
2020-06-03 14:57:57 +00:00
TreeHugger Robot
d1620abcfb Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-03 14:54:04 +00:00
Kholoud Mohamed
04b2ab2065 Add cross profile apps entry in the privacy screen
Test: manual testing
Bug: 146318770
Change-Id: Id30a2f4cf40cc5c83e4d4d2544ac6696366fc44a
2020-06-03 15:46:35 +01:00
TreeHugger Robot
1d160cfed2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902

Change-Id: I6ba0576267ca029aee23ad4b9669912913d5ea0a
2020-06-03 14:45:43 +00:00
TreeHugger Robot
83d07425f4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902

Change-Id: I47c198c73d09f9a46da6fa360a467e5cd65d3a90
2020-06-03 14:44:59 +00:00
TreeHugger Robot
b57c537dde [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11715902

Change-Id: Icbfe834b63424afd43db3251c03268484799243f
2020-06-03 14:44:21 +00:00
TreeHugger Robot
ba824d0593 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-03 14:43:44 +00:00
TreeHugger Robot
aa5febafbf Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-06-03 14:40:34 +00:00
TreeHugger Robot
8a25126839 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: ffaf35fed3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511

Change-Id: I4833a399c940c6bb961f5ff6011f07b3840b5c34
2020-06-03 14:39:52 +00:00
TreeHugger Robot
28887ff65a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: 3998e37c08 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511

Change-Id: Id513baadb02e0a734800a8d3c19cbaab90d8771b
2020-06-03 14:39:20 +00:00
TreeHugger Robot
82b99f14a2 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-03 14:34:25 +00:00
TreeHugger Robot
ffe74f0e25 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511

Change-Id: I75877c1a644a7cd1a12b8da317a1e367e8471746
2020-06-03 14:17:54 +00:00
TreeHugger Robot
ffaf35fed3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511

Change-Id: Iebea25bf71d692e404fdb3358d3fd4b76eafd58d
2020-06-03 14:17:32 +00:00
TreeHugger Robot
3998e37c08 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511

Change-Id: I0f23e3a5bef0c7f719522c22eb2720380d64635d
2020-06-03 14:17:18 +00:00
TreeHugger Robot
879fba597f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-03 14:07:12 +00:00
Jakub Pawlowski
3f5bf02fd8 Prevent overlay drawing on top of Bluetooth pairing dialog
Bug: 155648639
Change-Id: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
Merged-In: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
2020-06-03 12:17:34 +00:00
Automerger Merge Worker
dca875c0fb Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp 2020-06-03 11:49:57 +00:00
Julia Reynolds
3e9c05f1d6 Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I78e1e6007ce102dbb168fcf36a6e3a47ac718198
2020-06-03 11:49:46 +00:00
Julia Reynolds
9d22d9582b Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I24ef690311d847645cbc4bb1dc7dae9210474301
2020-06-03 11:49:39 +00:00
Julia Reynolds
85c5015f82 Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I5db9e3ecfea35b840194b8bdae352126ddf374dd
2020-06-03 11:35:00 +00:00
Julia Reynolds
5a195b89de Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I9ba9ec35fe40ec883c08622b075b2d56040fd1b7
2020-06-03 11:34:32 +00:00
Julia Reynolds
62814ac56f Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I5776854796a31906783291df89ffea2559f6d4d3
2020-06-03 11:33:47 +00:00
Julia Reynolds
613e3c4065 Merge "Add entry point for conversation settings" into rvc-dev 2020-06-03 11:17:42 +00:00
Jakub Pawlowski
5037d1dafa Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 2a1b189cde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: I7a5539e7308d97b1be351d92434a4bdd92e9370a
2020-06-03 10:48:34 +00:00
Jakub Pawlowski
54a391f3c5 Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: I219afbcc81e3e3748fccffa6dbd1d741d38f55fd
2020-06-03 10:48:11 +00:00
Jakub Pawlowski
51851208ad Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: I9b5b090762b29d9ed569ea858db814d12a4b5968
2020-06-03 10:34:16 +00:00
Jakub Pawlowski
330bf35b22 Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: I613704afab8dc97bfc3d620120d82a6e76c893e9
2020-06-03 10:33:36 +00:00
Jakub Pawlowski
2a1b189cde Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: I7c4a61805def7c6facfcac84cf19341c36a9a92e
2020-06-03 10:33:32 +00:00
Jakub Pawlowski
3185f80f23 Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: Ifbdd0f3dabc0b487bfb5155f786cae6a9980557b
2020-06-03 10:18:46 +00:00
Jakub Pawlowski
103cc7cf29 Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: Ib47c1804cbb29942c33152d72e1019c92f0d3856
2020-06-03 09:59:18 +00:00
Bill Yi
0b57acc540 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I5ac48806b2230173733c1fc11e6f863c490186ab
2020-06-03 09:56:40 +00:00
Bill Yi
8d76e4b239 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I0a2fedc5db15afabfe816ce0fe3499331cdccab6
2020-06-03 09:15:02 +00:00
Bill Yi
8bcb3c5c70 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I3171109e498c22ac35e9338f302346fff31ceabd
2020-06-03 08:37:50 +00:00
Yi-Ling Chuang
4ff357addc Hide "Open by default" entirely for browser apps
Browsers are explicitly treated outside the web link infrastructure, so
we shouldn't offer "Open by default" section.

Fixes: 129162570
Test: robotests
Change-Id: Ie63d5fbfb32eaed4bba8a80158b6bb19bb45b380
2020-06-03 16:21:51 +08:00
Bill Yi
acd2b849e4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ice0a715fb50ed05b85b28218f7c51f26e1fc7f5d
2020-06-03 07:59:31 +00:00
Bill Yi
62f6ff9f93 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I846d848edcf2f3ccc9e508b4911eb572fbd2c6ab
2020-06-03 07:20:12 +00:00
android-build-team Robot
6c735c1ec4 Snap for 6554163 from fd1815af38 to mainline-release
Change-Id: I3a294cd5b5fac6f71357c470631b044d066ff1ab
2020-06-03 07:09:19 +00:00
Bill Yi
c475aaa05e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I89b3cbccf8dda6b2876a579051e4eb60aae6f345
2020-06-03 06:40:25 +00:00
Hugh Chen
737ec77c4f Revert "Stop usb tethering when user cancel it"
This reverts commit 9546b7fdcb.

Reason for revert: This CL will have side effort, when switch from "USB tethering" to "MTP/PTP/Midi" mode, DUT will jump to "No data transfer".
Revert this CL and have good solution to address b/154933817

Bug: 156318036
Test: build pass
Change-Id: Ia79b7a9f5d71c15244b147f5ef26af47c1c1fc7c
2020-06-03 03:35:48 +00:00
Will Brockman
7f43530a15 Statsd UiEvent logging for notification history.
Events logged:
Notif history on/off/open/close
Notif click (recent/snoozed/older)
Notif delete (older)
Notif package history open/close

Additional background: There are 3 notif history sections: snoozed
notifs, recently dismissed notifs, and older notifs. In the snoozed &
recent sections we still know the notif SBN, so actions on those
events are logged with instance ID. The older-notifs section is
grouped by package, and we no longer know the instance ID.

This change depends on change 11692386 in frameworks/base, which adds
UiEventLogger support for the RankingSelected atom.

Bug: 155061525
Test: Manual (statsd testdrive)
Change-Id: If267fca97c40c1bbd8dfa785814c85927ab36c91
2020-06-02 13:07:05 -04:00
Julia Reynolds
6a88e140fe Add entry point for conversation settings
Test: manually launch to this screen
Bug: 155490513
Change-Id: I2f88ef6dc05f04249f516b60680a55d1f26841f1
2020-06-02 12:59:13 -04:00
Bonian Chen
c3bce764fc Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 4191af1eb1
Original change: undetermined

Change-Id: I6204013f38271d3f53aca613670672d7d8957ca2
2020-06-02 14:58:48 +00:00
Bonian Chen
8dfb423714 Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf
Original change: undetermined

Change-Id: Ie0f273bc0e62b44c036ab49eaef1e1ec72f2de99
2020-06-02 14:57:45 +00:00
Bonian Chen
fd1815af38 Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77
Original change: undetermined

Change-Id: I23a9499c47422e2ec2b45bf02348c95adeab6a85
2020-06-02 14:46:56 +00:00