Joshua McCloskey
909913ffc1
Added face unicorn strings am: 66211d15bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254
Change-Id: Ia1006b9a2e9dc4f2264cf0be47b7e087216c30aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 03:01:36 +00:00
SongFerngWang
5a4df243f0
Fix the NullPointException
...
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.
Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
2022-06-16 10:46:07 +08:00
Joshua McCloskey
66211d15bf
Added face unicorn strings
...
Test: Manual.
Fixes: 234663447
Change-Id: I57f0b52f645655647db38c58da2c158e63221c18
2022-06-15 21:07:16 +00:00
TreeHugger Robot
4a83e4212f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I6d43c235439a1cfad2344b89a109cd268849e896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:47:38 +00:00
Bill Yi
b989753b8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652
Change-Id: I12eeeef97b1931268f958e972f5be4ae98aa1286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:47:17 +00:00
Weng Su
1c25ce1937
Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev
2022-06-15 16:40:03 +00:00
TreeHugger Robot
dc3e340774
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-15 16:39:17 +00:00
Weng Su
f53f3e6e41
Restrict AddAppNetworksActivity for guest user
...
- Don't show AddAppNetworksActivity if the user is a guest.
Bug: 224772678
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest
Change-Id: I17571905f1c4a38db884e6d0523b7f8d668df607
2022-06-16 00:33:07 +08:00
TreeHugger Robot
cc0754b416
Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev
2022-06-15 16:18:40 +00:00
Jason Parks
3f55cd8929
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I0fafd91b14712a6bf9a118a2512973af1fb3d502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:42:02 +00:00
Jason Parks
3b6fe0813b
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I14d08a02a7b27ae4bf3e54c03f9c9d33c6104a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:14:53 +00:00
Jason Parks
73276b3c91
Merge "Use API to check for the superivion component." into tm-dev
2022-06-15 12:54:00 +00:00
TreeHugger Robot
529d67575d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: 5e4e0ee275
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: If296374235c6a3bfd6c73d2aa17467bea2608aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:21:25 +00:00
Bill Yi
09a7a53b04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 588d339d4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I6d6fe6513e6bf4091223d688f65348eddf70fdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:21:11 +00:00
TreeHugger Robot
5e4e0ee275
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: Ie4e1f5d253455ff3aea0a1b7878d2d79f43b1b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:16:33 +00:00
Bill Yi
588d339d4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I4f573d48d312206e50d030707f37a2a3953e9332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:16:20 +00:00
Amy Hsu
7e0b5c8c07
Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014
Change-Id: Ie88b0db9abc05339c9c77aa87350bcd3acf963e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:11:31 +00:00
Amy Hsu
be6fef3095
Merge "Restore the density when it has been overridden" into tm-d1-dev
2022-06-15 05:31:43 +00:00
TreeHugger Robot
50a74572fc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-15 05:25:34 +00:00
Bill Yi
2609fb2ccb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib54c2f3b145ff0c53809022e7baf4083d5ba1ca8
2022-06-14 21:21:00 -07:00
TreeHugger Robot
2fc7ce6a84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: Iecbe81c431b6cc04486495437b6371eaded44fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:22:35 +00:00
Bill Yi
b70ab5079e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: I1312de156a5f5507c3a041c1c1df699949cf55e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:22:16 +00:00
TreeHugger Robot
838099408b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-15 01:08:49 +00:00
Jason Parks
4a9c108b28
Use API to check for the superivion component.
...
Bug: 219025233
Test: manual
Change-Id: Icd2593a67ae0297340991a5375b18e2f933facb1
2022-06-14 17:16:07 +00:00
TreeHugger Robot
23eecdc87d
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
am: 2357b8ab44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: I7ff555eb9816ccb2031ed4357b82e9ac7979c46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 03:45:22 +00:00
TreeHugger Robot
2357b8ab44
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: Ie245dbeecf179a41e19699c5fd8de5717da238d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 03:26:54 +00:00
TreeHugger Robot
c45731efdb
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev
2022-06-14 03:01:18 +00:00
Jason Chiu
27c6b55ac5
Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link
...
If an app starts a Settings deep link with FLAG_ACTIVITY_NEW_DOCUMENT,
FLAG_ACIVITY_NEW_TASK is auto-appended by frameworks which causes a
SecurityException on the 2-pane design because starting a new task on
the right pane is not allowed.
Deep links in the 2-pane design will clear the top activities, which has
the same UX behavior of setting FLAG_ACTIVITY_NEW_DOCUMENT, so we remove
the flag in this case.
Fix: 233917580
Test: start account page via Assistant
Change-Id: Idcbeb96e441592d48686f18f3433864f2c14832a
2022-06-14 02:45:49 +00:00
Bill Yi
f84049c4e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iae080c4ad83f0090a8a4a6bcd2b2438564c563ec
2022-06-13 17:00:54 -07:00
Bill Yi
f68acfb73e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18a9ac4db3be35e4b643a213c8635b1b22a2bec8
2022-06-13 16:26:38 -07:00
TreeHugger Robot
9d882fbb81
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd
am: a0ebaf2b57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: Id5aca9149c81f6c29164f832e438c210494ee58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:58:44 +00:00
TreeHugger Robot
a0ebaf2b57
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: I499228ea7bc6dd7971447040dac399dea5cb45d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:31:22 +00:00
TreeHugger Robot
e058aae3cd
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev
2022-06-13 18:11:22 +00:00
Weng Su
a8ccc3456c
Restrict guest user to configure WiFi by QR code
...
- Don't show WifiDppConfiguratorActivity if the user is a guest.
Bug: 224772890
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppConfiguratorActivityTest
Change-Id: I160761edfe2893475676421ba2b59205da8d0224
2022-06-14 01:20:54 +08:00
TreeHugger Robot
45f454ec8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac
-s ours am: e5a507e23c
-s ours am: 7723c37234
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I28084562f39320be146fd8332b633aa375f43344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:41 +00:00
Bill Yi
6693d73ef5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b
-s ours am: 04d01b2661
-s ours am: 85d2a6c7b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I7e2beaed53830562a4196d947b62afc5e2782804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:25 +00:00
Bill Yi
b8aa62dbea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75
-s ours am: 362f3f6b6a
-s ours am: d9fbc3319c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I013c6fb27657600426b7303ce20b460914bc65b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:09 +00:00
Bill Yi
eb43205dbf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d
-s ours am: e8c0397e8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I6d0d1106993015ada09e1f17d6eb90039ece8b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:18:09 +00:00
Bill Yi
9af911315b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858730
Change-Id: I2bc176b77fa12e7d2ee618c6aba5ced75fafb5e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:15:43 +00:00
TreeHugger Robot
7723c37234
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac
-s ours am: e5a507e23c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I73937e9aef737e9d10eb725abe15efbe552c93f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:15:12 +00:00
Bill Yi
85d2a6c7b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b
-s ours am: 04d01b2661
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ic36f1744655068cce7bf729f26b8cba914bf2639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:14:58 +00:00
Bill Yi
d9fbc3319c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75
-s ours am: 362f3f6b6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I054b90b7fde831108c85e053e8641ec6b3612561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:14:41 +00:00
TreeHugger Robot
e5a507e23c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I441cc35d147566377eb06f328905a44ea6649954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:05:07 +00:00
Bill Yi
04d01b2661
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I76566346fa6990130c77e736031ecbf4e40b2c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:55 +00:00
Bill Yi
362f3f6b6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: Ib0ff724718fbe1ab699152f1a6744015645d7051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:36 +00:00
Bill Yi
e8c0397e8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I91096d91de1b1556306446a40455d093faec87b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:55:43 +00:00
TreeHugger Robot
2614629a50
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-06-13 16:44:24 +00:00
TreeHugger Robot
3d8b8de2be
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-06-13 16:40:31 +00:00
TreeHugger Robot
8122edc9ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-13 16:40:03 +00:00
Bonian Chen
03da62810c
[Settings] Avoid from close dialog when touch outside.
...
Roaming confirmation dialog might get closed when touch outside,
which is easily been triggered when having a large screen.
Solution: avoid from close dialog when touch outside of dialog area.
Bug: 235183999
Test: local
Change-Id: Ic312d80e6f04cb8f323ebc713eef4e15257de358
2022-06-13 20:55:32 +08:00