Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,845 Commits 1 Branch 0 Tags
663c05e5243090effb5dace888aa8e25a0682ba7
Commit Graph

51631 Commits

Author SHA1 Message Date
Howard Chen
663c05e524 Merge "Disable factory reset in DSU mode" into main am: 8136e6d397 am: 8524cc8afd am: 9a7e7e0ed9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174

Change-Id: Id60b855b716ceba64b1fbc7137c9c059ba237fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 09:55:37 +00:00
Zoey Chen
57ee1f29b5 Merge "[Panlingual] Should show confirm dialog when use the action of accessibility to change the default locale Bug: 303777391 Test: manual" into main 2023-11-15 09:40:44 +00:00
Howard Chen
9a7e7e0ed9 Merge "Disable factory reset in DSU mode" into main am: 8136e6d397 am: 8524cc8afd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174

Change-Id: I91cd840928de7e9afa192b29a0d66a083b55e98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 09:05:19 +00:00
Howard Chen
8524cc8afd Merge "Disable factory reset in DSU mode" into main am: 8136e6d397 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174

Change-Id: I1020e5af5af7f91446d3afd290b643429163eb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 08:35:33 +00:00
Hansen Kurli
54627f0798 Merge changes I7a017026,I76a5c940 into main am: 520d7c6758 am: 6d96b61bfa am: 0a173b2618 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338

Change-Id: I60593753806b8804b2647bd9251f630b6203a764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 08:32:47 +00:00
Howard Chen
8136e6d397 Merge "Disable factory reset in DSU mode" into main 2023-11-15 08:07:44 +00:00
Hansen Kurli
0a173b2618 Merge changes I7a017026,I76a5c940 into main am: 520d7c6758 am: 6d96b61bfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338

Change-Id: Icfcc1db2845a86a32ea34e98e8eaa8c699dd89bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 07:42:57 +00:00
Hansen Kurli
6d96b61bfa Merge changes I7a017026,I76a5c940 into main am: 520d7c6758 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338

Change-Id: I8341c0f82c7ca00dba4cf2590d37d25f9d1072ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 07:09:08 +00:00
Yiyi Shen
07f2b54496 Merge "[Audiosharing] Impl a base controller for audio sharing page." into main 2023-11-15 06:43:07 +00:00
Hansen Kurli
520d7c6758 Merge changes I7a017026,I76a5c940 into main 
* changes:
  Remove the code of legacy VPN from Settings
  Remove legacy vpn types from R.array.vpn_types.
 2023-11-15 06:35:47 +00:00
YK Hung
ff40f003b8 Merge "Add protection for the ConcurrentModificationException" into main 2023-11-15 06:10:00 +00:00
ykhung
16b79cfdfb Add protection for the ConcurrentModificationException 
Fix: 310120803
Test: presubmit
Change-Id: I8526ed0c93570ba3e183b675b29bd9e9e1582f5a
 2023-11-15 11:32:00 +08:00
Peiyong Lin
714490851f Merge "Unconditionally enable ANGLE developer option UI." into main 2023-11-15 01:38:35 +00:00
Treehugger Robot
24c989a070 Merge changes from topic "wv-dev-opt" into main 
* changes:
  Add feature flag for force L3 dev option
  Add Widevine developer option to settings
 2023-11-14 22:54:03 +00:00
Wa Gao
bd073bc18c Merge "Hide the setting from the search when feature is disabled." into main 2023-11-14 22:16:32 +00:00
Kyle Zhang
519d26d8f0 Add feature flag for force L3 dev option 
Bug: 301669353
Change-Id: I289bed846982e94584fdb067e84186a61587d578
 2023-11-14 21:52:06 +00: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
6ffb674ff4 Hide the setting from the search when feature is disabled. 
Bug: 310243923
Change-Id: Idb3b903f19d81825e6f721a87ec8c5238c86118d
 2023-11-14 20:27:52 +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
Yiyi Shen
21ed1b0358 [Audiosharing] Impl a base controller for audio sharing page. 
The preference controllers attached to audio sharing page will extends
this base controller so that their visibility will be updated together
depending on the main switch state.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I3d37c87a128098a1b1a38cb8621be9a4d4e8c15e
 2023-11-14 20:00:28 +08: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
lucaslin
755662f72e Remove the code of legacy VPN from Settings 
IKEv2 VPN options are now functional, so removing the code of
legacy VPN. (i.e. PPTP, L2TP/IPSec PSK, L2TP/IPSec RSA,
IPSec Xauth PSK, IPSec Xauth RSA, IPSec Hybrid RSA)

Bug: 161776767
Test: Build pass, m
Test: Flash and manual test
Test: atest SettingsUnitTests:com.android.settings.vpn2
Change-Id: I7a017026adec2452254c78ef5e0ebf61ce1a9ecf
 2023-11-14 16:01:16 +08:00
Hansen Kurli
e554d06665 Remove legacy vpn types from R.array.vpn_types. 
Remove the legacy vpn types from R.array.vpn_types.
Since the array of vpn types are now all allowed, the case of
using mAllowedTypes is no longer needed and removed.

Since R.array.vpn_types no longer match the constants in
VpnProfile, a conversion is needed from the VpnProfile constants
to the selected type position and vice versa.

Bug: 161776767
Test: m
Test: Flash and manual test setup VPNs
Change-Id: I76a5c940acf08c6d6adfe6ff270f39808abf88ab
 2023-11-14 16:00:59 +08:00
Zoey Chen
a8b9414f13 [Panlingual] Should show confirm dialog when use the action of accessibility to change the default locale 
Bug: 303777391
Test: manual

Change-Id: I03c76a3f5672012470ef8256691a85e818ce4edb
 2023-11-14 07:43:00 +00: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
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
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
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
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
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
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
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