Commit Graph

114982 Commits

Author SHA1 Message Date
Chaohui Wang
d7817e7802 Clean up unused Bluetooth strings
Bug: 234570979
Test: make Settings app
Change-Id: I60dfa25e7609b75f9d054d6e607113bd272bf84b
2022-09-03 05:02:51 +00:00
TreeHugger Robot
951292e156 Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev am: 048bc692a4 am: 8f0b3c2d6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19774526

Change-Id: I0839b46ff235b7380dece5d61d1b2078d2060668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 21:35:22 +00:00
TreeHugger Robot
8f0b3c2d6a Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev am: 048bc692a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19774526

Change-Id: I0d86d362802950e46346718a02dc150fbfb59eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 21:05:43 +00:00
TreeHugger Robot
048bc692a4 Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev 2022-09-02 20:09:01 +00:00
TreeHugger Robot
1cd2f67db2 Merge "Clean up unused storage resources" 2022-09-02 17:40:13 +00:00
Chaohui Wang
9ec177f207 Clean up unused storage resources
Bug: 234570979
Test: make Settings app
Change-Id: Ief5680358d4235f01c4faaf9baf4c8cfe3ea592c
2022-09-03 00:24:48 +08:00
YK Hung
b637d56d09 Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b am: 06e92f5e45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101

Change-Id: I6bf829b5f72796eb136bc2e6745008e56032cfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 16:22:41 +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
Treehugger Robot
adbd13eb05 Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a am: 02a5b5e487 am: f8701c71e6 am: b151b094cc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

Change-Id: Ib0d57ffd2c11e804ae31a0f57846c509100ccf93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 06:17:32 +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
ae1b7c6a73 Merge "Add product variants for unicorn strings." into tm-qpr-dev am: f9e992f490 am: 078f2c7d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19775632

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

Change-Id: Ic435088eeef5d07507868925b869550760364386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:44:50 +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
b46e4b0755 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f am: ea2cff12f8 am: 954b9bafd0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: I04b81ad2487b069d3ee9c9a009fbc824d87ce5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 14:21:35 +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
Chaohui Wang
978e469c99 Merge "Navigate to Install unknown apps in SPA" 2022-09-01 11:25:43 +00:00
SongFerng Wang
89418428f6 Merge "Add owner for job handover" 2022-09-01 10:58:19 +00:00
TreeHugger Robot
bcbe39f4a4 Merge "Update the battery usage footer text from new UX review." into tm-qpr-dev am: d2074b38f2 am: 14fb5d73e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19800638

Change-Id: I63d989488f570326d7a61b9f953a4c6b792a647c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 10:56:53 +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
52892dad16 Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" 2022-09-01 09:32:05 +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
4d6e33e3e8 Merge "Update the timestamp label into uppercase and increase vertical offset" into tm-qpr-dev am: 0f1f02693e am: 23c78beab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19784482

Change-Id: Iec164b894ac9fb7101709262e1703642d80d4515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 07:02:03 +00:00
TreeHugger Robot
d86a32ba5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: be48ee08a8 -s ours am: 8321ae984d -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: I2315a6c408246cfbdf78ea149df9d56893a72009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 06:59:56 +00:00
Bill Yi
8fffba44b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c4ee7aaaa -s ours am: 848e94d4ab -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: Ie8b3b049c119c2eccca9050e6ea39897a1d89e2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 06:59:48 +00:00
TreeHugger Robot
0201d5cb5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: cf1580e298 -s ours am: 35410e3b43 -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: Ib7a00858718fa83067c2a80fdc44e8a7b3419796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 06:59:36 +00:00
Bill Yi
9aa5d1b7e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d24dd8f2 -s ours am: 1e48f8429b -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: If50583bc62cc9dece42c393e2fcca925e73d22c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 06:59:18 +00: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
40a173a26e [automerger skipped] Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev am: 2c9dab6f0a am: 35125a3d2b -s ours
am skip reason: Merged-In I1fa0b9349545586919eceeb9d05f365c2f2ec491 with SHA-1 219b28bb8d is already in history

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

Change-Id: Ib79f92390f7ec78c94b235c43afa1cb11a142c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 01:42:52 +00:00