PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,312 Commits 1 Branch 0 Tags
a59338f4bedf094ef3b2583dada5309d0ca89dcc
Commit Graph

65312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
85a4217776 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I5d84c6b9d0b143bdce1fad1a2cc248c5f13f986d
 2020-06-04 04:38:58 +00:00
TreeHugger Robot
d3d9b3d462 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I4c84d1e4c7f16fd85d8c8af15cd0e92e62dd6439
 2020-06-04 04:38:53 +00:00
TreeHugger Robot
74755ac915 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev 2020-06-04 04:24:55 +00:00
Will Brockman
a52b40c170 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I0f9c8ac84872b7e88c860e3033b1aac81d7a127e
 2020-06-03 18:01:01 +00:00
Will Brockman
63bb9a404f Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 815dac6ce0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I413de4bd9af640533e9be5e57af1ff00af2237b8
 2020-06-03 18:00:11 +00:00
Will Brockman
815dac6ce0 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I6ad5bfd54a1a0d52f6207c103adc5808f60365f8
 2020-06-03 17:58:37 +00:00
Will Brockman
5d859ea300 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I93a6ace5ceab0cf0b0794c8a241e99d301f07cb1
 2020-06-03 17:58:02 +00:00
Will Brockman
5c1b9c357d Merge "Statsd UiEvent logging for notification history." into rvc-dev 2020-06-03 17:55:47 +00:00
Xin Li
729c213fb7 Merge QQ3A.200605.002 into master 
Bug: 158095402
Merged-In: I614914b738e3af198fe21b881d2e475e2e8eda41
Change-Id: Idd585020a1fed163866339c09d614dca0ca6e55f
 2020-06-03 10:45:09 -07:00
TreeHugger Robot
9f9631b7ce Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 455227793c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Idbda613b47fd4ba3e81e45ddb0fc50a77630e78d
 2020-06-03 17:37:09 +00:00
TreeHugger Robot
cc0f307449 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I541a0150eff40fb07ef8263e8c510f869a9306cb
 2020-06-03 17:36:41 +00:00
TreeHugger Robot
455227793c Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Iae49b6d19752166dd0e1c2ba478625bc40b7aa1f
 2020-06-03 17:23:14 +00:00
TreeHugger Robot
221f9b4c11 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Ic2e1d889afacc4948360d04cef90188c600fd9c1
 2020-06-03 17:23:08 +00:00
TreeHugger Robot
4bb32b6c58 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev 2020-06-03 17:11:45 +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
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
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
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
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
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
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
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