Commit Graph

124975 Commits

Author SHA1 Message Date
Treehugger Robot
e2ee732578 [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: Ia4c331a763becd473d4fcb399e1d548c1fd1a334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 05:09:36 +00:00
Bill Yi
a49576b187 [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: I28779f4e321c73a8ddf81f0a9c0659359e5c9a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 05:09:32 +00:00
SongFerng Wang
286344d539 Merge "Remove the owner" 2023-06-14 05:01:51 +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
Treehugger Robot
b487b83d47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: a7bcd85abc -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: Ibadee4e2f33d336ba0485fb08ab3e1f048883ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:26:23 +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
Bill Yi
5f253d4f54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: ee15b19128 -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: I337d8a506f12eaa3f535e32d229377a18dd4ac9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:26:18 +00:00
Treehugger Robot
f883c87710 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 3ea3bb83ae -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: Idf24be0fe94d33aa31a1a15bf3b8fe8ef29f3b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:26:09 +00:00
Bill Yi
f77ec98dcb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 0138ef4a5e -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: I1d9f6787c56370e088272668cd9247475263c634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:46 +00:00
Treehugger Robot
fba5dceb82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 41bd0f8ae1 -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: I139e1ddd62ce2e7931183a74ff66b9d82aa6aa70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:25 +00:00
Bill Yi
79192cfe1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: bd6c412717 -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: I40b520b69d7b79a194074e2befcf56497674dc79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:04 +00:00
Zaiyue Xue
c27cd42a1f [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: 8cbeaf6a74 -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: Ifaee7670c5ff5a0b2f4ba43418381e56a076d412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:24:23 +00:00
Zaiyue Xue
7bfd068d24 [automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc -s ours am: d593cb5284 -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: I1887b1781d9f6232ee1403787175340a26142a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:24:20 +00:00
Treehugger Robot
f47dbe3bae Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I2b65e858794346e3231bb7fdb0a013a2d4934677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:24:10 +00:00
Treehugger Robot
10abf2f63a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: 7e88b1ed07 -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: I582b7c8daa30334e77e4f3d29bd1c6b33223bf40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:06:57 +00:00
Bill Yi
ef7c503634 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: d0d5c9d84c -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: I2f452ce55a6fad205b0b45335a59b60d64c09a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:06:53 +00:00
Treehugger Robot
a411c734bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 7930f72c4d -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: Idbe8cf0ba06661a66dd9dce9cc29068ab7e560f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:06:46 +00:00
Bill Yi
ad194b0927 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 7c2f3a4ba1 -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: Icfab197e4900a1d3ee7538fdb17c20c91be8bdf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:06:27 +00:00
Treehugger Robot
1dfa0e78df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 7d610e7f85 -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: I483c7df647a3a7fc3b129c482a8b5ab36727f29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:06:01 +00:00
Bill Yi
211d2eb69a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: 94f17b981a -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: Idae32d533f1de63ec852177471dbf4d35caacdcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:05:39 +00:00
Zaiyue Xue
7cf38b4f81 [automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 am: da62051efd -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: I4107e4de3286498e46ff35e7cc1b4ff91b341545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:04:55 +00: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
Treehugger Robot
7e88b1ed07 [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: Icd531ab1576b548a996d8f975d130eefb8a30360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:42:34 +00:00
Bill Yi
d0d5c9d84c [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: I87b24056f4a0d370634fe2ccc2237ea8045fddea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:42:25 +00:00
Treehugger Robot
7930f72c4d [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: I850098c780abe7d600eee7243df0f033d387f1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:42:18 +00:00
Bill Yi
7c2f3a4ba1 [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: Ibcd3f5106e8f6ca98315c92437b7a0179f1e66ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:41:55 +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
7d610e7f85 [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: I12b528b5410a96bf63d6fb645f12682e57e40b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:41:36 +00:00
Bill Yi
94f17b981a [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: I29ed00f4ef95520f1ebbe6ecdadf9eaa6d1432c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:41:19 +00:00
Zaiyue Xue
da62051efd Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963

Change-Id: Ie9e6621a39e30b5ba000e2bf6516719eea2a8fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:39:42 +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
e839945290 Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227

Change-Id: I147cb8b08941e5b56836c2d95456b605a2ed55f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 21:11:21 +00:00
Wenhui Yang
d56f96aaba Merge "Fix face model delete message" into udc-d1-dev 2023-06-13 20:43:42 +00:00
Grace Cheng
f0614ef722 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: I6332c141e3bb13b49bbabfcfebc3e91b8a5faf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 20:01:00 +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
Bill Yi
25683d53c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: 32b73cd4ea -s ours am: fec819220b -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: I42f065234404c9ef6a5379172eb3be8ac5f51d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 19:00:10 +00:00