PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,343 Commits 1 Branch 0 Tags
a1ce22e1e0f5e225b8f27335fca28b9ec977ee93
Commit Graph

64343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bill Yi
acd2b849e4 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ice0a715fb50ed05b85b28218f7c51f26e1fc7f5d
 2020-06-03 07:59:31 +00: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
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
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
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
Bonian Chen
db6309cae2 Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev 2020-06-02 09:19:00 +00:00
Bonian Chen
d40f7f707e [Settings] Move mobile data template out of framework 
Move mobile data template out of framework

Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageLibTest
Change-Id: I5072cd1e673194d00b3ce82242bf5fbad88d23cd
 2020-06-02 17:16:53 +08:00
TreeHugger Robot
76bff39d89 Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: 74236c50a0 
Original change: undetermined

Change-Id: I2bce7b18502deffcad70361de7353d064657c4a3
 2020-06-02 07:53:42 +00:00
TreeHugger Robot
2ba19aba50 Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762 
Original change: undetermined

Change-Id: I48fc5689d72f9ea304b19286755a84997cdd8ee1
 2020-06-02 07:46:50 +00:00
TreeHugger Robot
74236c50a0 Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd 
Original change: undetermined

Change-Id: If792feed3581c2224c036f02f4838254978e4807
 2020-06-02 07:34:27 +00:00
TreeHugger Robot
b607801762 Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd 
Original change: undetermined

Change-Id: I33a30ec63b81285b76f07f51c4b139198fe24320
 2020-06-02 07:33:43 +00:00
TreeHugger Robot
0add12ea08 Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a 
Original change: undetermined

Change-Id: I6a8b45fce1f7ab596648d50ba44395b05791e6ec
 2020-06-02 07:22:37 +00:00
TreeHugger Robot
0ee853f913 Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 
Original change: undetermined

Change-Id: Ieb42225de9670cef1a4436993112bb4e33ee5cb0
 2020-06-02 07:22:18 +00:00
TreeHugger Robot
62ec08f7bd Merge "Suppress battery saver suggestion notification" into rvc-dev 2020-06-02 07:18:54 +00:00