PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,220 Commits 1 Branch 0 Tags
df13cc443f05f81631630a044ca63e8784fcb67d
Commit Graph

134220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
df13cc443f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours am: 01c84039d2 -s ours am: 37dfc701c1 -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: If91986deac09a0d35f3eea300bdf6b8cdbc57f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:02:21 +00:00
Bill Yi
e31ece88ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours am: ed31ffe0de -s ours am: f52a13f3bd -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: Ie0a821c3e46f58b769ef811994e06fe0f62d5da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 20:01:57 +00:00
Bill Yi
c908c6477a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours am: f2e8fd2543 -s ours am: c72c9fe3eb -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: I6df2b7eee86613dba06c7bbb2a20cffca1826586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:33:24 +00:00
Bill Yi
b6bb19d216 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18 -s ours am: f9b7cb0384 -s ours am: 228eb7920b -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: I30082437440edd9dbf834a4d4375069f98bd2ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:33:08 +00:00
Bill Yi
a7e26d52f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours am: 92c2a5540e -s ours am: 6f8e20edce -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: I6e75a831b48e0a81397145f4894123e47758dae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:25:34 +00:00
Bill Yi
5b374480b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18 -s ours am: 46f23fb653 -s ours am: ea8ffab3b5 -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: Id79478a3adf31768455f0f70e52ee802a2d9e41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:25:18 +00:00
Zaiyue Xue
3f62006f60 [automerger skipped] Enable i18n for battery tips card and fix b/297036263. am: d3156cc001 -s ours am: 361c198a3e -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: I78b9b16f6b6026166554e00e6de9bdaf889e576b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:20:05 +00:00
SongFerng Wang
9ca09c3494 Merge "Fix the NullPointerException" into udc-qpr-dev am: acd7bbefd1 am: 6058a62ad7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24523908

Change-Id: Ia3126898342da4f39f9431a423f25a6270ae3107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:19:55 +00:00
SongFerng Wang
55f1696426 Merge "Add the config_show_sim_info to control the DataUsageSummary SHORTCUT" into udc-qpr-dev am: 6bd2ecf6fb am: 57d30006d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24499553

Change-Id: I1b3b18fc4557822ce56d5115196c1229513b9cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:19:32 +00:00
SongFerng Wang
61bd2d48c7 Merge "Reflash the Network selection value when onResume" into udc-qpr-dev am: c5944f5cbd am: b1ceb4cc82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24444208

Change-Id: Ieb88bcd6ceb55950048e565a192d8c8f920710a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:19:16 +00:00
Treehugger Robot
e4eb86e356 [automerger skipped] Merge "Impl dismiss action in battery tips cards." into udc-qpr-dev am: 4b4328cb9c am: cffee3ecd3 -s ours 
am skip reason: skipped by user guanxin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24478130

Change-Id: I002416c6e440e32f573b007f7ca57dc5321cf09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 19:18:57 +00:00
Julia Reynolds
67c2cf714b Fix failing test 
Test: make -j RunSettingsRoboTests ROBOTEST_FILTER=NotificationAssistantPreferenceControllerTest
Fixes: 296531083
Change-Id: If949a76662aab6aa63e6ca793d9349254ce688e9
 2023-08-28 18:19:21 +00:00
Treehugger Robot
b529aadf38 Merge "[Terms of Address] Create a feature flag for it" into main 2023-08-28 12:54:30 +00:00
Yiyi Shen
a039e10168 Merge "Rename aconfig declarations to a common name." into main 2023-08-28 12:16:16 +00:00
Zoey Chen
9dc4943e09 [Terms of Address] Create a feature flag for it 
Bug: 297798866
Test: adb shell device_config put settings_localepicker com.android.settings.flags.terms_of_address_enabled true
Change-Id: I1d954edfe99bb56fdd69a53ffafe5c8ed2b05da2
 2023-08-28 11:52:22 +00:00
Chaohui Wang
6ef678f19d Add some null annotation for data usage code 
Also do some clean up.

Bug: 296357959
Test: manual - on DataUsageList page
Change-Id: Id7548e1d58d946810c844b9559bb00d65306f441
 2023-08-28 17:47:06 +08:00
Yiyi Shen
27d709ac79 Rename aconfig declarations to a common name. 
Bug: 296507968
Test: Manual
Change-Id: I5e5ecb64d593939addcf356cb619c0944326af24
 2023-08-28 17:40:15 +08:00
Chaohui Wang
6c2d713226 Fix NullPointerException of DataUsageList 
Fix: 296357959
Test: manual - on DataUsageList page
Change-Id: I303aa8ae1ba5db8f23dbc3b68b9ff4e05a0936a0
 2023-08-28 17:29:26 +08:00
Yiyi Shen
a7aeb86ec8 Merge "Add flag for Subsequent pair Settings integration" into main 2023-08-28 08:03:52 +00:00
Yiyi Shen
14c611a37c Add flag for Subsequent pair Settings integration 
Bug: 296507968
Test: Manual
Change-Id: I87002c4e8143df1e67e3c32eff6d654575b81051
 2023-08-28 14:06:30 +08: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
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
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