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
77dc4de4b1
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-25 13:37:23 +00: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
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
Treehugger Robot
cffee3ecd3
Merge "Impl dismiss action in battery tips cards." into udc-qpr-dev am: 4b4328cb9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24478130
Change-Id: Ica04e6d4acfc70397da52c35b8a21c1af234f494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 09:37:25 +00:00
Treehugger Robot
7f3062b52e
Merge "Fixed battery tips card UI." into udc-qpr-dev am: 646c676ff6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24457990
Change-Id: I410f00abe1785cca6a45ac63abd3e89a818c2a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 09:36:12 +00:00
Treehugger Robot
498b6493d1
Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev am: 40fa6ebbd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484970
Change-Id: I470efd81e3be7ece7226d7f2300352d45cf3f1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 09:35:32 +00:00
Treehugger Robot
4b4328cb9c
Merge "Impl dismiss action in battery tips cards." into udc-qpr-dev
2023-08-25 08:32:04 +00:00
Treehugger Robot
646c676ff6
Merge "Fixed battery tips card UI." into udc-qpr-dev
2023-08-25 08:31:44 +00:00
Treehugger Robot
40fa6ebbd8
Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev
2023-08-25 08:31:07 +00:00
Treehugger Robot
cf0b06e047
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4b59201c53
-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: Iec0b29e8bb61a812d1863be393d16038ab1ad137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 08:10:09 +00:00
Bill Yi
cd4817bdde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 974293cb11
-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: Ia92102a2672c830dbc201d0f67935e97f2ef422f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 08:10:04 +00:00
Treehugger Robot
a02253459b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ecddb596e1
-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: Ia1cf94309ae3b67d7868889a5ae4922f1d437051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 08:09:55 +00:00
Bill Yi
8c215bf85f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44369ed065
-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: I3532130b34f2e0f98b3d335a85a3b14c01360c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 08:09:29 +00:00
Treehugger Robot
4b59201c53
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-25 07:27:08 +00:00
Treehugger Robot
ecddb596e1
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-25 07:27:08 +00:00
Allen Su
9d7b1f86d8
Merge "Rollback language source metrics" into udc-qpr-dev am: 23a5af27e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527327
Change-Id: I85452d98d3a96ea452c1a803af450cf440c6e3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 06:03:43 +00:00
Allen Su
23a5af27e3
Merge "Rollback language source metrics" into udc-qpr-dev
2023-08-25 05:17:14 +00:00
Treehugger Robot
a4f1545925
Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev am: 073b6fae16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527775
Change-Id: I8701f80a441e86ef24a44bec8c40ae7e2bd56d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 22:08:33 +00:00
Treehugger Robot
c234e5a6a8
Merge "[PK settings] Remove metrics." into udc-qpr-dev am: ff791fa973
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24526049
Change-Id: I6866aa3d71a9f891863fe0ccd273633a06daae19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 22:05:25 +00:00
Roshan Pius
cd04e59741
Implement DISALLOW_NFC AE user restriction am: f72a53a595
am: d6a7a97493
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525697
Change-Id: I3c4100861ed8e5e3b991853b652fc1e7a3a9b803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 21:21:30 +00:00
Treehugger Robot
073b6fae16
Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev
2023-08-24 21:13:50 +00:00
Treehugger Robot
ff791fa973
Merge "[PK settings] Remove metrics." into udc-qpr-dev
2023-08-24 21:12:47 +00:00
Roshan Pius
d6a7a97493
Implement DISALLOW_NFC AE user restriction am: f72a53a595
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525697
Change-Id: Id14e0be72914fb8effc08cb17856d6efa0a750ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 20:51:58 +00:00
Roshan Pius
4e4877916d
Implement DISALLOW_NFC AE user restriction
...
Bug: 271452372
Test: Compiles
Merged-In: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
Change-Id: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
2023-08-24 20:39:23 +00:00
Behnam Heydarshahi
017fa1c652
TalkBack: Clarify volume panel slice action label
...
Change the generic "double-tap to activate" into "double-tap to enter
settings".
Bug: b/285516489
Test: atest PanelSlicesAdapterTest
Change-Id: I1bba0d625c93db90f347b756f5a20a7ac7e64d56
2023-08-24 19:02:55 +00:00
Treehugger Robot
e456621260
Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev am: f5023f3805
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24533568
Change-Id: I2e20d12d78888908c8d1fe53043b4b6aec719c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 13:26:55 +00:00
Treehugger Robot
f5023f3805
Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev
2023-08-24 12:33:08 +00:00
Zoey Chen
2011921be7
[Refional Preference] Fix test case fail
...
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Bug: 297304863
Change-Id: Ib59c033de3215c240b62a21885a6be4f813b292c
2023-08-24 06:17:57 +00:00
Joe Bolinger
5c2ebc0545
[automerger skipped] Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev am: d27e383edf
-s ours am: ab684e146d
-s ours
...
am skip reason: Merged-In Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd with SHA-1 5a4105b324
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831
Change-Id: I115333be0cd052e388db99cea82ddf66891fa77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 04:58:49 +00:00
Austin Delgado
9eb059f8ca
[automerger skipped] Fix talkback not announcing requirement in ChooseLock am: a73cee24d4
-s ours am: 3106ac6fe3
-s ours
...
am skip reason: Merged-In Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd with SHA-1 5a4105b324
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831
Change-Id: I6def9c43ce388032f84427db66813337955e898f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 04:58:47 +00:00
Zoey Chen
6609d39b8f
Merge "[Regional Preference] Need to remove the metrics by the metrics concil team's comment." into udc-qpr-dev am: 6116750110
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24521607
Change-Id: I3462de66a8f19b3531848ccfd6f97fb99562a593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 04:58:24 +00:00
Joe Bolinger
23a6697369
[automerger skipped] Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev am: d27e383edf
am: cadc70a0db
-s ours
...
am skip reason: Merged-In Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd with SHA-1 5a4105b324
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831
Change-Id: I86ff896ed9734c92e00f2439273ddcc18fd0a6ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 04:53:47 +00:00
Joe Bolinger
cadc70a0db
Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev am: d27e383edf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831
Change-Id: Ie403cfa86823a7d53fab020cd1019cb9d83a2698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 04:23:18 +00:00
Joe Bolinger
ab684e146d
[automerger skipped] Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev am: d27e383edf
-s ours
...
am skip reason: Merged-In Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd with SHA-1 5a4105b324
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831
Change-Id: Ie3dafc539455e2ccc2f10c63d6cf2bc6cc494293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 04:16:07 +00:00
Austin Delgado
3106ac6fe3
[automerger skipped] Fix talkback not announcing requirement in ChooseLock am: a73cee24d4
-s ours
...
am skip reason: Merged-In Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd with SHA-1 5a4105b324
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831
Change-Id: Ic3612b1fe6debd654ea0edda7ea119228eaeb43e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 04:16:02 +00:00
Zoey Chen
6116750110
Merge "[Regional Preference] Need to remove the metrics by the metrics concil team's comment." into udc-qpr-dev
2023-08-24 04:06:22 +00:00
Weng Su
c826558805
Show Hotspot network icon (Wi-Fi Slice)
...
- Show Hotspot device type icons without signal strength (no Wi-Fi level)
Bug: 268550769
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest
Change-Id: I2a707cf20fc1a6d519ef5ca54db64e913daec969
2023-08-24 11:54:05 +08:00
Joe Bolinger
d27e383edf
Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev
2023-08-24 03:31:11 +00:00
mxyyiyi
737b9ab5b7
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-24 10:20:49 +08:00