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

134496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
9eb3b3db7c [automerger skipped] Merge "Rollback language source metrics" into udc-qpr-dev am: 23a5af27e3 am: 9d7b1f86d8 -s ours 
am skip reason: Merged-In I9b1239a6e98f074456def43cdbb7deb0bcc1cc3c with SHA-1 8e7c93ec57 is already in history

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

Change-Id: Ia4370f20bc35eaac038492bc00154f686ca611e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 06:45:59 +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
Allen Su
f22d5e98c0 Migrate LocaleNotification to main trunk 
Bug: 248514263
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=AppLocalePickerActivityTest LocaleListEditorTest LocaleNotificationDataManagerTest NotificationCancelReceiverTest NotificationControllerTest
Change-Id: Iac7ffd493485be8ebb10ae63e5ca4ea7a57c8c78
 2023-08-25 05:14:56 +00:00
Treehugger Robot
bf64f92c1e Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev am: 073b6fae16 am: a4f1545925 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527775

Change-Id: Ifbab5c429c8a77d4a72b91a12fda82c10502fe19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 22:50:36 +00:00
Treehugger Robot
c755e44e3d [automerger skipped] Merge "[PK settings] Remove metrics." into udc-qpr-dev am: ff791fa973 am: c234e5a6a8 -s ours 
am skip reason: Merged-In I6f5292c686d3eaac641c6e7f7631152b34a0085b with SHA-1 bdf89255a0 is already in history

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

Change-Id: I385082777a2c37c466f7e29302bc386dc1b9374e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 22:49:19 +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
8cb0308f1b Implement DISALLOW_NFC AE user restriction am: f72a53a595 am: d6a7a97493 am: cd04e59741 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525697

Change-Id: I41a1dc0e4f49ad8f15dc1f847f77d9a0c63212e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 21:38:24 +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