Commit Graph

117217 Commits

Author SHA1 Message Date
SongFerngWang
b5dbbceecd Add more logs for analysis am: 4a5680ac09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19888371

Change-Id: I9a8d01347fec136bac16cb85ccbfb1e5860edda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:31:59 +00:00
TreeHugger Robot
97985b6219 Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev 2022-09-13 01:23:37 +00:00
SongFerngWang
4a5680ac09 Add more logs for analysis
Bug: 245657079
Test: NA. It is the log only.
Change-Id: I9909acc27ccbef48f653cfcd0cc84942c4353eac
2022-09-13 01:11:17 +00:00
TreeHugger Robot
b3e5faa8a3 Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev am: 311d818b10 am: 9e155208bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880528

Change-Id: I5b45bfa90774b254bf7c13cf27a72fbcac7b46a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:05:22 +00:00
TreeHugger Robot
9e155208bf Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev am: 311d818b10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880528

Change-Id: I7641e7dddb2865e402d02b7e6dac7c7437825f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 00:32:43 +00:00
TreeHugger Robot
311d818b10 Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev 2022-09-12 23:57:04 +00:00
Bill Yi
cdbf53761d [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours am: 65b45b6ecb -s ours am: 8a67244d48 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I816fa51b767c09e3c7a9c38504beedc4e6f294ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:31:03 +00:00
Bill Yi
0f25dba7e3 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours am: aab60c8d68 -s ours am: e798f997d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I871edb225acfe8f5c08d38d5fbf6c39bcefccbc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:30:58 +00:00
Bill Yi
8a67244d48 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours am: 65b45b6ecb -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I67c6da9fa91608e893c79cf8b9bc0b030efd630c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:16:12 +00:00
Bill Yi
e798f997d7 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours am: aab60c8d68 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I1ed3a6b4e538b22f8833a602a29cd0df08890c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:15:56 +00:00
Joshua McCloskey
fccd144930 Add phone, tablet, device fp deletion strings.
Test: Manual.
Fixes: 245411037
Change-Id: Ib1d83072878ede27758beb0381a12cab6172b9d6
2022-09-12 21:00:58 +00:00
Bill Yi
65b45b6ecb [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: Ie01abae883d751824703018a75ef7a41de38cc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 20:29:27 +00:00
Bill Yi
aab60c8d68 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I17f23d231f04f41092a3be5ce59a732faad85b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 20:29:16 +00:00
Bill Yi
9c26bb64b8 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: Id4b69cddf31a9a3d0bb781d7fecd0f21d369c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 19:57:13 +00:00
Bill Yi
517f250e13 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I9474f8a455c20b5335f584ba8261fd5b29435995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 19:57:01 +00:00
TreeHugger Robot
3ff7cee25c Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-12 19:33:04 +00:00
TreeHugger Robot
53756f0544 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-12 19:33:04 +00:00
Bill Yi
3464e33135 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I20ddfee04e6de1e681b647a97296fcf29d97ce66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:56:26 +00:00
Bill Yi
49efcf7816 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I3e2c668af16aec333680c1ac7fad768b1db94c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:56:14 +00:00
TreeHugger Robot
20af31517c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e6fd2a5da8 -s ours am: 390769f44e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifea34ab541e2fa223483305332b06b982ed65229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:05:17 +00:00
Bill Yi
65a59bc77a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1bfdaf22a -s ours am: ad0109af91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18d1d4f59dd1af9b2ead768b9ca448d63fa30f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:05:12 +00:00
Bill Yi
c26b3cc96e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61d351e93d -s ours am: 422fa4379d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e804cfcb7a74b1b542c19aaf7d9fedd058f0c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:05:02 +00:00
TreeHugger Robot
390769f44e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e6fd2a5da8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7897ec8a96aeac36b438b33c0895591f50e4274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:00:18 +00:00
Bill Yi
ad0109af91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1bfdaf22a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5941874f63385b0840dd9b6930344932eb7a34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:00:03 +00:00
Bill Yi
422fa4379d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61d351e93d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I651889f8eca679d1aa27eae894d6b6dfc85fc363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 17:59:55 +00:00
Bill Yi
677cd61616 Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" 2022-09-12 17:59:03 +00:00
TreeHugger Robot
e6fd2a5da8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-12 17:41:49 +00:00
Bill Yi
db93faa147 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 35b51c6a87
Blank merge reason: commit message contains skip directive

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

Change-Id: Ieda49b8d5f8612b89ea3d96be7315b38d7938522
2022-09-12 14:27:37 +00:00
Abel Tesfaye
378990e13f Cleanup listener reference in Screen Attention
This will fix a memory leak being caused by dangling listeners.

Test: locally with oriole, make RunSettingsRoboTests -j$(nproc) ROBOTEST_FILTER=AdaptiveSleepCameraStatePreferenceControllerTest,AdaptiveSleepPreferenceControllerTest

Bug: 245990072
Change-Id: I35eeedc3ece719f1f3baff6235cc5ac2d42fbba3
2022-09-12 13:41:31 +00:00
Abel Tesfaye
88ea8b3bec Merge "Cleanup listener reference in SmartAutoRotate" 2022-09-12 11:11:12 +00:00
Sunny Shao
3e24aaf091 Allow summary string support both mobile and tablet devices
-Update the string to support mobile and tablet devices.

Bug: 244137320
Test: manual test
Change-Id: I74d8d6db76001a68a648030e0c94f769d220d762
2022-09-12 15:54:05 +08:00
Bill Yi
e1bfdaf22a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24e95f7af07133bd771ec2b0383a9a17c798d932
2022-09-11 16:30:55 -07:00
Bill Yi
a4f092c748 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie871e5bb344fce432b8741e50b34954cf5fc6ec9
2022-09-11 16:28:01 -07:00
Bill Yi
61d351e93d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8de7d4371d314c5771fd9d8f41b664044929c7dc
2022-09-11 16:24:09 -07:00
Bill Yi
f3457e4080 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iee13f8fc3f15a25a78f77111b5098b3a01d5ab8f
2022-09-11 16:23:01 -07:00
Bill Yi
a23afa25c5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaeca6e9d0e33b825b8d12c9290e24d55eb42f268
2022-09-11 16:20:56 -07:00
Bill Yi
35b51c6a87 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib3c37e7786438380265a94b4279fa567eaef1e2e
2022-09-11 16:18:07 -07:00
Bill Yi
4e7b6570f2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5e2c2bbbbb8f401005698092c6fe33fed146f8f8
2022-09-11 14:23:07 -07:00
Bill Yi
81220df197 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I50cebd2a6b399e1b5c41a921bfdb096b173a2eb8
2022-09-11 14:19:20 -07:00
Chaohui Wang
7fe7ef383e Clean up some UnusedResources detected by lint 2
Bug: 234570979
Test: Manual with Settings App
Change-Id: I2421f1147ce8c9b09c2428355610a9089481d547
2022-09-10 17:34:11 +08:00
Ganesh Olekar
a396bf859a Merge "Update capitalization of preference in app info All Services -> All services" 2022-09-09 20:19:27 +00:00
Rambo Wang
145c954a33 Hide roaming option when carriers force all networks as HOME networks
This change will hide roaming option in carrier's network setting
if the carrier overrrides the carrier config force_home_network_bool
to true.

Some carriers, like google Fi, has no concept of roaming. The carrier
config force_home_network_bool is overridden to true to treat all
cellular networks as home networks. There is no actually impact when
user turn on/off the roaming option in network setting. Leaving an
unused option just confuse many end users.

Bug: 79424760
Test: make && make RunSettingsRoboTests
Test: activate Fi service and make sure no roaming option
Test: activate VZW service and make sure roaming option is present
Test: override the cc config with adb command to make sure the roaming
option is always correctly shown/hidden on the cc key values

Change-Id: If6d0f7e3a5edea368b3a725afd9a2b4d1ad686ed
2022-09-09 12:28:40 -05:00
Abel Tesfaye
febccc4990 Cleanup listener reference in SmartAutoRotate
This will fix a memory leak caused by dangling SensorPrivacy listeners.

Test: opened/closed display and auto-rotate fragment and verified no
leaks in android studio profiler
Bug: 244382423

Change-Id: Ie2d070e796fa473e8f2794c9934c62edc4f7092c
2022-09-09 17:12:08 +00:00
Ganesh Olekar
211be2e2c7 Update capitalization of preference in app info All Services -> All services
Bug: 244216312
Test: Verified manually
Test: atest CtsPermission3TestCases:android.permission3.cts.PermissionAllServicesTest#testAllServicesPreferenceShownWhenAppIsLocationProviderAndCanHandleClick
Change-Id: Ie8b961e8f9061ec7de196331d91b722cbbd7b567
2022-09-09 16:45:35 +00:00
Grace Cheng
b863718dce Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev am: 19ee730df2 am: 3dc93daa7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885882

Change-Id: Ie3fadf7e7136f64275a112268f09ce455e568457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 16:43:39 +00:00
Treehugger Robot
8552428dbc Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb am: 2d1b325cd0 am: 5d3e2d3f42
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I6faff06b6096420bd58b7e8de3bf77c691f67c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 16:38:50 +00:00
Grace Cheng
3dc93daa7a Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev am: 19ee730df2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885882

Change-Id: Ia7abc775b5c535f7d126668f705830c8a2077726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 16:27:28 +00:00
Grace Cheng
19ee730df2 Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev 2022-09-09 16:24:06 +00:00
Treehugger Robot
5d3e2d3f42 Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb am: 2d1b325cd0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I8fc0d30dd8338152ce2e9c7dc7741b9543f6dcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 16:10:43 +00:00
Treehugger Robot
2d1b325cd0 Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: If71d8f5e024a9ecc993ff35140995c3627c85196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 15:46:13 +00:00