PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,989 Commits 1 Branch 0 Tags
c03ff3b87029dce86d873eb533e8c7cdc9066a4c
Commit Graph

118989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
275c53dc15 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours am: 8f67dfd0c6 -s ours am: c768c92641 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ecf30fabfec9a056f80eb07443ab1879d5e410a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:49:00 +00:00
Bill Yi
be438c6332 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours am: 9be6f23a0c -s ours am: d00c17ec81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bd783c7da4583d3fe5d99c204c82b82d3c3613f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:48:16 +00:00
Becca Hughes
da53b2912c Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: I0f6b895cf2ac1a2294eafdad6f15c825bb4ead5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:28:41 +00:00
Bill Yi
c768c92641 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours am: 8f67dfd0c6 -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: If86bfe3c232a6fab682b6dad9fb4dd2f0a7a9d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:27:07 +00:00
Bill Yi
d00c17ec81 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours am: 9be6f23a0c -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I8499b724c8500edf9129a1f612b97f756defd1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:26:04 +00:00
Becca Hughes
5b7dc67d64 Merge "Add credential manager team to OWNERS" am: ce5d029670 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: If599c23c05ab5eaf4a80a4b3a4acd0f3c6f78cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:05:01 +00:00
Becca Hughes
ce5d029670 Merge "Add credential manager team to OWNERS" 2023-01-06 20:03:13 +00:00
Bill Yi
8f67dfd0c6 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I3051eb6db0fcb1e3ac1e2300f18461a297f789b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:00:49 +00:00
Bill Yi
9be6f23a0c [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I07d24876a3be08444cb4660b280565679cb5ab04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:00:02 +00:00
Bill Yi
2e7924abcf Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:51 +00:00
Gil Cukierman
58f946072d Add Extra Exception Checks to Null Cipher Toggle 
Adds broad exception safety to all TelephonyManager calls.
Without these extra catch blocks, the entire Settings app would
crash if a TelephonyManager API were to throw an exception.

Bug: 262914591
Test: atest NullAlgorithmsPreferenceControllerTest
Change-Id: I997a37fe71bf007d67989c89b3abe3e520d79d3c
 2023-01-06 19:30:26 +00:00
Bill Yi
238b7b4620 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2681d8cc05 -s ours am: 2d50872f81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b8199044ea7bc30cc71ceba55113c551b06c972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 19:05:06 +00:00
Bill Yi
d227fbe832 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-06 18:37:48 +00:00
Bill Yi
2d50872f81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2681d8cc05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic705dd2a80e2a322142e1e91afa80ef0f00c0383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 18:30:40 +00:00
Bill Yi
1883efae0a Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE 
Merged-In: I11c236f3901c9faaeb6c702678d330dde8f07f38
Merged-In: I3d784788884f9b80733786dc73d9bb62ffef817b

Change-Id: Iabf5075f225933cd03d2d2ac43b9821ecc9fb7c1
 2023-01-06 15:26:15 +00:00
Bill Yi
7b9bce321b [automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 182c397d37 -s ours am: 916adf4270 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f49f80829644f1760aa70cf47e91beb927304cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 12:10:36 +00:00
Bill Yi
75297a152a [automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: c286104951 -s ours am: 5f3ffc5ec6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bbce98aff2d31eb9cf7a19f73790c877c11e916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 12:10:08 +00:00
TreeHugger Robot
7c1efa29cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a0d84081e2 -s ours am: c1ce13f040 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic69e4ac289cc3df6e1072770ee5f3ad95ae85097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:39:52 +00:00
Bill Yi
68a8c8d2c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38268df283 -s ours am: d53751548b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If72f0f7e9f6eb8f33c839d64d5e8c54f01741ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:39:37 +00:00
TreeHugger Robot
024dc88ddc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80404721aa -s ours am: 5291d0476f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e664557a9968208aa6c36ff466a0999737f8f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:39:22 +00:00
Bill Yi
cec23edebe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6480a5ff9c -s ours am: 53f80eb54a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab17c32c513b94691cf22b2d06d812f3058b903d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:39:18 +00:00
Grace Cheng
fb77440a6f Merge "Updates sfps animations for natural orientation" into tm-qpr-dev am: 28d0e72a6d am: 305fbd98db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20860930

Change-Id: Ia3ffc6fadcec112adc45265bb6953881a9b02ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:36:09 +00:00
Vania Januar
0bcac61001 Merge "Intent to open USI device details page." 2023-01-06 11:30:53 +00:00
Zaiyue Xue
833e47d851 [Battery usage U] [UI] Show total "Screen On Time" in the battery usage page 
Screen record: https://drive.google.com/open?id=16ZOp1E2YBzWQXbnXl786FaLFPel-S9CF&authuser=0&resourcekey=0-oRqCrdTc9FZjVgsq9orhEw&usp=drive_link
For Arabic: https://drive.google.com/open?id=1zh_4jcUnqLC6CDgwju1qQkWJ0QCtm19c&authuser=0&resourcekey=0-kuKfDdOTWxqOUmD0RfPNLQ&usp=drive_link

Next step: show screen on time for each app

Bug: 258120710
Test: manual
Change-Id: I2085a2a85ebd50b2ac876972f6a8ebbf6f20246c
 2023-01-06 19:09:52 +08:00
Bill Yi
916adf4270 [automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 182c397d37 -s ours 
am skip reason: Merged-In I77029014d72b8ac9b579357550f031bef20e32cb with SHA-1 8e2f0b970b is already in history

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

Change-Id: I083e54e24f3894ef3d798bfafce6aa0b221091b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 07:33:21 +00:00
Bill Yi
5f3ffc5ec6 [automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: c286104951 -s ours 
am skip reason: Merged-In I77029014d72b8ac9b579357550f031bef20e32cb with SHA-1 8e2f0b970b is already in history

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

Change-Id: Ia8ed6202af921e0e4e4e175da868c7a7ef03fa10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 07:32:54 +00:00
Zaiyue Xue
814eff1c24 Fix the inverted logic to judge whether an app is system app. 
Bug: 264626206
Fix: 264626206
Test: maunal
Change-Id: I3750e3b11e444add27243c492cf8968373cd57d0
 2023-01-06 15:24:44 +08:00
Bill Yi
182c397d37 Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2023-01-06 07:00:53 +00:00
Jason Hsu
ed2728073f Merge "Fix preferences under Related category can not launch its own page in bluetooth device details page" 2023-01-06 06:27:03 +00:00
TreeHugger Robot
2462e490ab Merge "Refine TetherSettings with ViewModel" 2023-01-06 03:38:49 +00:00
Bill Yi
2681d8cc05 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
 2023-01-05 18:07:21 -08:00
TreeHugger Robot
c1ce13f040 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a0d84081e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d784788884f9b80733786dc73d9bb62ffef817b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:37:46 +00:00
Bill Yi
d53751548b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38268df283 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cb72e3462a02722d9f8403bd44d9e19917b5e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:37:29 +00:00
TreeHugger Robot
5291d0476f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80404721aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia554a744e24581000e42e6db0c57a0510b86fbf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:37:16 +00:00
Bill Yi
53f80eb54a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6480a5ff9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I145c5cf356be12dcdec6bf677f7f8195cea9b3d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:37:00 +00:00
Grace Cheng
305fbd98db Merge "Updates sfps animations for natural orientation" into tm-qpr-dev am: 28d0e72a6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20860930

Change-Id: Id161cb7489bc786288adf6fb578c0ed525264202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:32:17 +00:00
TreeHugger Robot
a0d84081e2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-05 20:13:42 +00:00
TreeHugger Robot
80404721aa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-05 20:13:42 +00:00
TreeHugger Robot
d54c9cab7d Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-05 20:06:08 +00:00
TreeHugger Robot
2ff2a828f2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-05 20:06:08 +00:00
TreeHugger Robot
2d35260ed4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-05 20:06:08 +00:00
Grace Cheng
28d0e72a6d Merge "Updates sfps animations for natural orientation" into tm-qpr-dev 2023-01-05 19:57:19 +00:00
Becca Hughes
f31920a613 Merge "Fix bug in credential manager settings (dialogs)" 2023-01-05 18:20:55 +00:00
Vania Januar
c3f6c0d593 Merge "Replace placeholder ROLE_ASSISTANT with ROLE_NOTES." 2023-01-05 14:49:31 +00:00
Tetiana Meronyk
c0e31b3be1 Merge "Allow creating admin users when 'config_enableMultipleAdmins' property is enabled" 2023-01-05 14:30:34 +00:00
Chaohui Wang
4525cfb462 Merge "Remove EXTRA_USER_HANDLE from startSpaActivityForApp" 2023-01-05 11:06:08 +00:00
Chaohui Wang
875cbba0af Merge "Add spinner options to "All apps"" 2023-01-05 11:05:23 +00:00
jasonwshsu
829a671265 Fix preferences under Related category can not launch its own page in bluetooth device details page 
Root Cause: KeyboardSettingsPreferenceController override
handlePreferenceTreeClick() without checking the preference key, it will lead to handle all preferences' click action.

Solution: Check the preference is the expected preference key

Bug: 264017256
Test: make RunSettingsRoboTests ROBOTEST_FILTER=KeyboardSettingsPreferenceControllerTest
Change-Id: Idcdadc323df5b758b4b21329227e2bb721b1c394
 2023-01-05 10:48:55 +00:00
Yilin Cai
181119f0b5 Merge "Add mapping to the WiFi-control SPA page in Settings app." 2023-01-05 10:15:23 +00:00
Weng Su
a396a4d8b9 Refine TetherSettings with ViewModel 
- Use ViewModel to handle the TetheringManager's lifecycle.

- Use LiveData to observe TetheredInterfaces's changes instead of callbacks.

Bug: 246531382
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
atest -c TetheringManagerModelTest

Change-Id: Ib1a710a19a5340f63401a37b5c2b0bc307ac82f0
 2023-01-05 17:13:57 +08:00