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
Treehugger Robot
693ce48efb
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
am: 1f9c4c483a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: I2b246b643ff341ff8a2158cbabd3f4a33c04703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 15:18:57 +00:00
Treehugger Robot
1f9c4c483a
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: Ib115186ff66f8246082bc274624cb116a63c790c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 14:49:24 +00:00
Treehugger Robot
4378ee11ad
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController"
2022-09-09 14:20:05 +00:00
Chaohui Wang
af40681610
Merge "Clean up some UnusedResources detected by lint"
2022-09-09 12:51:49 +00:00
Chaohui Wang
28d838d5e7
Clean up some UnusedResources detected by lint
...
Bug: 234570979
Test: Manual with Settings App
Change-Id: I2ad634d9beba623a5cdcff015c9aa28d78525cb7
2022-09-09 16:51:12 +08:00
Zekan Qian
d9fff4beac
Merge "Add param name when use SettingsEntry.createInject api. Use SettingsPage.create api to create SettingsPage. Remove debug button in HOME page."
2022-09-09 08:29:56 +00:00
Chaohui Wang
03933264d6
Merge "Clean unused plurals"
2022-09-09 08:04:58 +00:00
Chaohui Wang
d22619e995
Migrate UsageStats to Spa
...
The UsageStats page is for testing only, cannot entry through Settings
Home, but is accessible by enter *#*#4636#*#* in dialer.
Migrate UsageStats to Spa for both improving the UI & performance.
Fix: 244675756
Bug: 235727273
Test: Manual with Settings App
Change-Id: I6ec6e233075a3f79ac1231aecafabf2a71dac716
2022-09-09 16:00:41 +08:00
Binyi Wu
9bc7ebca6e
Merge "Revert "Update capitalization of preference in app info All Services -> All services""
2022-09-09 07:14:34 +00:00
Grace Cheng
f15c726127
Update SFPS enrollment education assets and add light/dark theme colors
...
Updates SFPS enrollment education layout and adds new assets indicating
sensor location in each orientation. Also defines color codes and adds
LottieColorUtils to dynamically map LottieAnimationView colors from light/dark theme
Test: Observe correct assets during enrollment in all orientations
Fixes: 242074146
Fixes: 238596925
Change-Id: If3b7502350057cc9b04f12aa9a5b36be06958630
2022-09-09 07:09:27 +00:00
Eghosa Ewansiha-Vlachavas
b03d10985e
Merge "Update DPM.setProfileOwner call in DeviceAdminAdd"
2022-09-09 06:53:34 +00:00
Binyi Wu
4f536bf14c
Revert "Update capitalization of preference in app info All Services -> All services"
...
This reverts commit 96f95e7c6f
.
Reason for revert: DroidMonitor-triggered revert due to bug b/245852321
Change-Id: Ib9ba70779b6e961e945dd9de0ce83c5244cb158d
Test: presubmit
Bug: 245852321
2022-09-09 06:26:43 +00:00
Zekan Qian
6243eb3ec9
Add param name when use SettingsEntry.createInject api.
...
Use SettingsPage.create api to create SettingsPage.
Remove debug button in HOME page.
Bug: 244122804
Test: manual - build SettingsGoogle
Change-Id: I59b6f4c0ead0b3f0dc06eb238b074d2cf91cf74c
2022-09-09 14:23:35 +08:00
Chaohui Wang
5ef8a39dd3
Clean unused plurals
...
Bug: 199230342
Test: Make Settings App
Change-Id: I6d5d97285b9721c390036a10ad36f2dae46e1818
2022-09-09 13:19:17 +08:00
Shen Lin
78fc8a21a4
Fix potential NPE crash in ConversationHeaderPreferenceController
...
mChannel is nullable and we have to do a null-check before calling its method.
Bug: 245506600
Test: manual and atest
Change-Id: Ib739f0f66f1a2aee1b2741263e7c206341782892
2022-09-09 10:16:29 +08:00