PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,772 Commits 1 Branch 0 Tags
623d966fac807200d34f0ac9516a8b25fa7d59cc
Commit Graph

83772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
TreeHugger Robot
ebd2e1f662 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-18 19:06:29 +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
b8b0bef8f9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iab997959a48aa05243e0d7029dc6a7262414a46d
 2021-11-18 10:59:55 +00:00
TreeHugger Robot
36ae9f88a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:45:14 +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
b546c8aa3e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6739a3e0bbf088d750f5b1e52e5dd0f82bcf2be4
 2021-11-10 18:35:55 +00:00
TreeHugger Robot
152ba179f4 [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 skip reason: subject contains skip directive

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

Change-Id: I374713caa6f72a15632eff3b43727c7ce6204cad
 2021-11-09 08:30:52 +00:00
Hugh Chen
835a9f0718 [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 skip reason: subject contains skip directive

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

Change-Id: I88b4ae3de30e76c8f3ca361d38d8f7a82cf54f39
 2021-11-09 08:30:51 +00:00
TreeHugger Robot
8257674c53 [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 skip reason: subject contains skip directive

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

Change-Id: Ifa40a720b8b194b5f09acaba0993f9ebafe21a8c
 2021-11-09 08:29:43 +00:00
Hugh Chen
b7c8a85e8d [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 skip reason: subject contains skip directive

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

Change-Id: I14979352bbfa62f9ee0d74e5cc648cc3bc269d05
 2021-11-09 08:29:41 +00:00
TreeHugger Robot
1bb96ff4ce [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 skip reason: subject contains skip directive

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

Change-Id: Ic253c7431c1c57677820d23d30a0ac3e1841f8f8
 2021-11-09 08:10:40 +00:00
Hugh Chen
53c90efd25 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -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: I7707b5c24a10c468362fd8a1a3d5a412e7c3c090
 2021-11-09 08:10:38 +00:00
TreeHugger Robot
f14d3ca0d8 [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 skip reason: subject contains skip directive

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

Change-Id: Id8a548cc6bc3f9ca394b68d4db4e1377a139ed56
 2021-11-09 08:08:15 +00:00
Hugh Chen
c403c2bd93 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -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: Ibcd3c269718ac5224e299f55c5e8331907c12078
 2021-11-09 08:08:14 +00:00
TreeHugger Robot
0de4048d64 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: e831e29cfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I150fd7e98450289f26c94716232a343290143721
 2021-11-09 07:59:30 +00:00
Hugh Chen
09258363f5 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: 56b95bd8c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bc5589c9157ee6fa8eb56c8daf310c0c7d89ba8
 2021-11-09 07:59:28 +00:00
TreeHugger Robot
f87658eb94 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: 9c1eb61f8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2705b029108440fe528a89fd4c95ab7e50ed23a
 2021-11-09 07:58:55 +00:00
TreeHugger Robot
c5447d70d3 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -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: I1c17a3818e117b9e714f2f71a6d1712a67759a41
 2021-11-09 07:46:02 +00:00
Hugh Chen
42d4ef99a5 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -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: I0978098ca0afbc0cc0b0f2910345e0acaaccc941
 2021-11-09 07:46:01 +00:00
TreeHugger Robot
52b37ccbdc [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: 9c5b980cbf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd6bee65ff55dd438b26bc5a11451e263cd41acf
 2021-11-09 07:24:58 +00:00
Hugh Chen
53060241be [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: f589c5825a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I514509ec73f09d26603ad0946bf73a4f671c3aeb
 2021-11-09 07:24:56 +00:00
TreeHugger Robot
2f349df564 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: f91da36d0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a4630d98fc9e270a52490ba5303e9e7d25c63d8
 2021-11-09 07:24:52 +00:00
TreeHugger Robot
c96d9867c5 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: Ic9f02f2c7b60b131194896fd841cc27aff23c686
 2021-11-09 07:24:47 +00:00
TreeHugger Robot
86e798c998 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I114793f7b2688fbde9f1f8fb27cef947f32d4c68
 2021-11-09 07:24:47 +00:00
Hugh Chen
d1ee2f41e8 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: If228864e833e512870a9d60ef457e4aa2c7820a9
 2021-11-09 07:24:45 +00:00
TreeHugger Robot
e831e29cfc Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: Icb21e0e55d7058723e1fe2d135f5451afe420605
 2021-11-09 07:05:03 +00:00
Hugh Chen
56b95bd8c0 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: Iac9af50eb7a8af18f84820b0180301a8583ea496
 2021-11-09 07:05:02 +00:00
TreeHugger Robot
9c1eb61f8e [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dcc4205517a623593162e841a9fc0d3ff2e2081
 2021-11-09 07:04:54 +00:00
TreeHugger Robot
9c5b980cbf Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I910c297d00b16fbe214b91d3c6bf4a5f68134fd6
 2021-11-09 07:02:43 +00:00
Hugh Chen
f589c5825a RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I8ac8df9c58b7011a08d98c0d1184944ecebc0893
 2021-11-09 07:02:42 +00:00
TreeHugger Robot
f91da36d0a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8cb3818015166cae1304315c880728e146d787f6
 2021-11-09 07:02:34 +00:00
TreeHugger Robot
7aa03c4821 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev 2021-11-09 06:59:11 +00:00
TreeHugger Robot
ad30e0abb6 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev 2021-11-09 06:59:03 +00:00
TreeHugger Robot
effa446a15 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev 2021-11-09 06:59:01 +00:00
TreeHugger Robot
d89fa348ed Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev 2021-11-09 06:58:49 +00:00
TreeHugger Robot
62e555932c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40232a1c9484299932210e03068257f38250bb9d
 2021-11-09 06:42:01 +00:00
TreeHugger Robot
7134e1ac35 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9987e661cfb85b5c9aa105105d2cc37fd7240903
 2021-11-09 06:15:20 +00:00
TreeHugger Robot
0e8d3e3c35 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4363a8652c623e915daf6439e477385710a30726
 2021-11-09 06:01:40 +00:00
TreeHugger Robot
5006367685 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev 2021-11-09 05:46:16 +00:00