PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
140,916 Commits 1 Branch 0 Tags
792b43221da8da0622690d16f8efc0d03c97bd08
Commit Graph

140916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
792b43221d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e70d26c5a -s ours 
am skip reason: contains skip directive

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

Change-Id: Id88a0c879ccf81f8d82106f0f00ddfdfdebba9ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:32:36 +00:00
Bill Yi
c6c3ac81d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94083b1eb -s ours 
am skip reason: contains skip directive

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

Change-Id: I37187d29cc5ff70158259005f26691b2c54873f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:32:32 +00:00
Treehugger Robot
262852a641 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-07 17:04:36 +00:00
Treehugger Robot
7d4833dc37 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-07 17:04:36 +00:00
Treehugger Robot
7882d51ddf Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-07 17:04:36 +00:00
Treehugger Robot
87334e9c38 Merge "Add Settings for vector-specific PointerIcon fill colors." into main 2024-06-07 16:31:59 +00:00
Joseph Vincent
933971ff15 Merge "Fix to display text properly in PS education screen" into main 2024-06-07 12:57:29 +00:00
josephpv
cbf3dad3f5 Fix to display text properly in PS education screen 
This changes the style for text in private space education screen
bullet point to fix the text not displaying properly in unfolded mode of
Pixel fold.

Recording: b/340231182#comment4

Bug: 340231182
Test: Manual
Change-Id: I4da02da6ddf6b4f048cc58331d14cda389f13dec
 2024-06-07 11:07:11 +00:00
YK Hung
06ee9cdb27 Merge "Allow wireless charging label to customize content descriptions" into main 2024-06-07 10:55:26 +00:00
Joseph Vincent
b6e9469834 Merge "Revert "Add footer in private space auto lock settings page"" into main 2024-06-07 10:24:38 +00:00
Joseph Vincent
a4ce3bec70 Revert "Add footer in private space auto lock settings page" 
This reverts commit 5fd6d6435b.

Reason for revert: As per b/343166689#comment4 this change as this is not needed based on the feedback from leads review.

Change-Id: Iad31aafbce5f3f9fc37fdd8fb4d5582cfae9d8b7
 2024-06-07 09:18:54 +00:00
Treehugger Robot
1b791e8b1b Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762 am: 95da1e4de2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024

Change-Id: Ie62ff501460906c7973a0c393f61d284c0599a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 09:15:35 +00:00
Yiyi Shen
2909bf380e Merge "[Audiosharing] Log action when change primary device" into main 2024-06-07 09:09:24 +00:00
Treehugger Robot
95da1e4de2 Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024

Change-Id: Ibb00cb80a1d0c34a5a73f26b21ebe212692fc49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 08:56:58 +00:00
Treehugger Robot
1bb8e28762 Merge "Fix NPE force close if disabling BT feature" into main 2024-06-07 08:35:48 +00:00
Yiling Chuang
6dc8193d81 Allow wireless charging label to customize content descriptions 
Fixes: 343616480
Test: atest SettingsRoboTests
Change-Id: I0d87b50fd88167b57ce9d9b06d776ba2ebe304ea
 2024-06-07 07:20:22 +00:00
hoffc
de3f413ecd Fix NPE force close if disabling BT feature 
adapter can be null in some SPs which disable bluetooth feature
from framework, so it will lead to NPE force close in these SPs.

Add null check for adapter.

Bug: 345584461

Change-Id: I3fabe94a97cc9baf7b1739fe1c9160a52b50d7d4
 2024-06-07 13:00:03 +08:00
Chaohui Wang
efa1f0e3ed InternetPreferenceController V2 (1/n) 
Refactor the InternetPreferenceController, migrate to repository and
flow, run data loading on background thread.

Only add Wifi summary for now.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ibd8911bc11b24d4a7e2ef320dea4d38b9c3a864f
 2024-06-07 12:28:44 +08:00
Weng Su
2ac12d024f Merge "Fix Wi-Fi calling test case" into main 2024-06-07 03:47:24 +00:00
Ang Li
d20d913a13 Merge "Re-enable settings password tests." into main 2024-06-07 03:21:26 +00:00
Joseph Vincent
4885f1833c Merge "Remove temp GAIA education screen from PS setup code" into main 2024-06-07 02:47:30 +00:00
Bill Yi
8cc5c6de9c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iba71587b6e1c30fa1d4bc721c69de96289e89b74
 2024-06-06 19:05:39 -07:00
Ang Li
68f1397e1c Re-enable settings password tests. 
Bug: 344611440
Test: atest -c SettingsRoboTests
    (http://fusion2/749378e0-712e-4817-a490-d80f044c2f37)
Change-Id: I7d3f69df19accf9d22040706dba74ae6be304e85
 2024-06-07 02:05:17 +00:00
Bill Yi
8e70d26c5a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied4d3699516465c3e725b70d02d2b3c96f5c1a00
 2024-06-06 19:03:28 -07:00
Bill Yi
d7e7e6dca3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I833fc6d1e2bae38afc9c6b003077290dd7b6dfc8
 2024-06-06 19:01:39 -07:00
Bill Yi
f94083b1eb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2e1fe9d37d18b7798782cad6d9d1f7e51b3b7125
 2024-06-06 19:00:10 -07:00
Bill Yi
0e3965dc66 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I41aedaaef23f4a5bdcb7c298205318f3ddf1e4a3
 2024-06-06 18:59:17 -07:00
Treehugger Robot
96a1e43d98 Merge "Loading the A11yHearingAidPreference summary in the background" into main 2024-06-07 00:26:38 +00:00
Chun-Ku Lin
b80641ba26 Loading the A11yHearingAidPreference summary in the background 
Bug: 327052480
Flag: EXEMPT low risk bug fix
Test: atest com.android.settings.accessibility
Change-Id: I644be0c7ee289a4ea675984068ac494b97ebff68
 2024-06-06 23:11:51 +00:00
Weng Su
ca13280e56 Fix Wi-Fi calling test case 
Fix: 337417499
Flag: TEST_ONLY
Test: atest passed
atest -c NetworkProviderWifiCallingGroupTest

Change-Id: I2d57287a85075685b0bdb35a59dc8b147e90d38c
 2024-06-06 21:39:00 +00:00
Xin Li
ad8021701f [automerger skipped] Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future am: 9bf082ae01 -s ours 
am skip reason: Merged-In Id3d79805bb2289b84ad34ac05a97e50f0410502f with SHA-1 a39c14c08e is already in history

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

Change-Id: I10c5cffa58c6b723183c73bd20dd449d4f545653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 21:37:43 +00:00
Xin Li
f53ece6b3f [automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 3c3a1cc6c6 -s ours 
am skip reason: Merged-In Id3d79805bb2289b84ad34ac05a97e50f0410502f with SHA-1 a39c14c08e is already in history

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

Change-Id: I65a2176a53e8e0abc5ca9a7459577b7bb776b49f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 21:36:05 +00:00
Xin Li
9bf082ae01 Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:42 +00:00
Julie Pan
7eac19fc3f Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main am: ce2a5e07e2 am: 33e2eb32fa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118591

Change-Id: I44916de88f8c594814f46d5ccd36ec910981926c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 20:15:33 +00:00
Julie Pan
33e2eb32fa Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main am: ce2a5e07e2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118591

Change-Id: I46352b557bef347fd55d89c0fbdd29d87d52c1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 19:54:52 +00:00
Julie Pan
ce2a5e07e2 Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main 2024-06-06 19:25:25 +00:00
Owner Cleanup Bot
88ab066a66 Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS 
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote CR -1 and the bot
will abandon it. Vote CR +1/2 to approve this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/beccahughes@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: I8563f73848a4e32ff3da4b1eaf34253374d9012c
 2024-06-06 17:47:53 +00:00
Treehugger Robot
08fc7f85e7 Merge "Add Enable16KbTest to TEST_MAPPING" into main am: c3c33df4fc am: 8c0d308276 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111923

Change-Id: Ic75ddfccfaaa1e9074c13e933e62982ed3ed9563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 17:28:54 +00:00
josephpv
d27f97393d Remove temp GAIA education screen from PS setup code 
With this change the temp GAIA education screen is removed from private
space setup code and adds a new loading screen with "Just a sec" title
in the activity while the gms intent in launched to fix blank screen issue.

Screenrecording link:
b/336822960#comment7

Bug: 336822960
Test: Manual
Change-Id: I9ee41835b39c194fefb970321b7a9d5a30f87306
 2024-06-06 17:18:55 +00:00
Treehugger Robot
8c0d308276 Merge "Add Enable16KbTest to TEST_MAPPING" into main am: c3c33df4fc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111923

Change-Id: I374aa31dde3f310e30462e82422dca679274ebee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 16:47:02 +00:00
Treehugger Robot
c3c33df4fc Merge "Add Enable16KbTest to TEST_MAPPING" into main 2024-06-06 16:28:25 +00:00
Treehugger Robot
0a281cbbae Merge "Fix test config" into main am: 4f19466f56 am: cd33904187 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3114506

Change-Id: I1541a1b2c75322c3cedb3c23a3c72b1ff894d937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 16:06:01 +00:00
Treehugger Robot
cd33904187 Merge "Fix test config" into main am: 4f19466f56 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3114506

Change-Id: I96194603f06e24effecbbf3f04cbea01e21e7c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 15:46:18 +00:00
Treehugger Robot
4f19466f56 Merge "Fix test config" into main 2024-06-06 15:35:07 +00:00
Pat Manning
577965f9c2 Add Settings for vector-specific PointerIcon fill colors. 
Bug: 305193969
Test: PointerIconLoadingTest
Flag: com.android.systemui.enable_vector_cursor_a11y_settings
Change-Id: I84b4a6d5fde48309c2e3374963f92b8246167628
 2024-06-06 14:41:00 +00:00
SongFerng Wang
1a2450c8cf Merge "Show cdma network mode choices" into main am: 392f07f415 am: 5a979e94a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999

Change-Id: I0563db1d6a4d11351951d3dca82b0f2b1799b184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 14:35:51 +00:00
SongFerng Wang
5a979e94a8 Merge "Show cdma network mode choices" into main am: 392f07f415 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999

Change-Id: I61a5556361fe2109864b6e7e10d47e081930d13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 14:24:26 +00:00
SongFerng Wang
392f07f415 Merge "Show cdma network mode choices" into main 2024-06-06 14:07:58 +00:00
Chaohui Wang
b04e2d4692 Merge "Fix mSubscriptionInfoEntity NullPointerException" into main 2024-06-06 09:43:17 +00:00
Tom Hsu
c417d19839 Merge "Avoid to save result of blank input." into main 2024-06-06 08:43:37 +00:00