PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,926 Commits 1 Branch 0 Tags
4da27ff2bd5ef25d30ab0adf61c3a9473d261c8c
Commit Graph

109926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
f49c24cb82 Hide toggle to Turn on Wi-Fi automatically preference in Search settings 
- If the location setting is enabled, keep the current design. that the user can switch the toggle directly in the search settings to the "Turn on Wi-Fi automatically" toggle preference.

- If the location setting is disabled, hide the switch toggle to "Turn on Wi-Fi automatically" preference to avoid unexpected behavior.

- The user can click the "Turn on Wi-Fi automatically" preference to jump to the Network preference settings, and see a reminder message in the summary to enable the location settings first before switching the toggle.

- Move the check for mFragment to a suitable location to avoid unnecessary checks.

Bug: 235421460
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ib2c6b90308606d32179334d13be91e308971084f
Merged-In: Ib2c6b90308606d32179334d13be91e308971084f
(cherry picked from commit 59403ef3f2)
 2022-09-02 18:36:00 +00:00
YK Hung
06e92f5e45 Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101

Change-Id: I6c4d4d551dc4ccd1897422cd65bf26cadeb9994c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 15:46:17 +00:00
YK Hung
8bf872331b Merge "Update defend tips card" into tm-qpr-dev 2022-09-02 15:18:50 +00:00
SongFerngWang
76870250e8 Add owner for job handover 
CP from the AOSP aosp/2200280.

Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
Merged-In: I9259596811cba08a21b78eebbe2f847e1aa6818c
 2022-09-02 07:01:25 +00:00
Treehugger Robot
b151b094cc Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a am: 02a5b5e487 am: f8701c71e6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: I23cc61383530de734ef9f3e8141078757a45ec22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 05:46:17 +00:00
Treehugger Robot
f8701c71e6 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a am: 02a5b5e487 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: Ie5e1fdec16f3c5dfcee1b7a8dccc400a4f6a781c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 05:01:47 +00:00
Treehugger Robot
02a5b5e487 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: I59984a70a4a691ba4967238ec2eb5b2dbaf0ff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 04:34:07 +00:00
Treehugger Robot
3799ecc58a Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: I5a77b5153c4357f09e6f5d10dce9f7f31b3d1d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 03:59:57 +00:00
Treehugger Robot
36a80cd8e6 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" 2022-09-02 03:36:40 +00:00
Joe Bolinger
078f2c7d94 Merge "Add product variants for unicorn strings." into tm-qpr-dev am: f9e992f490 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19775632

Change-Id: I1eb23bbad270e8f44a234d05e490c0b81757f268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 20:10:54 +00:00
Tetiana Meronyk
8b7a6d5349 Merge "Update icons in multiuser settings" into tm-qpr-dev am: a666d80973 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745315

Change-Id: Id3e70245326590a9c7948fbbbd9da2bfab866d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 20:08:17 +00:00
Joe Bolinger
f9e992f490 Merge "Add product variants for unicorn strings." into tm-qpr-dev 2022-09-01 19:14:35 +00:00
Joshua McCloskey
c76f988475 Updated fingerprint dialog deletion strings. 
Test: Manual
Fixes: 234183857
Change-Id: Ieb500d52f705eb269937cd0fcd6b14081f9662ee
 2022-09-01 17:27:51 +00:00
Tetiana Meronyk
a666d80973 Merge "Update icons in multiuser settings" into tm-qpr-dev 2022-09-01 16:55:29 +00:00
SongFerng Wang
954b9bafd0 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f am: ea2cff12f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: I83c762cdff99730bfcda9775beb69c41c70f45bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 13:32:14 +00:00
SongFerng Wang
ea2cff12f8 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ibe979b946fcc259208c710311e2ae7b7bce2a2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 13:06:57 +00:00
SongFerng Wang
545db0361f Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ibeb10dbb48e3b2332f9056674a0a237ff28d5f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 12:37:38 +00:00
SongFerng Wang
55f71f5496 Merge "Add owner for job handover" am: 89418428f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: Ic94463eedc59971e8c5c162f2dfdad203c917508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 11:37:56 +00:00
SongFerng Wang
89418428f6 Merge "Add owner for job handover" 2022-09-01 10:58:19 +00:00
TreeHugger Robot
14fb5d73e1 Merge "Update the battery usage footer text from new UX review." into tm-qpr-dev am: d2074b38f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19800638

Change-Id: Idfed8a2a0baf80149469079dfc5ada14fa9e37d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 09:56:56 +00:00
TreeHugger Robot
d2074b38f2 Merge "Update the battery usage footer text from new UX review." into tm-qpr-dev 2022-09-01 09:23:28 +00:00
SongFerngWang
2d59130485 Add owner for job handover 
Will CP it into AOSP later.

Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
 2022-09-01 16:09:35 +08:00
TreeHugger Robot
23c78beab2 Merge "Update the timestamp label into uppercase and increase vertical offset" into tm-qpr-dev am: 0f1f02693e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19784482

Change-Id: Ic5be9dd619cb394992f829dc5d2f43c6cf2bd246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 06:42:11 +00:00
TreeHugger Robot
0f1f02693e Merge "Update the timestamp label into uppercase and increase vertical offset" into tm-qpr-dev 2022-09-01 06:35:09 +00:00
TreeHugger Robot
8321ae984d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: be48ee08a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3311e71b537fa5fa54602381b622a9e0a8f3614d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 06:30:11 +00:00
Bill Yi
848e94d4ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c4ee7aaaa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a7d2abafc1d6487f8193dd4a275f60975054e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 06:29:54 +00:00
TreeHugger Robot
35410e3b43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: cf1580e298 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifa173b356936ccc25bb596402362aa406f05afc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 06:29:43 +00:00
Bill Yi
1e48f8429b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d24dd8f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b3f9b42a389aa023aee447202e4ee0498f864d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 06:29:24 +00:00
TreeHugger Robot
be48ee08a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-01 05:29:06 +00:00
TreeHugger Robot
cf1580e298 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-01 05:29:06 +00:00
Wesley
243b450428 Update defend tips card 
- Update defend tips card to unclickable
 - Update secondary button's action and content description
 screenshot: https://screenshot.googleplex.com/BYU8Mh5abJ9Tirh.png

Bug: 243769797
Bug: 243641857
Bug: 244219076
Test: make SettingsRoboTests
Change-Id: I7fdf5f7404d33f0374a992c83a7653a01b9f11bc
 2022-09-01 04:09:31 +00:00
Zaiyue Xue
43974fb247 Update the battery usage footer text from new UX review. 
Fix: 242817645
Bug: 242817645
Test: manual
Change-Id: Ia353700f6d9c0f25d2af72110afcd539ae9068b0
 2022-09-01 11:11:08 +08:00
Grace Cheng
35125a3d2b Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev am: 2c9dab6f0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562137

Change-Id: I11ce675560e40ab1c946b01e14fee329e77bfac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 01:13:36 +00:00
Grace Cheng
2c9dab6f0a Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev 2022-09-01 00:47:41 +00:00
Grace Cheng
4a187e15d6 Implement SFPS guided enrollment for T6 
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.

Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Fixes: 243813773
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
Merged-In: I1fa0b9349545586919eceeb9d05f365c2f2ec491
 2022-09-01 00:47:22 +00:00
Bill Yi
1c4ee7aaaa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ida84975d7fb22c3592dc2b183f10a98802aef896
 2022-08-31 16:22:03 -07:00
Bill Yi
e9d24dd8f2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I75226108b861bcd5f06ce0e6270b8dd13ab22b82
 2022-08-31 16:18:02 -07:00
Diya Bera
c18579f168 Merge "SecuritySettings test" into tm-qpr-dev am: 73e4742941 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19672131

Change-Id: I9bd7d32f1ada80c9bf6456905a8be6fbe1b1d4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 18:56:36 +00:00
Diya Bera
73e4742941 Merge "SecuritySettings test" into tm-qpr-dev 2022-08-31 18:25:45 +00:00
TreeHugger Robot
641e7bc1cd Merge "Allow footer string support both mobile and tablet devices" into tm-qpr-dev am: 282d38eba2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781367

Change-Id: I043f96e50550c20d1d9be22c77deb6fcb969ff08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 08:07:48 +00:00
TreeHugger Robot
282d38eba2 Merge "Allow footer string support both mobile and tablet devices" into tm-qpr-dev 2022-08-31 07:48:04 +00:00
ykhung
352e3a091d Update the timestamp label into uppercase and increase vertical offset 
Update the timestamp label into uppercase based on the different locale
and increase the vertical offset from UX review feedback

Test: presubmit
Change-Id: Ie5e86967e36773f1f8c4f628501514b1a7fd22f5
 2022-08-31 11:03:26 +08:00
Jason Chiu
f9baa40744 Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev am: da28893958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781356

Change-Id: I583f5c78e43b2b76405e2e7dc1f1794bf1c69cac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 02:59:48 +00:00
Jason Chiu
da28893958 Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev 2022-08-31 02:19:07 +00:00
Zaiyue Xue
48aac9b0e7 Allow footer string support both mobile and tablet devices 
Update the string to support mobile and tablet different devices term (not code changes, only the string resource)

Bug: 243878095
Fix: 243878095
Test: presubmit
Change-Id: I6f4496a961671a478d36645113e30b45391d7d8a
 2022-08-30 18:49:44 +00:00
Joe Bolinger
65e7ff1dea Add product variants for unicorn strings. 
Bug: 243897496
Test: N/A
Change-Id: Iac80e0aefe7a45603217e50b9b177b28329632e8
 2022-08-30 11:31:29 -07:00
Derek Jedral
6fec2be00d Fix Incorrect Trust Agent Count 
The total number of trustagents can still be incorrect if the user
enables a trustagent, and then the trust agent component gets disabled,
since the user does not manually toggle the preference themselves. Fixed
by switching back to the original method of using TrustAgentManager, but
also pass a flag that allows us to choose on whether we want to filter
the trustagents based on whether it has an activity (which not all
trustagents are guaranteed to have).

Bug: 240969157
Test: Local test + atest
Change-Id: I5106859f61ddf36c1bf008da18be889ceaf27a8d
 2022-08-30 17:43:11 +00:00
Austin Delgado
71b2bb8f5c Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev am: bbcdc91967 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19582557

Change-Id: I7270f6c80cef2c28697e1ba85c9fcaaf57f25263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 17:37:21 +00:00
Austin Delgado
bbcdc91967 Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev 2022-08-30 17:15:49 +00:00
Tetiana Meronyk
86aee84483 Update icons in multiuser settings 
Bug: 243631790
Test: manual visual
Change-Id: I2885d12ef3762e233a852978a0435a60e034f2c2
 2022-08-30 16:14:32 +00:00