PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,819 Commits 1 Branch 0 Tags
df6994fddee91e52c139dd380fe9fc21ccf4098d
Commit Graph

136819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
df6994fdde Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib785a4293d260aff1213d104fa787ef02981304c
 2023-11-14 20:05:02 -08:00
josephpv
30e841ce75 Add One Lock settings inside private space settings page 
This includes below changes:
1. Add new sub settings page in Private Space settings with option to
   swithch between private profile lock and device screen lock
2. Call Private profile lock setup when swithcing to private lock from
   screen lock.
3. Preference to change private lock when a separate Private lock is set

Bug: 308862923
Test: atest UseOneLockPreferenceControllerTest,
PrivateSpaceLockControllerTest

Change-Id: I0a6d8c7dfbd0ffea19db03ffd6dfe7aa520c9684
 2023-11-14 21:27:10 +00:00
Wa Gao
5c8204c502 Merge "Fix the NullPointerException in ContentProtectionTogglePreferenceController. Bug: 310658123" into main 2023-11-14 20:08:07 +00:00
Daniel Norman
64bfe882c8 Merge changes from topic "b-303511250-dedupe-warning" into main 
* changes:
  Tech debt cleanup: Consolidates A11yService warning dialog.
  Includes android.view.accessibility Aconfig flags in Settings.
 2023-11-14 18:56:15 +00:00
Chelsea Hao
92fee9f552 Merge changes Icfeafa14,I775e640b,I8d0d8150 into main 
* changes:
  [Audiosharing] Create progressCategory to show stream.
  [Audiosharing] Created audiostreams package.
  [Audiosharing] Branch existing LE QrCode scanner.
 2023-11-14 11:14:24 +00:00
Yiyi Shen
3efd326df6 Merge "[Audiosharing] Impl the join audio sharing dialog." into main 2023-11-14 11:03:13 +00:00
chelseahao
eef358eb92 [Audiosharing] Create progressCategory to show stream. 
Bug: 308368124
Test: Manual
Change-Id: Icfeafa14ec57782f520e66df74332cdbe3ac5d9f
 2023-11-14 10:28:48 +00:00
Yiyi Shen
475f87bedc [Audiosharing] Impl the join audio sharing dialog. 
Show the dialog when the first or second eligible remote device connected during the
sharing session;
Or when the second eligible remote device connected and
no sharing session.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: If59025d60821b00c169e0d739f4b68c31ce4bbbd
 2023-11-14 18:09:45 +08:00
chelseahao
af0d38fbec [Audiosharing] Created audiostreams package. 
Also updated some resource names.

Bug: 308368124
Test: Manual
Change-Id: I775e640bb34a02ee104cefd9a396af6a9f2fbb6e
 2023-11-14 17:23:37 +08:00
Yiyi Shen
145733011c Merge "[Audiosharing] Impl the switch audio sharing dialog." into main 2023-11-14 09:13:34 +00:00
Manish Singh
402385c6c2 Merge "Remove CreatePrivateSpace entry from Private Space settings" into main 2023-11-14 09:05:07 +00:00
chelseahao
74b9b9dbb4 [Audiosharing] Branch existing LE QrCode scanner. 
Bug: 308368124
Test: Manual
Change-Id: I8d0d8150baedfee7d74f60a3c18ecbc93271cada
 2023-11-14 16:53:10 +08:00
Yiyi Shen
2a2a748db4 [Audiosharing] Impl the switch audio sharing dialog. 
Show the dialog when a third eligible remote device connected during the
sharing session.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: Ib6627b68ef3d70305e9136e09a079bb53a459b85
 2023-11-14 15:31:45 +08:00
Angela Wang
c01677b676 Merge "Removes hearing aids settings page flag" into main 2023-11-14 06:47:36 +00:00
SongFerng Wang
aaedd35c6c Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3 am: 9461ac87e8 am: 15f5c288b3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051

Change-Id: I88747c0057b32d3e14ea7e83bf9ebc2c8c6b73a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 06:26:36 +00:00
SongFerng Wang
9d4fae2784 Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3 am: 919149ceee am: 5b865281fd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051

Change-Id: I97c6050ea31e7be1464eaede981fb2d5ec27822d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 06:26:23 +00:00
SongFerng Wang
15f5c288b3 Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3 am: 9461ac87e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051

Change-Id: I3fc60791e9d13906aea439d8378941d330a473df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 05:56:42 +00:00
SongFerng Wang
5b865281fd Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3 am: 919149ceee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051

Change-Id: Ibadb5404e51cf60c5f0e6336772e6ccafc29e996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 05:54:53 +00:00
SongFerng Wang
9461ac87e8 Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051

Change-Id: I3e386820da6d8f8fbd7630cd67c983ae4f684899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 05:23:27 +00:00
SongFerng Wang
919149ceee Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051

Change-Id: I7aea20dab1bc3cede5a0d13475d9c3933d656b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 05:23:18 +00:00
Alice Kuo
cd783b244c Merge "Show LE audio toggle summary as default connection is classic" into main 2023-11-14 05:10:11 +00:00
SongFerng Wang
6a04355cb3 Merge "Add a config to hide "Enable wireless display" menu" into main 2023-11-14 04:52:43 +00:00
Wa Gao
cd9c661b37 Fix the NullPointerException in ContentProtectionTogglePreferenceController. 
Bug: 310658123

Change-Id: I249a76ff1f432cb76269b1ac2cc3fe26e86b2bae
 2023-11-14 03:44:42 +00:00
Chaohui Wang
3300f2388a Merge "Migrate MainSwitchBar in Settings to Material3" into main 2023-11-14 03:42:54 +00:00
YK Hung
4d11ab6e56 Merge "Update incompatible charger checking rule" into main 2023-11-14 02:47:29 +00:00
Chaohui Wang
a333c2a1a3 Migrate MainSwitchBar in Settings to Material3 
Settings UI changed in this cl.

Bug: 306658346
Test: manual - on Settings pages
Change-Id: I06f0cef90453c20855e71ea96c7bca72d1fb1017
 2023-11-14 10:40:43 +08:00
Roy Luo
ef2cd0640e Update incompatible charger checking rule 
Use COMPLIANCE_WARNING_DEBUG_ACCESSORY to mock incompatible charging
event as COMPLIANCE_WARNING_OTHER is being deprecated.

Bug: 308700954
Bug: 310660470
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Flag: ACONFIG enable_input_power_limited_warning ENABLED
Change-Id: Ib6f7cf253344db99a8cc1d06c59a5c35d40f736f
 2023-11-14 01:44:06 +00:00
Bill Yi
e4300ace72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e58050c2f5 -s ours am: ba17ea49b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bff5b409ae7ef503d1fe78714a4b25f6376afe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 00:21:20 +00:00
Bill Yi
ba17ea49b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e58050c2f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2ac84e6e186ca1b8c819afc7518c69e9c5afd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 00:09:45 +00:00
Bill Yi
e58050c2f5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e48f165a79129fe82b622fdd0be2df01d985ef4
 2023-11-13 13:26:59 -08:00
Mike Schneider
11d12705d7 Merge "Revert "Migrate MainSwitchBar in Settings to Material3"" into main 2023-11-13 15:25:16 +00:00
josephpv
499eab137f Remove CreatePrivateSpace entry from Private Space settings 
Bug: 309581188
Test: Manually verified the item is not shown in Private Space Settings page
Change-Id: I08dca5a07256855ef629aabc68dde9058c00d333
 2023-11-13 14:59:13 +00:00
Mike Schneider
b8c4ca078f Revert "Migrate MainSwitchBar in Settings to Material3" 
Revert submission 25338737-settingslib_main_switch

Reason for revert: breaks packages/modules/AdServices/adservices/apk/tests/settingsgaota/src/com/android/adservices/ui/settingsga/SettingsGaUiAutomatorTest.java (https://android-build.corp.google.com/test_investigate/?invocationId=I66100010216561043&testResultId=TR33729044105357424)

Reverted changes: /q/submissionid:25338737-settingslib_main_switch
Bug: 310546637
Change-Id: I7ab391d97ed5b784818121304ffa5e984bdf65c4
 2023-11-13 13:27:23 +00:00
Treehugger Robot
64ca18c5f6 Merge "Tweak the UI display in the IPv6 address" into main 2023-11-13 11:43:13 +00:00
Alice Kuo
24ef70212d Show LE audio toggle summary as default connection is classic 
Bug: 310092817
Test: manual test
Change-Id: I733650a129dcbc9ab3acbb758c5a619359e25e4e
 2023-11-13 18:11:31 +08:00
Chelsea Hao
c31f3564a4 Merge "[Audiosharing] Display broadcast QR code." into main 2023-11-13 09:44:27 +00:00
Yiyi Shen
d2c3614829 Merge "[Audiosharing] Impl the stop audio sharing dialog." into main 2023-11-13 09:43:46 +00:00
Jason Chiu
abe0c76cbf Merge "Prevent ANR while receiving volume broadcasts to update slices" into main 2023-11-13 09:36:59 +00:00
Treehugger Robot
2933f4d4b8 Merge "Fix the robo test case failed" into main 2023-11-13 08:30:22 +00:00
chelseahao
e8b3081f17 [Audiosharing] Display broadcast QR code. 
Bug: 308368124
Test: Manual
Change-Id: I19ec1d15ab26e178b4bb1d9ea1d84dcce0dcc109
 2023-11-13 15:54:53 +08:00
Charlotte Lu
7f1536d87b Merge "Add System update for Software Update." into main 2023-11-13 07:54:16 +00:00
Sunny Shao
3233c71d6e Tweak the UI display in the IPv6 address 
- Replace the PreferenceCategory with Preference.

Fixes: 246489166
Test: SettingsRoboTests:com.android.settings.wifi
Change-Id: Ide4d36e7ad5c0850cd53010c811e01714c1c1f76
 2023-11-13 15:46:27 +08:00
Hansen Kurli
d949f3e0e9 Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 16fd898705 am: 53aac10cab 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: I2b09d3d9af99a827108d6e2c80bf549510055e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 07:27:46 +00:00
Hansen Kurli
57fc6301dd Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 3a33f7178f am: c58030dcb0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: If90532bcf8c83e2088ee1d284c0b440c5ca6f16d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:54:15 +00:00
Hansen Kurli
53aac10cab Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 16fd898705 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: Ife7070b102904af0c5eb21bf3a899de9b01d79ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:54:06 +00:00
Hansen Kurli
c58030dcb0 Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 3a33f7178f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: I781d4ca1e43869586543737ad357093630202319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:52:32 +00:00
Hansen Kurli
3a33f7178f Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: I84a308d94aed266f5125977cd7a385c315a72047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:05:58 +00:00
Hansen Kurli
16fd898705 Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: Iba8a2d2cdd2730cc0cdf4e5c851866badbbc06a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:05:18 +00:00
Sunny Shao
94bf9d9bc3 Fix the robo test case failed 
- Fix the test case failed in the
  ControlsTrivialPrivacyPreferenceControllerTest.
- Use the correct paramter in the PackageManager.resolveActivity API.

Fixes: 300378707
Test: atest ControlsTrivialPrivacyPreferenceControllerTest
Change-Id: Id80dfb95ceffb048461b79d2d5ceb67100f83cd5
 2023-11-13 14:00:25 +08:00
Hansen Kurli
485e8800ed Merge "Catch UnsupportedOperationException of startLegacyVpn" into main 2023-11-13 05:27:07 +00:00