Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,704 Commits 1 Branch 0 Tags
202b3b147b1f1ff0679ea5ba2bc00ffe6b80132c
Commit Graph

29436 Commits

Author SHA1 Message Date
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
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
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
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
Bruno Kremp
0d0736c46c Add a config to hide "Enable wireless display" menu 
Add config_show_wifi_display_enable_menu to control whether to
display "Enable wireless display" menu at Settings->
Connection preference->Cast.

If persist.debug.wfd.enable is 1, "Enable wireless display" menu will be
shown at Settings->Connection preference->Cast. Add a config to hide the
menu when needed.

setHasOptionsMenu is invoked in onActivityCreated of the parent class of
WifiDisplaySettings. No need to invoke it in onCreate.

Co-authored-by: Jingqiu Zhao <jingqiu.zhao@sony.com>

Test: manual test
Bug: 289532978
Change-Id: I146fb8188e783fed98d9fe56050e384bc4cca052
 2023-11-10 10:43:40 +01:00
Treehugger Robot
ff03ce88ff Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: Ic8c0f7ceec443aca5172cd38ede765781640dc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 21:03:30 +00:00
Roshan Pius
ad565c49dc settings(nfc): Remove NFC beam settings 
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Merged-In: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
 2023-10-30 19:42:47 +00:00
Cassie Wang
16e99c187f Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: Ib8a236bd666204b48faac0189fbcc1acfcb3e8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 06:13:58 +00:00
Cassie Wang
5abd3420c4 Merge "Add a config to show the Vpn options menu." into main 2023-10-23 05:53:32 +00:00
Peiyong Lin
3182b0e298 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. 
Add a debug property to guard ANGLE developer option UI, only when the
debug property is enabled will ANGLE developer option UI be enabled.

Add further clarification in the text to indicate that this is an
experimental feature.

Bug: b/287909344
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
Merged-In: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
 2023-10-17 21:06:05 +00:00
Peiyong Lin
d3c75bd9eb [Cherry-pick] Add warning on enabling ANGLE. 
Enabling ANGLE on incompatible devices may cause some applications to
crash, add a warning.

Bug: b/287909344
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I4f856ee1912a59052a6aaf7dff087ce1b649935e
Merged-In: I4f856ee1912a59052a6aaf7dff087ce1b649935e
 2023-10-17 21:02:47 +00:00
Graciela Putri
8319a77527 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev am: 6e9666ab53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956690

Change-Id: Ib02ae9caef06a46938947806dac8aabb1fa12d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 09:45:46 +00:00
Graciela Putri
6e9666ab53 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev 2023-10-12 09:30:41 +00:00
Cassie Wang
760712201e Add a config to show the Vpn options menu. 
Bug: 290124499
Test: m -j32 Settings
Change-Id: I14d59b656e917f6fb7a495f14297c594a115c018
 2023-10-10 13:07:00 +09:00
Graciela Wissen Putri
fcba73e30e Add aspect ratio settings to advanced category children 
Fix: 303823822
Test: Manual && atest AppDashboardFragmentTest
Change-Id: I5778efa6a1a790d76d9d35d1597d82fdc3707b3b
 2023-10-09 17:35:07 +00:00
Bill Yi
72eabac183 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If9da2309b45158c64d96649e6cf2ddf7e8e069bb
 2023-10-06 19:49:10 -07:00
Bill Yi
7ed1b0ce85 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7b243481813f39dda575345466ec96b700047c81
 2023-10-05 12:11:54 -07:00
Bill Yi
ff577eb181 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-10-05 12:57:34 +00:00
Bill Yi
074f4414b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28c0c489fdde63242fd894d923e53a2a412216df
 2023-10-04 17:51:12 -07:00
Bill Yi
c96329e0ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8267aa212eafd5182fc64ab90f314f4b91cfac64
 2023-10-04 17:49:43 -07:00
Bill Yi
96e0207271 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-10-04 18:44:46 +00:00
Graciela Putri
641b310890 Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev am: 963869ecda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24937325

Change-Id: I39d4b0e6ffa0f071d97e4dd9b2c36c1ed22c3a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:16:08 +00:00
Graciela Putri
963869ecda Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev 2023-10-04 17:54:24 +00:00
Graciela Wissen Putri
7bc951d205 Add controller to Advanced category in Apps page 
Settings > Apps > Advanced (category)

Fix: 303309762
Test: Manually by disabling aspect ratio settings
Change-Id: I262fc954ad8d5ad65b24cc0966b8e5392cea65e5
 2023-10-04 14:12:03 +00:00
Graciela Putri
112b5765e0 Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904381

Change-Id: I6ad5d7d6d9972dca2e42462440648e90f09b28e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 13:32:33 +00:00
Graciela Putri
b5b8bd54a0 Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev 2023-10-04 13:04:26 +00:00
Bill Yi
ffa2b27001 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia3a5770648f70f431777132ab3b8ea1bcfb5992b
 2023-10-03 22:40:57 -07:00
Graciela Wissen Putri
e08d0f88d3 Add warning text to Aspect ratio app info header 
Settings > Apps > App info > Aspect ratio

Fix: 301440671
Test: Manual
Change-Id: I1d24a38c37cfb95e5711308c96f1fc8da91d5e53
 2023-10-03 14:34:18 +00:00
Bill Yi
f060312e5b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I59f4f7a408f09877933e2f1e10ed17b0bb6c14f6
 2023-10-02 22:02:18 -07:00
Bill Yi
f336e73db9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I98c3767b717948c0458985d76344f96bd55f6703
 2023-10-02 00:05:50 -07:00
Bill Yi
582d855820 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieac96bbd522889663356dd647c7724e2c7466fe3
 2023-09-29 07:56:46 -07:00
Bill Yi
9a21ad3bdd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7d55bf64f4bb60e2e44ca0e645601f44b624912b
 2023-09-27 13:36:20 -07:00
Eghosa Ewansiha-Vlachavas
12f9e22438 Merge "Create new user aspect ratio summary strings" into udc-qpr-dev am: 630758f4e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24853822

Change-Id: I2a4ab9c5c47aa9ac6a57d2f50e433d279c51d586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 07:08:27 +00:00
Eghosa Ewansiha-Vlachavas
630758f4e0 Merge "Create new user aspect ratio summary strings" into udc-qpr-dev 2023-09-27 06:27:07 +00:00
Peiyong Lin
759a3fda7b Merge "Add debug property to safe guard ANGLE developer option UI." into udc-qpr-dev am: e456cb72f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842231

Change-Id: Iaae1e5f2747e8e6d62c5426ded572b792642e9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 20:35:23 +00:00
Peiyong Lin
e456cb72f9 Merge "Add debug property to safe guard ANGLE developer option UI." into udc-qpr-dev 2023-09-26 19:19:37 +00:00
Eghosa Ewansiha-Vlachavas
734aae86d4 Create new user aspect ratio summary strings 
Fixes: 301224168
Test: Manual
Change-Id: I91eaa96b30bb37cc46620b763ee2e3217dbc8876
 2023-09-26 16:59:34 +00:00
Bill Yi
4bd597bddf Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-25 19:45:33 +00:00
Bill Yi
c49656808b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-25 19:45:33 +00:00
Peiyong Lin
774378530f Add debug property to safe guard ANGLE developer option UI. 
Add a debug property to guard ANGLE developer option UI, only when the
debug property is enabled will ANGLE developer option UI be enabled.

Add further clarification in the text to indicate that this is an
experimental feature.

Bug: b/287909344
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
 2023-09-25 18:33:00 +00:00
Treehugger Robot
d74ddbd6ef Merge "Fix tint of battery icon" into udc-qpr-dev am: 8a9074278a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842149

Change-Id: I854f3002c282c6909bd79eeecb839045ee8119ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 04:57:40 +00:00
Isaac Katzenelson
7a4d2720e4 Fix tint of battery icon 
Bug: 300559036
Test: Visual test
Change-Id: Id4c7e7ec9f330432c01fa7fcee2474b2fe61f642
 2023-09-22 22:34:15 +00:00
Weng Su
7cbef7df1f Update Battery preference for Instant Hotspot am: ab895fdb9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24834492

Change-Id: If9568f609efa9fb0484697eceac1f7f9a136abff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 18:06:51 +00:00
Weng Su
ab895fdb9b Update Battery preference for Instant Hotspot 
- Use the static battery full icon

- Show charging status in Battery preference summary

Bug: 300559036
Test: manual test
atest -c WifiNetworkDetailsFragmentTest

Merged-In: I89e811ba0d1b715d4fff23c96bc094cd4270fef7
Change-Id: I89e811ba0d1b715d4fff23c96bc094cd4270fef7
 2023-09-22 20:36:38 +08:00
Bill Yi
1c8c067128 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idcf059055e5a9e087b2b15ca5e71c3817e0a0f82
 2023-09-22 02:26:27 -07:00
Bill Yi
792e7ec3e7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If15a814a2b0e43dc0da0888b8a6e5c5b5dc7287b
 2023-09-22 02:21:58 -07:00
Graciela Putri
12867d5a88 Merge "Change title to aspect ratio (experimental)" into udc-qpr-dev am: f1c7bf3440 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24799914

Change-Id: Ic630fd0179a9fd06a03df3a9b85ec38b021ac665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 19:37:40 +00:00
Graciela Wissen Putri
bbb58cac69 Change title to aspect ratio (experimental) 
Settings > Apps > Aspect ratio (experimental)
Settings > Apps > App info > Aspect ratio (experimental)

Fix: 300219974
Test: Manual && atest SettingsSpaUnitTests
Merged-In: I359c744025232c6a6ebd9628dbf91acac85b53e9
Change-Id: I359c744025232c6a6ebd9628dbf91acac85b53e9
 2023-09-20 21:57:57 +00:00
Xinyi Mao
8d91b3116b Merge "App anomaly tips on PowerUsage App list" into udc-qpr-dev am: 821ed07099 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677374

Change-Id: I15dad922e0942175e56370a7001ada1afe2c19b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 03:36:03 +00:00