Bill Yi
88b65eb954
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd
-s ours am: 3a9e2e401d
-s ours am: 54e98aa86e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I5b73b222f3368bf0642e8cdbc4efac6ed5ead4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:40:47 +00:00
Treehugger Robot
878dd9c8be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847
-s ours am: 41f417f87b
-s ours am: e92ac63e41
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: I6d21e4c77d06e6ac91aaceb0263262d083365ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:40:30 +00:00
Bill Yi
014ac990db
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9
-s ours am: fa8111eca1
-s ours am: 976ce75e87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: I325c769e7e83204b7959ca273a376b9de84bd27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:40:08 +00:00
Treehugger Robot
98ae913b64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a
-s ours am: 891c3ab05a
-s ours am: 1539b81ad4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I042308af9beba927ec6beb388485a9e69e906b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:04:42 +00:00
Bill Yi
7b80a39262
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours am: 14e15aaaa1
-s ours am: deec7d5a91
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I7900fdf036a750a0bb3ddb1c16a54d2a115da26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:04:27 +00:00
Bill Yi
54e98aa86e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd
-s ours am: 3a9e2e401d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I61f1583cdf06f489a89b110324f4d932238daa3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:58 +00:00
Treehugger Robot
e92ac63e41
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847
-s ours am: 41f417f87b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: I9c8f91fd8dd93cb1aeeb43d9728e55500da6e477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:41 +00:00
Bill Yi
976ce75e87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9
-s ours am: fa8111eca1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Iecd6456a5d1ffb4233abd2e53951bd4ee129c695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:28 +00:00
Treehugger Robot
1539b81ad4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a
-s ours am: 891c3ab05a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: Ibab1bf0a44759ae952722c2e95ade28d4d5ec93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:20:39 +00:00
Bill Yi
deec7d5a91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours am: 14e15aaaa1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: Ia8737c4f76c3ee0cdcf19b27e5f47e9f444c6916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:20:34 +00:00
Bill Yi
3a9e2e401d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: Idd2dd91b94e3dd1e59030db9bdc5f176097c8f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:49:01 +00:00
Treehugger Robot
41f417f87b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Ie0a7bfc3f350cb049e821416ec1f80ace595c8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:48:46 +00:00
Bill Yi
fa8111eca1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Ie432f5295ba262e7caf41fcc33da65d77e9a7395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:48:12 +00:00
Treehugger Robot
891c3ab05a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I81ea24c30ed1c174c965e8fde4b3da633eb802e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:24:56 +00:00
Bill Yi
14e15aaaa1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I93b034a8d56b908a412475771db25f4bf81dd2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:24:40 +00:00
Treehugger Robot
db2fea9847
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-04 17:53:51 +00:00
Treehugger Robot
e1c63ece9a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-04 17:51:55 +00:00
Bill Yi
1eee9788bd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I956252050d37d066f5b03c78321b60b4582e8307
2022-12-03 11:42:11 -08:00
Bill Yi
77827ac6f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8d5d5c19dd13d77dc849aaba050134b5fe4415a
2022-12-03 11:40:56 -08:00
Bill Yi
8a702ea7b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0775c4d7fba47cd1cf4259bf7b1dcb58b79a1eb9
2022-12-03 11:38:04 -08:00
Chaohui Wang
fb2b9f78dd
Merge "Clean up some UnusedResources detected by lint 8"
2022-12-03 07:11:43 +00:00
Grace Cheng
1db259c72e
[automerger skipped] Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af2896195e
am: b7eef9c024
-s ours
...
am skip reason: Merged-In I259669a09f5535f3a776793659e5bc6bdb90a44c with SHA-1 9d6a869ebe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I6a19e890e397e7665c1c446c5b4cd7eb0995eb81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:46:36 +00:00
Grace Cheng
bfa95b98c9
[automerger skipped] Removes duplicate SFPS string and updates references am: 0d74f4b755
am: ebda524556
-s ours
...
am skip reason: Merged-In I259669a09f5535f3a776793659e5bc6bdb90a44c with SHA-1 9d6a869ebe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I03d217f3497a26cfe2d14ba5de4bace0a964ef32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:46:33 +00:00
Grace Cheng
b7eef9c024
Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af2896195e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I97b0ec97c73a85e28f3bb4eaa05d59441188a404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:10:58 +00:00
Grace Cheng
ebda524556
Removes duplicate SFPS string and updates references am: 0d74f4b755
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: Ifb08c7bdaf0871228620d731c72943ea91272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:10:47 +00:00
Grace Cheng
af2896195e
Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev
2022-12-03 05:37:34 +00:00
Bill Yi
af6c532d9a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Bill Yi
ba52774bcb
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Bill Yi
8ece0258d9
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Grace Cheng
0d74f4b755
Removes duplicate SFPS string and updates references
...
Removes duplicate security_settings_fingerprint_v2_home_screen_text string and replaces references with security_settings_fingerprint_enroll_finish_v2_message
Test: Open fingerprint settings on SFPS device where fingerprints are enrolled, observe correct string
Fixes: 259316600
Change-Id: I259669a09f5535f3a776793659e5bc6bdb90a44c
Merged-In: I259669a09f5535f3a776793659e5bc6bdb90a44c
DO NOT MERGE
2022-12-02 23:50:37 +00:00
Dmitry Dementyev
da9c2c2757
Merge "Show account name as a single line string." into tm-qpr-dev am: 71dd4b23e8
am: 96999068e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20556506
Change-Id: I6f12ffcadb096c67f4fe94b39dec9addf63775e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 20:45:57 +00:00
Dmitry Dementyev
96999068e9
Merge "Show account name as a single line string." into tm-qpr-dev am: 71dd4b23e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20556506
Change-Id: Ifcc84304cf3d8a69069792a9d1ace64187f125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 20:05:16 +00:00
Dmitry Dementyev
71dd4b23e8
Merge "Show account name as a single line string." into tm-qpr-dev
2022-12-02 19:30:59 +00:00
TreeHugger Robot
35a3004491
Merge "Add AlarmsAndRemindersAppListProvider to SpecialAppAccess"
2022-12-02 09:08:07 +00:00
Tom Hsu
dca164e800
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
am: 916110007d
am: 9ad53e4e89
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: Ic915dba7e9405bb541a07326b404de5308e3ea9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 08:51:07 +00:00
Tom Hsu
9ad53e4e89
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
am: 916110007d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: I2d1c10ec2cac55485987ac2f5daf38c001800b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 08:12:47 +00:00
Tom Hsu
916110007d
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: I4864b0cecaae1daebfd05a7b4f8d21adb23c31b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 07:42:10 +00:00
Tom Hsu
3b9cb9a7d9
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails"
2022-12-02 07:16:28 +00:00
Chaohui Wang
a45ecb8034
Clean up some UnusedResources detected by lint 8
...
Bug: 234570979
Test: Make Settings
Change-Id: Iaf044fdc4cfcf1eab172f0735c5c7f0330a46107
2022-12-02 14:59:44 +08:00
Chaohui Wang
a3647a7332
Add AlarmsAndRemindersAppListProvider to SpecialAppAccess
...
Bug: 235727273
Test: Manually with Settings
Change-Id: I122033451826df95eadafa75953f1bcda516a9c8
2022-12-02 14:54:50 +08:00
TreeHugger Robot
2eb121ce3f
Merge "Revert "Move the auto data switch preference into DDS sim""
2022-12-02 06:41:39 +00:00
TreeHugger Robot
230c71301a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 86efc1e18e
-s ours am: ccba0e07ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20596334
Change-Id: I74ddab9f2d9da665d6733de476825df64e793e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:35:11 +00:00
Bill Yi
0e2bf342e6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e80f3b385
-s ours am: ba6987b817
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20596334
Change-Id: Ibbadff4801149d35425b0e04845368192362c4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:34:59 +00:00
TreeHugger Robot
bd2c03890e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 42468bf0c0
-s ours am: 4b83349d05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20594784
Change-Id: I0bc059edde7bf72a38e8c4e44a7bd018110d6b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:34:40 +00:00
Bill Yi
d4c0f0a01b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b52c4b62c
-s ours am: c0b92c74d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20594784
Change-Id: I4576314d0b231cfd203b8915ae6b10401b1a7d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:34:20 +00:00
Wesley Wang
f3aed71e2f
[automerger skipped] Merge "Fix LoaderCallback.onLoadFinished uncalled issue" into tm-qpr-dev am: 1f139628b3
am: ada410afbe
-s ours
...
am skip reason: Merged-In I41a041d5878f9930db44775408380d0d4588faba with SHA-1 41ce87729e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516821
Change-Id: I8b1f31116bf12742c74041d2855615ce18e36075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:28:06 +00:00
TreeHugger Robot
4e1c8feb39
[automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced
-s ours am: 06b7aa4774
-s ours am: 04837d7a5e
-s ours am: de5e399778
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20581119
Change-Id: Ie1c9150fd6b0350fc80ab5d1723baa23fc93b9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:53 +00:00
Arc Wang
ce8f6083a1
[automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4
-s ours am: f35358a5ec
-s ours am: dd065b488c
-s ours am: 48166d608d
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20581119
Change-Id: Ice430cfa746025931421601d5855163db7bd900d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:49 +00:00
Arc Wang
f5ba61cb8c
[automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev am: 252bf820ee
-s ours am: fb7ff5c75a
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533026
Change-Id: Iab5eaa1e94b58aadc38244d926709ad3080dd24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:37 +00:00
Arc Wang
aa6476ad6f
[automerger skipped] Settings 2-pane deep link vulnerabilities am: 23412ad94a
-s ours am: 97fdb8a7a2
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533026
Change-Id: Ifaace91bc41f214098a56d65df964e54cfbbbc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:34 +00:00