Matías Hernández
46cdbed02e
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 0166bcc776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I91e72e84a4f239501953dbcf048f6043ea588ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:55:36 +00:00
Matías Hernández
0166bcc776
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I33040a000b1bc4e90b9e76c8e751bca2e09959d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:10:59 +00:00
Matías Hernández
0aa241be99
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:42:07 +00:00
Matías Hernández
50df60c93c
Don't hide approved NLSes in Settings am: ff255c6eda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:57:15 +00:00
Bill Yi
5e54379b8a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib262798ed73568339f2f5ac4e6cf40c1ab08f7c6
2023-06-12 13:28:15 -07:00
Matías Hernández
ff255c6eda
Don't hide approved NLSes in Settings
...
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.
Bug: 282932362
Test: manual
Change-Id: I4c9faea68e6d16b1a4ec7f472b5433cac1704c06
2023-06-06 19:07:58 +02:00
Treehugger Robot
f996cfceba
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-06-06 14:19:16 +00:00
Bill Yi
1b5824f6c9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia19dd8b4893160c436ed2a4b548b1c0a18ac5642
2023-06-04 18:44:23 -07:00
Bill Yi
506e105fdb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I61f515a3a5cd45df467240ef7cc38e098fd184ae
2023-06-04 18:39:29 -07:00
TreeHugger Robot
34ee142399
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-31 16:55:11 +00:00
Bill Yi
adefb73221
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I783506712d5b1c5887f9d955cbd838f44cde34b7
2023-05-29 00:59:12 -07:00
Bill Yi
3f97401447
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7a3f1cb5958809c0b34692b456170a921df0a7dc
2023-05-29 00:54:17 -07:00
Treehugger Robot
5fa6d3b7dc
Merge "Restrict Printing Settings" into tm-qpr-dev
2023-05-26 16:28:03 +00:00
Bill Yi
27d96e91e7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-23 23:01:47 +00:00
Bill Yi
3c2e4800c6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib1c6d99be35bbe92e24a2060046717bc26397934
2023-05-22 16:52:00 -07:00
Bill Yi
0229581abb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I001817a76ffa02590155c033d1f7fb87c79832cb
2023-05-22 16:46:36 -07:00
Weng Su
4c1dd91695
Restrict Printing Settings
...
- Don't show Printing Settings if the user is restricted by UserManager.DISALLOW_PRINTING
Bug: 269122009
Test: manual test
atest -c PrintSettingsFragmentTest
Change-Id: I15db778ebc4de3c8a76505043fab1ee02db3f290
2023-05-18 18:40:48 +08:00
Treehugger Robot
19935236b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-17 23:08:03 +00:00
Bill Yi
52b4eb39a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I602961ddf48ee427f7e7ae975fbe721fae03c744
2023-05-16 21:41:43 -07:00
Bill Yi
fe5e3598df
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I084ff09f7787723e81b5dabff4c5a0660c7da1ad
2023-05-16 21:35:21 -07:00
Bill Yi
efe3ce5660
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-12 22:29:00 +00:00
Bill Yi
13c4c2accb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4df0fe515c3acf2eddfeabef5b6088f437ad1b8d
2023-05-09 19:15:29 -07:00
Bill Yi
7a494fc7c5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I041ed592d479aeb038cb23092fa85b14d71df157
2023-05-09 19:08:51 -07:00
Treehugger Robot
11ba47eebb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-04 04:36:13 +00:00
Lin Yuan
9e84690fb7
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
am: ae2dd3d513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I0521342515969ccb2d46b9e9159d29b998713cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:41:25 +00:00
Lin Yuan
ae2dd3d513
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
am: d8321f5df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I3a9a9ef33b0a7fd985861a85d63d5078d3fe5aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:53:38 +00:00
Lin Yuan
d8321f5df7
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
am: f86d507407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I23d09d7f0c376493ba30ac38577d196b69d46335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:02:52 +00:00
Lin Yuan
f86d507407
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I7884ced3a0a1d29508127fbc263197c20f6ff0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:23:36 +00:00
Bill Yi
dc96a91fff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I03ad9b85b7b5eb9d96bd50e44d312d57b9d4ffac
2023-05-02 12:49:37 -07:00
Bill Yi
e23f6ea87c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If02b1ac12116337530648f57bf21e401e752dcdd
2023-05-02 12:45:14 -07:00
Bill Yi
547484f797
Import translations. DO NOT MERGE ANYWHERE
...
BUG:278022447
Auto-generated-cl: translation import
Change-Id: I746cb0e511ad3e9a19f2dfb0d152319e53c7a11f
2023-04-27 20:47:48 -07:00
Zaiyue Xue
6aba166376
Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev
2023-04-28 02:43:00 +00:00
Lin Yuan
062a9ca549
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Bug: 277333746
Bug: 277333781
Change-Id: I91aa143223d7d37751120aa9246bce4dc31a54a6
2023-04-25 19:24:13 +00:00
Lin Yuan
7591fff234
Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
...
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.
screenshot: http://shortn/_kkK3BMTSh1
Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
2023-04-25 19:23:53 +00:00
Treehugger Robot
33837c6766
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-25 16:17:03 +00:00
Bill Yi
ca18853bab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If34cd71ef08b67f4463d83cd1afd5361bae4b873
2023-04-21 17:17:53 -07:00
SongFerngWang
794fc58235
Replace the SlicePreference with Preference
...
The Settings' 2 panel did not support SlicePreference, since it
always open activity with NEW_TASK and it casues the settings can't
set new page at right side.
Bug: 270544054
Test: build pass. local test: the phone pair the buds with fastpair, and
then check the slice preferences.
atest BlockingPrefWithSliceControllerTest (pass)
Change-Id: I0e8abfd284492f04ab322a5bed13741fc6b25b34
2023-04-21 23:08:06 +08:00
Bill Yi
367bedb886
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-19 17:59:16 +00:00
Bill Yi
4ff10a38f4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1c1512d129c76bdf99c95f921b05177f361736a7
2023-04-17 21:33:14 -07:00
Bill Yi
26ca87ddff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie1f7a198b79b22f7e52cda13589a55549189524a
2023-04-17 21:20:25 -07:00
Zaiyue Xue
205d8249a7
String change to highlight calculation stopped at last even hour
...
Bug: 278022447
Fix: 278022447
Test: manual
Change-Id: Ia04ae7c7cb4c7ebdd40f4aa3df05b34d2ce66628
Merged-In: Ia08dea791bb72113719fd1316e8e9587a96eaef1
2023-04-17 14:58:48 +08:00
Treehugger Robot
a5a31037cc
Merge "Only admin users may change private DNS settings" into tm-qpr-dev
2023-04-14 14:53:48 +00:00
Bill Yi
c7550f62e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5cbdfde1f4c34ad1d233e79f9b1464679d12bf3d
2023-04-10 23:59:36 -07:00
Bill Yi
a568dc677b
Import translations. DO NOT MERGE ANYWHERE
...
BUG:271250248
Auto-generated-cl: translation import
Change-Id: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
2023-04-06 20:54:16 -07:00
Jason Chiu
f133736e6c
[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
am: 5d50556ce2
-s ours
...
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22505800
Change-Id: If85b58dac4614b53683b7718ea5e6ed3db2fdd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 18:00:33 +00:00
Bill Yi
aca33b33aa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-06 13:50:19 +00:00
Bill Yi
3cc4247a1a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-06 13:50:19 +00:00
TreeHugger Robot
cb00b2bd0c
Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev
2023-04-06 13:07:13 +00:00
Jason Chiu
5d50556ce2
[resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906
Bug: 277168213
Change-Id: I35125125776e350ae7fce5feac4a387868fac7af
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 10:21:27 +00:00