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
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
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
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
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
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
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
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
Bill Yi
db40442194
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421
Change-Id: I663f52410d7d43346bad9fe62c66fa5245a6ccb2
2021-11-05 17:08:45 +00:00
Bill Yi
12eeadedcb
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev
2021-11-05 16:54:15 +00:00
Bill Yi
d18efb1358
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2
-s ours am: 8736277f07
-s ours am: 775e9c5605
-s ours am: b78ee724ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185416
Change-Id: I490f2611d4174b0db4ece4bc9cd12e18bdfc9490
2021-11-04 07:01:36 +00:00
Bill Yi
6510b1715b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921
-s ours am: 5f68234c40
-s ours am: e99626cbca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185415
Change-Id: I1f8d952588c3a51cd3f9bdf3b81d617f8fd28def
2021-11-04 07:01:32 +00:00
Bill Yi
b78ee724ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2
-s ours am: 8736277f07
-s ours am: 775e9c5605
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185416
Change-Id: I645d9a20f4e0ea7507d37ee532084fbdac7dd4da
2021-11-04 06:44:01 +00:00
Bill Yi
e99626cbca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921
-s ours am: 5f68234c40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185415
Change-Id: Ic8251b60cd836a7ffeeb01f3019052bc99df8857
2021-11-04 06:43:58 +00:00
Bill Yi
775e9c5605
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2
-s ours am: 8736277f07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185416
Change-Id: Ic2268876a1e75e76323939efdbdab1220714d8c9
2021-11-04 06:37:11 +00:00
Bill Yi
8736277f07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185416
Change-Id: Ifde1a3575cfe9250d965e658a384b3769a030a5e
2021-11-04 06:31:56 +00:00
Bill Yi
5f68234c40
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185415
Change-Id: I8169ce55b91fbf5fee42b5fa6f0370ce4167eb37
2021-11-04 06:30:57 +00:00
Bill Yi
6cd48383a1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Merged-In: I5b0f9ac74627cc5ab75cc34e47a4292e6a9543b0
Change-Id: I64fda49900da659363eb4e792cf5b87a9c68202d
2021-11-04 02:24:54 +00:00
Bill Yi
64149823f2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I31603b51131a4bb4423bf9c6f2c3ac32ff08a9d3
2021-11-03 23:44:20 +00:00
Bill Yi
8a69cc3921
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I31603b51131a4bb4423bf9c6f2c3ac32ff08a9d3
2021-11-03 16:41:21 -07:00
Bill Yi
cb42730091
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
2021-11-03 22:25:19 +00:00
Yanting Yang
0e77ce80cb
Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4
am: 204f82d6c4
am: ac38fc7f32
am: 70b7658b74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569
Change-Id: I7abb2a4fbc773e78ba750883d44d5a617d764b2c
2021-11-03 20:15:36 +00:00
Yanting Yang
41e6a117a0
Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0
am: 337e182e0f
am: d67d983bd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568
Change-Id: I30ee8b6c4bd8535ef387cdcebb1d2224ca19a519
2021-11-03 20:15:31 +00:00
Yanting Yang
70b7658b74
Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4
am: 204f82d6c4
am: ac38fc7f32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569
Change-Id: I866f203650beccf90f77ced375bf3b41adc358f1
2021-11-03 20:01:07 +00:00
Yanting Yang
d67d983bd4
Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0
am: 337e182e0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568
Change-Id: I61c1b3cfb9a33fb80d93740f2e18ca46d3cbe811
2021-11-03 20:01:02 +00:00
Yanting Yang
ac38fc7f32
Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4
am: 204f82d6c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569
Change-Id: Ifdb5eb3c216bab863cdf3e641bf1a050c0e5ee74
2021-11-03 19:55:05 +00:00
Yanting Yang
204f82d6c4
Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569
Change-Id: I78d007987cc32a6673e1e843aa2b54d96c9e145c
2021-11-03 19:49:30 +00:00
Yanting Yang
337e182e0f
Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568
Change-Id: I73a42c76e9bc6c5b3c6aff1da4bc364925f98ff0
2021-11-03 19:48:27 +00:00
Yanting Yang
b0ce558a3e
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: Ia563798d9e45ec18a445b3515a6cd5f41957cf1d
2021-11-03 19:48:20 +00:00
Hugh Chen
f8cd68c6e2
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
...
- Only enable device can be discoverable when the user launch
"Connected Devices settings" through settings and systemui
Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821
)
2021-11-01 07:44:18 +00:00
Hugh Chen
d4e0ed2284
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
...
- Only enable device can be discoverable when the user launch
"Connected Devices settings" through settings and systemui
Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821
)
2021-11-01 07:37:33 +00:00
Hugh Chen
528d40e4d1
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
...
- Only enable device can be discoverable when the user launch
"Connected Devices settings" through settings and systemui
Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821
)
2021-11-01 07:01:34 +00:00
Hugh Chen
249f9e2696
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
...
- Only enable device can be discoverable when the user launch
"Connected Devices settings" through settings and systemui
Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821
)
2021-11-01 07:00:33 +00:00
Yanting Yang
7fd0ece6f4
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620
)
2021-10-25 05:54:12 +00:00
Yanting Yang
7d22136fb0
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620
)
2021-10-25 05:53:42 +00:00
Yanting Yang
6024ea553a
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620
)
2021-10-25 05:53:10 +00:00
Yanting Yang
881d7ec5ab
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620
)
2021-10-25 05:52:35 +00:00
TreeHugger Robot
f40e2700d3
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I991b5ba56c85c943009cf15952ed2d02241ba96a
2021-10-07 00:44:18 +00:00