Bill Yi
c381393d0d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38
-s ours am: 5adc7a2d96
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525703
Change-Id: I18cab527f3e2bd4ff7a2b70734f32ed5e8838641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:58:37 +00:00
Bill Yi
a91a059024
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c
-s ours am: b5515b130c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525703
Change-Id: I11099e537443aae6f88d1d795c77dfc82a7cfb1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:58:12 +00:00
Bill Yi
7254a9d7cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529049
Change-Id: Id508357e9338d133b03b8157e5305af9c4ef2141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:25:23 +00:00
Bill Yi
6d580ef24a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529049
Change-Id: Idbe7c4b6206e0f49230b5f5e383d943b539946ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:25:05 +00:00
Bill Yi
5adc7a2d96
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525703
Change-Id: I732e771289ed9518f559d04d0e973e6d1f38e33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:24:37 +00:00
Bill Yi
b5515b130c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525703
Change-Id: I79df28dda9b0cec7693a4fd5a3f7221ee627ad08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:24:14 +00:00
Bill Yi
fd2c004cd7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122
-s ours am: 920d199532
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529049
Change-Id: I1e78bb57ebb29ec407d1d62ea2c695d821b3db55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:22:30 +00:00
Bill Yi
9d7e1bbd18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3
-s ours am: 4c05f68c83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529049
Change-Id: I841069aff244396aa7db6f062dbc952a1799ef14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:22:05 +00:00
Bill Yi
37dfc701c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38
-s ours am: 01c84039d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525703
Change-Id: I7a0740499b7115cb1562d7e33f5ab4b320d24fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:21:42 +00:00
Bill Yi
f52a13f3bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c
-s ours am: ed31ffe0de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525703
Change-Id: I08e2a2664a33912c2bfdeced189972f043a5ede7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:21:22 +00:00
Treehugger Robot
84c4ec936a
Merge "Fixed battery tips card UI." into udc-qpr-dev am: 646c676ff6
am: 7f3062b52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24457990
Change-Id: I3b925eba90c8413a8531f50407e03637bf756f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:18:50 +00:00
Treehugger Robot
998d8d13df
[automerger skipped] Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev am: 40fa6ebbd8
am: 498b6493d1
-s ours
...
am skip reason: Merged-In I925e4d887c3435239aed0aa0fde7cda2c3a95b3c with SHA-1 f838f5d5fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484970
Change-Id: I9c0e07413ced39b6c95138f6731e12f7f6f2d350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:18:34 +00:00
Bill Yi
920d199532
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529049
Change-Id: Ie2054ec9fb8c608f74598495124dac3794f572eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:17:58 +00:00
Bill Yi
4c05f68c83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529049
Change-Id: I58559c3367e73dd91ff8a940691d132b9b82e7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:17:40 +00:00
Bill Yi
01c84039d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525703
Change-Id: Idfe45bdd26aadeb05290861b5b78e077281bfb5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:17:11 +00:00
Bill Yi
ed31ffe0de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525703
Change-Id: I89976d26125e1a12f4c09444eff72ef524e5ec6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:16:48 +00:00
Treehugger Robot
40c8611c71
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4b59201c53
-s ours am: cf0b06e047
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24530147
Change-Id: Ie323a7a365c659020bf48b6375d316f9cf9e4f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:14:58 +00:00
Bill Yi
accfdc3b1b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 974293cb11
-s ours am: cd4817bdde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24530147
Change-Id: I822b60a6fd6146f4a8a9752c8c6343a5695c9aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:14:47 +00:00
Treehugger Robot
2ecb75fa8c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ecddb596e1
-s ours am: a02253459b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529665
Change-Id: Ic39b1e004b42f16c26351458fe5a93390197693a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:14:34 +00:00
Bill Yi
0b5d8565a0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44369ed065
-s ours am: 8c215bf85f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529665
Change-Id: Id1b3cd602f378b82e8f34c38373bd5fcbe02bbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:14:17 +00:00
Roshan Pius
a3f6a70e9b
Merge "Implement DISALLOW_NFC AE user restriction" into main
2023-08-25 18:06:28 +00:00
Bill Yi
3ec1e1f122
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-25 17:44:41 +00:00
Bill Yi
f3fa8b1d38
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-25 17:44:41 +00:00
Bill Yi
c8dc6febc6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 582bd62c87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529885
Change-Id: I868e4c26106ddccceb8a3e10e961c5e2ef2d18f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 17:24:27 +00:00
Bill Yi
94deed1ed6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fac65474fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529885
Change-Id: I85b76a936e538a43fc2468f04a7eea3a55e09db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 17:24:16 +00:00
Bill Yi
e39de2cc99
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1e1cd32da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529884
Change-Id: Ide1151d8f9a39347626b00caeca8cb7a24802b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 17:12:56 +00:00
Bill Yi
5e86c208a8
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-08-25 16:37:00 +00:00
Bill Yi
51152c5462
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-08-25 16:37:00 +00:00
Bill Yi
c72c9fe3eb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1
-s ours am: f2e8fd2543
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525700
Change-Id: I1a9390960f6d433755916d5d48913e73ab35f24b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 15:31:48 +00:00
Bill Yi
228eb7920b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18
-s ours am: f9b7cb0384
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525700
Change-Id: I27cb5add1d4c09cf89f943b9fa4d1a3d7e2e631b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 15:31:33 +00:00
Bill Yi
6f8e20edce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1
-s ours am: 92c2a5540e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525700
Change-Id: I97fda7e8f75bd7e98104345313f2eacaea1dbe81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 14:56:54 +00:00
Bill Yi
ea8ffab3b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18
-s ours am: 46f23fb653
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525700
Change-Id: I2ca475e3f3e418a145150ce1e57b80979928349b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 14:56:39 +00:00
Bill Yi
f2e8fd2543
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525700
Change-Id: I4deb1054cc3223739cb61bb45186de8798424731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 14:42:01 +00:00
Bill Yi
f9b7cb0384
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525700
Change-Id: I3896e8fd1c3c300c090366cf543f5057c55dc49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 14:41:47 +00:00
Bill Yi
92c2a5540e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525700
Change-Id: I66ea0912d6a060c1a44eb41f3c97ace3bde50539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 14:30:41 +00:00
Bill Yi
46f23fb653
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525700
Change-Id: I293d9995deb2966d46bb9157443533c9e420f0a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 14:30:28 +00:00
Zaiyue Xue
361c198a3e
[automerger skipped] Enable i18n for battery tips card and fix b/297036263. am: d3156cc001
-s ours
...
am skip reason: Merged-In I925e4d887c3435239aed0aa0fde7cda2c3a95b3c with SHA-1 9f57691d89
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24519434
Change-Id: Iaaf6ec0654253baa5d5eb1a9f644257b725a2c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 14:16:02 +00:00
Bill Yi
582bd62c87
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-08-25 13:38:02 +00:00
Bill Yi
77dc4de4b1
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-25 13:37:23 +00:00
Zaiyue Xue
068adaf153
Enable i18n for battery tips card and fix b/297036263.
...
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
2023-08-25 20:40:45 +08:00
Zaiyue Xue
d3156cc001
Enable i18n for battery tips card and fix b/297036263.
...
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
Merged-In: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
2023-08-25 20:21:59 +08:00
mxyyiyi
d9360ec326
Impl dismiss action in battery tips cards.
...
- Use SharedPreferences to record and filter the already dimissed anomaly.
Bug: 291689623
Test: manual
Change-Id: I4fd4a39066591a4a201857f9586b6595b7d5c43b
2023-08-25 20:17:31 +08:00
mxyyiyi
c68e038508
Fixed battery tips card UI.
...
- Add highlight effect after navigate to new page.
- Update text format inside button.
Screenshot: https://screenshot.googleplex.com/8ib66dWzn6PZmhy
Fix: 296001546
Fix: 296339767
Bug: 291689623
Test: manual
Change-Id: Ic789e5feb684a109582477c553963a9a3f9936b8
2023-08-25 20:17:04 +08:00
SongFerng Wang
6058a62ad7
Merge "Fix the NullPointerException" into udc-qpr-dev am: acd7bbefd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24523908
Change-Id: Ie7415988a6aab04d4ebbd443b0b6b9b57f7643b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 10:44:47 +00:00
SongFerng Wang
57d30006d5
Merge "Add the config_show_sim_info to control the DataUsageSummary SHORTCUT" into udc-qpr-dev am: 6bd2ecf6fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24499553
Change-Id: I4ba8f478f5fc392cd90fc20d551d214c1a4c9ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 10:44:20 +00:00
SongFerng Wang
b1ceb4cc82
Merge "Reflash the Network selection value when onResume" into udc-qpr-dev am: c5944f5cbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24444208
Change-Id: I61aaefc0211adb57c0a861506bc897bc1a7fe509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 10:43:53 +00:00
SongFerng Wang
acd7bbefd1
Merge "Fix the NullPointerException" into udc-qpr-dev
2023-08-25 10:00:42 +00:00
SongFerng Wang
6bd2ecf6fb
Merge "Add the config_show_sim_info to control the DataUsageSummary SHORTCUT" into udc-qpr-dev
2023-08-25 10:00:27 +00:00
SongFerng Wang
c5944f5cbd
Merge "Reflash the Network selection value when onResume" into udc-qpr-dev
2023-08-25 10:00:11 +00:00
Allen Su
540647741f
Merge "Migrate LocaleNotification to main trunk" into main
2023-08-25 09:39:24 +00:00