PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,276 Commits 1 Branch 0 Tags
ecef5590c1baa37331cda7c4cba15d7e924bf02a
Commit Graph

68276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c951ec1a65 Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp am: dca875c0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: Ia8782acb30732df62780c4b8ea1b593ae80631ed
 2020-06-03 12:05:38 +00:00
Automerger Merge Worker
a3cfe0e8bb Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9" into rvc-qpr-dev-plus-aosp 2020-06-03 12:03:55 +00:00
Julia Reynolds
6cb3469fb2 Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 9d22d9582b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: Id635116c1a8bbda65bfab34c34e36366162e8ce2
 2020-06-03 12:03:45 +00:00
Julia Reynolds
25e0bc3aa0 Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I03ebf0cbc6688f6a3c02ca274277cbc171bf4d5b
 2020-06-03 12:03:45 +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
09052ac8d9 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: I0a9776f57778db6ad94e77457033d15ff3415dd1
 2020-06-03 11:49:47 +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
5dc5228332 Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22 am: 50f8ba28d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: I88146870c0d1db5159da76343392a1150276d505
 2020-06-03 11:01:04 +00:00
Jakub Pawlowski
7f5a929fb7 Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 2a1b189cde am: 5037d1dafa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

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

Change-Id: I319c35bd4338efd7d2b8e90d6643809c4c39b631
 2020-06-03 11:00:18 +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
50f8ba28d6 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: I88a9d5851fd510f74ad571f72079bec15c85cb13
 2020-06-03 10:48:11 +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
Bonian Chen
6a653a8c88 Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 4191af1eb1 am: c3bce764fc 
Original change: undetermined

Change-Id: Ibfdcf90684654ef25b51176bce5d872bc08c84c4
 2020-06-02 15:13:59 +00:00
Bonian Chen
b399a6394f Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf am: 68b19028ee 
Original change: undetermined

Change-Id: I543700ac47c922505c0d00e1c97d398115b4f942
 2020-06-02 15:12:54 +00:00
Bonian Chen
047f010b63 Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf am: 8dfb423714 
Original change: undetermined

Change-Id: I86c72b738cefe7d523b3fad63ce8d03aecbacba7
 2020-06-02 15:12:32 +00: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
68b19028ee Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf 
Original change: undetermined

Change-Id: I7e136e9e2cc2e4ef76ec5fd9d31af7465659824e
 2020-06-02 14:58:19 +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
4191af1eb1 Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 
Original change: undetermined

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

Change-Id: If32fcf027ee41cf60f0b6edade1b2468d2fe28ef
 2020-06-02 14:46:23 +00:00
Bonian Chen
68cc44bb77 Merge "[Settings] Move mobile data template out of framework" into rvc-dev 2020-06-02 14:36:20 +00:00
Bonian Chen
505e62c382 Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: ae207e14c0 am: 27565c5f40 
Original change: undetermined

Change-Id: I3861d92dc8285e6fb03eb0ce58505c493835506f
 2020-06-02 09:59:09 +00:00
Bonian Chen
bfcf78fce3 Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: 710dfc1bec am: 3901996e1d 
Original change: undetermined

Change-Id: I2312410a6941484b0a37ce14be753e1f92d37dfe
 2020-06-02 09:58:58 +00:00
Bonian Chen
4609e3b87b Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: ae207e14c0 am: 7f939d8d7e 
Original change: undetermined

Change-Id: I7e0cbabac1d29660b25a419f0448e4097e8d504f
 2020-06-02 09:58:51 +00:00
Bonian Chen
3901996e1d Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: 710dfc1bec 
Original change: undetermined

Change-Id: I79f8ad86b782ef1cf10b8a4e1ad7d5de779aaadb
 2020-06-02 09:42:54 +00:00
Bonian Chen
27565c5f40 Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: ae207e14c0 
Original change: undetermined

Change-Id: Icc9108b620e40439cde62110f69ebd1ee8670150
 2020-06-02 09:42:53 +00:00
Bonian Chen
7f939d8d7e Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: ae207e14c0 
Original change: undetermined

Change-Id: I339dc5e8a2353e3b9338e8b37d0c4f6986216dd7
 2020-06-02 09:42:13 +00:00
Bonian Chen
710dfc1bec Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 
Original change: undetermined

Change-Id: I4e88e7e2b9253b4b579a29c921c3259ad8ec680b
 2020-06-02 09:29:29 +00:00
Bonian Chen
ae207e14c0 Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 
Original change: undetermined

Change-Id: I92c00ccaca975dec09b57afbabdadffc26bbd355
 2020-06-02 09:29:13 +00:00