Commit Graph

123622 Commits

Author SHA1 Message Date
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
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
Tetiana Meronyk
38b627b69c Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev 2023-06-13 09:36:23 +00:00
tom hsu
5c5a39adbe [Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882

Change-Id: Id741c5c75d5982da0ceae3ceef767858e2bcf462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 08:58:46 +00:00
Bill Yi
b6f09ef6f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3c435ac955d620aab019dd17088118e814dbec4e
2023-06-13 01:10:34 -07:00
Bill Yi
c1407e61f1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If3945f0ac9f4368b2cd50e66554accadc49e31ed
2023-06-13 01:00:54 -07:00
Bill Yi
8430cda6d3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I85702c2b4ddd2485683d5bb16bed43244e70022b
2023-06-13 00:56:19 -07:00
tom hsu
5216eeaaec [Settings] Fix MMS message UI is no consistency between UI and real state.
Bug: 285253872
Bug: 281566495
Test: Manual test passed.
Change-Id: I805490fd5c4417e88c38a047f99ef626c16f600a
2023-06-13 06:01:25 +00:00
Rhed Jao
cc1fe61339 Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev 2023-06-13 02:14:22 +00:00
Wenhui Yang
bfa2feb316 Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev 2023-06-13 01:02:42 +00:00
Wenhui Yang
14b115177c Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev 2023-06-13 01:02:08 +00:00
Treehugger Robot
fcea84c01a Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857 am: 1d279af211
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I5c7817afeac87f5f4854e5f4433121ba7ddfae92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:14:59 +00:00
Taran Singh
7e1d083e05 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: 4a5e1a4d3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I6c689260a1ce82baee992262c0ea32512d758c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:14:57 +00:00
Bill Yi
db8e6f51ff Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icff837fb7d2cb9bdde78747c6449b7602d657ddf
2023-06-12 13:37:36 -07:00
Bill Yi
58628e0170 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2daf643f4601e64d83742cfbf1d895e8b272bc98
2023-06-12 13:36:39 -07:00
Bill Yi
b47c44e4dd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I28c26bf0d71aab0563698fb120e7a2f3ff808f53
2023-06-12 13:31:49 -07:00
Bill Yi
23819646e2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7203e546696a4dde1d8c8f7b32e6a432f7a5bcb8
2023-06-12 13:29:45 -07:00
Treehugger Robot
1d279af211 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Ie301b476186f5861c01ca69cfedef5e6e9455a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:29:18 +00:00
Taran Singh
4a5e1a4d3f DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Idaf9439f1efd96653858177bdea474ad4b85190f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:29:16 +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
Bill Yi
948e9dd4e3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I426130e9ad9afe161ca3a02576d2814c2d35364c
2023-06-12 13:27:10 -07:00
Bill Yi
b86bd3cfe3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I03150507e9d454e50da97bbf70752f7fc2736975
2023-06-12 13:26:17 -07:00