Matías Hernández
897c8321a6
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours am: d185f3aebf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I8136b7f814d25c104f28ebf4714b0f814bdc9d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:50:49 +00:00
Matías Hernández
d185f3aebf
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I9944714c4b97d46b20f78ecd02b875aa21672ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:11:01 +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
2b1faa0aea
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: I715da9406bd9d3fe88ff7b5353db1780109880e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:09:53 +00:00
Matías Hernández
b971690a4e
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I26937792ea087b7b2516e71525fa12602d312696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 14:26:51 +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
78a4048eac
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Ifee74173a3e0f410d4d76f06149b496a9ae62241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:40:43 +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
Matías Hernández
d7608c84b4
DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I11ee7cc3bfd291f32e602eff65ce93ba57bcc407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:52:41 +00:00
Treehugger Robot
3494d09de4
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev
2023-06-14 12:00:21 +00:00
Weng Su
6a20a8c5df
Fix Hotspot & tethering settings crash
...
- Cannot omit addPreferencesFromResource even if UI is restricted
Bug: 287172382
Test: manual test
atest -c WifiTetherSettingsTest
Change-Id: I1f5c0215a635fddefe7eaa20c1d765634b505121
2023-06-14 18:59:30 +08:00
tom hsu
bcd6bf1f8f
[Settings] Fix roboletric test fail and add new test case.
...
Bug: 287177689
Test: atest passed
Change-Id: If927f4e4bf7ee9702e865e77f350164a93729940
2023-06-14 10:13:55 +00:00
TreeHugger Robot
90cf6e8a3c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-14 05:24:47 +00:00
TreeHugger Robot
9d38813d4b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-14 05:24:47 +00:00
TreeHugger Robot
c937ce7a22
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-14 05:24:47 +00:00
Treehugger Robot
2f6b7bea9b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Idb12eb052e8ee0110647f55a86e0f365bc98017d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:14:11 +00:00
Bill Yi
39dbfc2e78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I6a26cc2c6943e2791a0d632b831cfe086067bdbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:14:08 +00:00
tom hsu
0a4458a9d1
[Settings] Imporve MMS message UI state update
...
- When activity entered from outside, the MMS message is not udpated.
Therefore, add a update behavior to onStart()
Bug: 281566495#5
Test: Manual test passed
Test: atest passed.
Change-Id: I3e5994ad0dbcdd1b78ae3e10e3cb564ce210e93e
2023-06-14 12:28:59 +08:00
Treehugger Robot
ee8cd42af0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Ib395e7d7df3c13dd700f0345e26b4304a78d6bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:26:39 +00:00
Bill Yi
4368d3a79a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I3cf6e2db154acc9d2b64a47a9fd1a43e70e10063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:26:23 +00:00
Chaohui Wang
eb4fea1a36
Call onViewCreated in DashboardFragment
...
To let fragment's view lifecycle owner passed in to controllers.
For UI usage, view lifecycle owner is the best choice, controller could
use this lifecycle owner to observe events and do UI related works.
Usage DataSaverController as first example.
Bug: 287005021
Test: Manually for DataSaverController
Change-Id: Id965ea3a24d61f4d0ec6735632944f41f72ba06a
2023-06-14 12:22:12 +08:00
Treehugger Robot
a7bcd85abc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I9265c468e88f95ec151313dc3aa0da59524fea74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:45:29 +00:00
Bill Yi
ee15b19128
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I29d3fab9f64bcf32fecb40fd58ba9185d2745f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:45:25 +00:00
Treehugger Robot
3ea3bb83ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ib907d72110fd8de7e50739dda333d3259f8e9c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:45:18 +00:00
Bill Yi
0138ef4a5e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ibc41e61f678505434904b294eac1404b1eeaabb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:44:57 +00:00
Treehugger Robot
41bd0f8ae1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I8d1606d1e75be63eb1c242d059884d9245644843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:44:38 +00:00
Bill Yi
bd6c412717
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I2d75504f6080be8f1d31121e5d47541024b95f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:44:20 +00:00
Zaiyue Xue
8cbeaf6a74
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Iaff731be3b366c49eea5032d191218dd7abcdaab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:41 +00:00
Zaiyue Xue
d593cb5284
[automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I51cf1905b8ae5b97b24facedf343375c983f7b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:39 +00:00
Treehugger Robot
57522f0fcc
Merge "Shutdown secondary SAP automatically" into udc-d1-dev
2023-06-14 03:35:18 +00:00
Treehugger Robot
b8ddf4126c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-06-14 03:33:21 +00:00
Treehugger Robot
a505517090
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Treehugger Robot
c706f8544d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Treehugger Robot
958690e3a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Zaiyue Xue
8c25fe4c60
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev
2023-06-14 03:01:25 +00:00
Weng Su
20fd4a46c8
Shutdown secondary SAP automatically
...
- If the "Extend compatibility" preference is not supported, then set to shutdown secondary SAP automatically within the "Turn off hotspot automatically" preference.
Bug: 285914977
Test: manual test
atest -c WifiTetherAutoOffPreferenceControllerTest
Change-Id: I405107a4782a6f023442d196d0fca27515aab00e
2023-06-14 05:51:43 +08:00
Wenhui Yang
d56f96aaba
Merge "Fix face model delete message" into udc-d1-dev
2023-06-13 20:43:42 +00:00
TreeHugger Robot
f2f899106d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
TreeHugger Robot
3b89844e7f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
TreeHugger Robot
6fd46cf3a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
Grace Cheng
f58714496a
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
Merged-In: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 19:23:04 +00:00
Grace Cheng
8ba960014c
Merge "Fix NPE in updateAddPreference" into udc-d1-dev
2023-06-13 19:22:55 +00:00
Wenhui Yang
08d11518a8
Fix face model delete message
...
Add new strings for face model deletion when fingerprint unlock is available.
Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
(cherry picked from commit 5e71aee4cd
)
2023-06-13 18:37:26 +00:00
Bill Yi
a8cf863944
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I1714b84269a401d01b495d3f49f66e02503cddd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:49 +00:00
Bill Yi
60f3e2d53d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Ic267c3e00a34a48e259821fff2849694b2133b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:28 +00:00
Bill Yi
c7d760438a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I31527b6935660fe76669f6d711beb978e55600b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:05 +00:00
Bill Yi
c52befa925
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Iab183d63901b1abd798cce19c452634518daca35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:03:19 +00:00
Grace Cheng
2365ad895a
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 16:52:51 +00:00
Treehugger Robot
e5ebbd4ef1
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-qpr-dev
2023-06-13 13:20:09 +00:00