PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,960 Commits 1 Branch 0 Tags
54f052202768875b45ea8b46bd6b5d6f93e5541c
Commit Graph

85960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d271043a53 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I818be87c0115b75678e405d76dcd261251422473
 2021-12-22 17:28:35 +00:00
Bill Yi
eba995750f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id331047c326264b57397357e50d398f222737836
 2021-12-22 17:23:55 +00:00
Bill Yi
1ead3d51a1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If163e049edb23be7b3c35d47ba88e088ad74f6f7
 2021-12-22 17:20:05 +00:00
TreeHugger Robot
c98f700d79 Merge "Fix USB tether option" into sc-dev am: 15afdd803c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16476806

Change-Id: Id7e0710939954f4dd7a89df8d09420abdc96c2c4
 2021-12-22 03:42:47 +00:00
TreeHugger Robot
15afdd803c Merge "Fix USB tether option" into sc-dev 2021-12-22 03:27:13 +00:00
TreeHugger Robot
8c799744a3 Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723689

Change-Id: I0b2458d050882d10c7aa6820e762f69612bf5004
 2021-12-22 03:01:12 +00:00
TreeHugger Robot
da8ab6a51d Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev 2021-12-22 02:43:04 +00:00
Alex Johnston
6a8cbc9fac Fix USB tether option 
* USB tether option will be grayed out before
  USB cable is plugged in.

Bug: 192225597
Test: manual testing
Change-Id: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
Merged-In: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
(cherry picked from commit 685cacb540)
 2021-12-15 13:57:04 +00:00
Alex Johnston
bad8e1ccfa [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I337e79d206987b608a6cbadd53f8f63d30b545f5
 2021-12-09 12:35:26 +00:00
Alex Johnston
6ce0fffbb3 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: Id700cc25a0a5c7aec4704368c00864733482de46
 2021-12-09 12:35:20 +00:00
Alex Johnston
edb4843063 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I57cd5f04f66b1874bf1d1e1c164eba7789af9ad8
 2021-12-09 12:21:13 +00:00
Alex Johnston
a849920dce [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: Ia158b48a9af8910eff034da0847b1d43aa2dc3a7
 2021-12-09 12:19:33 +00:00
Alex Johnston
6f8ba573a8 Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I1a2d3a106cfedb8cb43b2eae446e1de9efef955c
 2021-12-09 12:04:49 +00:00
Alex Johnston
11b874264d Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: Icaa7eecb1381615c7e2081b697e1529c5c9a4aea
 2021-12-09 12:03:38 +00:00
Alex Johnston
88b7d05d76 Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I6b616fa81ce4c5c53e553f8e692fdc059bb894fe
 2021-12-09 12:03:22 +00:00
Alex Johnston
fca5cb3748 Add non system overlay flag to InstallCaCertificateWarning 
Bug: 196969991
Test: Manual testing with Settings
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157)
 2021-12-08 21:18:30 +00:00
Alex Johnston
02e8f56e67 Add non system overlay flag to InstallCaCertificateWarning 
Bug: 196969991
Test: Manual testing with Settings
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157)
 2021-12-08 21:18:03 +00:00
Bonian Chen
8c0052d537 [Settings] Move display of VPN version into summary text 
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
 2021-12-06 09:54:00 +00:00
Bonian Chen
dddd74a491 [Settings] Move display of VPN version into summary text 
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
 2021-12-06 09:50:45 +00:00
Bonian Chen
5fc0e6614d [Settings] Move display of VPN version into summary text 
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
 2021-12-06 09:48:50 +00:00
Bonian Chen
5935cae639 [Settings] Move display of VPN version into summary text 
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
 2021-12-06 09:46:38 +00:00
TreeHugger Robot
68745620f7 Merge changes from topic "presubmit-am-ea97047cb12a4d7ba090018d262e4d7e" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
  Import translations. DO NOT MERGE ANYWHERE
 2021-12-01 16:59:26 +00:00
Bill Yi
8ab551fd7b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891 
Blank merge reason: commit message contains skip directive

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

Change-Id: I9cee529fb54682d0da69c6c39e1748cb8860d4a9
 2021-11-29 08:48:32 +00:00
Bill Yi
8e754d6891 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If3e347bcbdb1bda52690caa9ead4a9c913c8e990
 2021-11-29 08:48:23 +00:00
Bill Yi
5a725a5b0b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4bce9132bb3c7cb7736faa4e659bbaf217a90596
 2021-11-29 08:33:28 +00:00
TreeHugger Robot
9a77d952c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1064084f6555febd4927d6b7ba46468bb203e870
 2021-11-18 19:21:38 +00:00
TreeHugger Robot
ebd2e1f662 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-18 19:06:29 +00:00
TreeHugger Robot
35b574b466 Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-18 19:06:29 +00:00
TreeHugger Robot
ec4cfd92aa Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-18 17:51:48 +00:00
TreeHugger Robot
7b6c97337b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-11-18 16:55:33 +00:00
Bill Yi
7809308072 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9 
Blank merge reason: commit message contains skip directive

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

Change-Id: I3578bd2317eb917ad5421cc78e0b41b0f6209234
 2021-11-18 11:11:02 +00:00
Bill Yi
10928bfba9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic2a76b26c01ac12d38805cfe0e587bc6578cb031
 2021-11-18 11:10:53 +00:00
Bill Yi
a4d089c738 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ic42dc91bbba1f38ab4b6ec1a0dc9a5c20dd74610
 2021-11-18 11:00:03 +00:00
Bill Yi
b8b0bef8f9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iab997959a48aa05243e0d7029dc6a7262414a46d
 2021-11-18 10:59:55 +00:00
Bill Yi
428a285829 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I12a53b0b2120d995bd75eb25e9b0f1d006af8d86
 2021-11-18 10:55:43 +00:00
Bill Yi
b25362f540 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e1a0be4a803f0a0ff07474df142d97139f304dc
 2021-11-18 10:52:11 +00:00
TreeHugger Robot
fb4f878332 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ebcb03785306ba49911357140a9d8570e713634
 2021-11-16 06:55:33 +00:00
TreeHugger Robot
36ae9f88a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:45:14 +00:00
TreeHugger Robot
e74c9ae07b Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-16 06:45:14 +00:00
TreeHugger Robot
4b53a4dd18 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-11-16 06:28:57 +00:00
Bill Yi
1448652f01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1555278e4eeaa52f305cdfd290fffcc99f4bb0f7
 2021-11-15 17:14:05 +00:00
Bill Yi
b9dbf91cc7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I70122c3010dc24d428cba88efb50b95275ee635a
 2021-11-10 18:47:20 +00:00
Bill Yi
a15f438522 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e 
Blank merge reason: commit message contains skip directive

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

Change-Id: I49eae3fefb6edc31e9b4a6361f277415eb4be878
 2021-11-10 18:36:04 +00:00
Bill Yi
b546c8aa3e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6739a3e0bbf088d750f5b1e52e5dd0f82bcf2be4
 2021-11-10 18:35:55 +00:00
Bill Yi
7e4d7648c9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I56055f19140b6bf7353f03b9808bbaf9ee3d10cf
 2021-11-10 18:30:54 +00:00
Bill Yi
04a9c6743e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I11bbc23955bb9fbd22dc2b3c4b5e01d51016c03b
 2021-11-10 18:27:04 +00:00
TreeHugger Robot
1c0bc276d8 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5efa2c421e02c8ae02bf19959f7a6127a6544bf0
 2021-11-09 08:52:17 +00:00
Hugh Chen
21cae1ffef [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67d164c2366b8492483682fd8f2201b74e0d43b8
 2021-11-09 08:52:16 +00:00
TreeHugger Robot
aca50be7d8 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f37658ee9c666e7b9798a734984230fa5fabf60
 2021-11-09 08:52:09 +00:00
Hugh Chen
1ad17158e1 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I408f048b1b17bea93f17cc33881c93d84acfd1ce
 2021-11-09 08:52:08 +00:00