Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,257 Commits 1 Branch 0 Tags
ab59455727b429edf64098716dada38624ef8e88
Commit Graph

33603 Commits

Author SHA1 Message Date
TreeHugger Robot
6f11ad8534 Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev am: 7e3e9ed32a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835817

Change-Id: I1fe5682763d592f4ba0b0468e829f1b8cbb42991
 2021-04-06 08:55:57 +00:00
TreeHugger Robot
7e3e9ed32a Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev 2021-04-06 08:24:45 +00:00
Pavel Grafov
18c04f023a Prevent disconnecting admin-configured VPN am: 735a216da3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528

Change-Id: Ib7ccf10cba6c1f494bb4dcb7a711aa5a218f9dd8
 2021-04-02 18:57:25 +00:00
TreeHugger Robot
d86780ddc1 Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060694

Change-Id: I57dda339fa89ea790092b24c71a2ac2f0c443fdc
 2021-04-01 16:24:07 +00:00
Tsung-Mao Fang
d80c5bba40 Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I0312dc7bf253ef50a89848ae9879646200282e66
 2021-04-01 16:23:51 +00:00
TreeHugger Robot
9258e9ee9d Merge "Only display single line for title" into rvc-qpr-dev 2021-04-01 16:18:08 +00:00
Tsung-Mao Fang
bfb68fa6fe Merge "Revert "Only display single line for title"" into rvc-qpr-dev 2021-04-01 15:56:19 +00:00
Pavel Grafov
efab095931 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp 2021-04-01 13:49:32 +00:00
Pavel Grafov
735a216da3 Prevent disconnecting admin-configured VPN 
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.

Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j
Merged-In: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
 2021-04-01 12:39:32 +01:00
Tsung-Mao Fang
f7ae52bed6 Only display single line for title 
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e
 2021-04-01 05:48:04 +00:00
Tsung-Mao Fang
ba9215cbda Revert "Only display single line for title" 
This reverts commit 121041cf58.

Reason for revert: Some use cases don't need single line design. see b/184108687

Fix: 184108687
Change-Id: I1d095ae198cf2fd73eef39caf93895c7d96ca7f7
 2021-04-01 04:14:03 +00:00
Bonian Chen
5735be835c Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I6100fa84ad5be8d33bd20d9836ecd432a217fe7a
 2021-03-31 15:44:41 +00:00
Pavel Grafov
16d588c11a Prevent disconnecting admin-configured VPN 
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.

Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.vpn2
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
 2021-03-31 15:20:11 +00:00
Bonian Chen
194af56330 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" 
* changes:
  Revert "[Settings] Support getSystemService(Class<T>)"
  Revert "[Settings] Convert to getSystemService(Class<T>)"
 2021-03-31 14:30:40 +00:00
Bonian Chen
2b195b4335 Revert "[Settings] Support getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I5ca453c30c39d52e772033820f36ad448aeabe9e
 2021-03-31 09:37:03 +00:00
Bonian Chen
d6f54ed90b Revert "[Settings] Convert to getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
 2021-03-31 09:37:03 +00:00
Almaz Mingaleev
7d9233302f Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf am: 87273aab56 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336

Change-Id: I8cce932794d13dd8f9424883b9521a823583f335
 2021-03-30 09:39:21 +00:00
Almaz Mingaleev
dd2a685756 Allow alternative time zone ID to be set device's zone. 
If America/Godthab is set as device time zone, display it as if
America/Nuuk is chosen.
If time zone is known, but is not an alternative and not shown
in time zone picker, region will de derived from user's locale.

Bug: 155738410
Test: atest com.android.settings.datetime.timezone.model
Test: set persist.sys.timezone via adb and checked
Date & Time screen

Change-Id: I168fb4319e144dbe9e2496d06a681d4c09b411c0
 2021-03-29 11:18:57 +01:00
Peter Wang
5ef6e587c1 Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I82d7a91f9136998b8b438627ed68248a22c1dfa6
 2021-03-25 21:36:39 +00:00
Peter Wang
5babfac3d1 Fix coding styles for erase euicc only options 
Bug: 159650638
Test: Build
Change-Id: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
Merged-In: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
 2021-03-25 11:13:29 -07:00
Peter Wang
447fc31966 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: I7a0a8993fbadd72cfe1dfb16879fb235b67ff007
 2021-03-24 19:32:58 +00:00
Peter Wang
0b5532f67c Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2021-03-24 18:12:14 +00:00
Weng Su
0b34d62f6b Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393

Change-Id: If5fddd3870d6c1bf94cf235439bf3543432824d9
 2021-03-24 05:25:04 +00:00
Janis Danisevskis
a308ea1915 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I590f53d3a4c1b6ad9c4bdb27f04103ccfba7e7af
 2021-03-23 04:09:47 +00:00
Janis Danisevskis
7aa99fe966 Merge "Keystore 2.0: Remove references to Keystore 1.0" 2021-03-23 03:14:28 +00:00
Janis Danisevskis
75a91836e7 Keystore 2.0: Remove references to Keystore 1.0 
Test: N/A
Bug: 171305684
Change-Id: I8b50c024e919d5b98348b792e0769c510ff1a33d
 2021-03-22 13:35:53 -07:00
SongFerng Wang
8722e00b4a Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810 am: d1278a3d3d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427

Change-Id: I2618da0e75674e7c3c878f5aee50278ac0c0e76a
 2021-03-22 19:34:15 +00:00
SongFerng Wang
5292baf810 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" 2021-03-22 19:06:48 +00:00
Weng Su
020af77825 Hide edit menu if network is uneditable 
- Screenshot:
  https://screenshot.googleplex.com/3BhZRBrmQXjeaGL

Bug: 161896161
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Merged-In: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
Change-Id: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
(cherry picked from commit b7dbd3a911)
 2021-03-22 09:43:57 +00:00
Bonian Chen
f9f2fe3f84 Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152

Change-Id: I89fa2de521bb07911f0c7ee0122ba3b2cb062fab
 2021-03-22 09:36:16 +00:00
Bonian Chen
8cd695efea Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 am: 5734490d23 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: I2630ee28b766890d36bbc4c360eeb19d07ef73d7
 2021-03-22 09:36:14 +00:00
Bonian Chen
13fb77c652 Merge "[Settings] Convert to getSystemService(Class<T>)" 2021-03-22 08:18:59 +00:00
Bonian Chen
513da92357 Merge "[Settings] Support getSystemService(Class<T>)" 2021-03-22 08:18:59 +00:00
SongFerngWang
e88740eae2 KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray 
Bug: 179814490
Test: build pass
Change-Id: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
Merged-In: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
 2021-03-22 07:17:22 +00:00
Bonian Chen
db6c47756d [Settings] Convert to getSystemService(Class<T>) 
Change to getSystemService(Class<T>) to align the capability with framework
part.

Bug: 179640862
Test: local
Change-Id: I1b4812044fc4876bec6645570049a60f9470dbbd
 2021-03-22 06:20:19 +00:00
SongFerng Wang
34c8d35cd3 Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b am: b3f2e9090a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828

Change-Id: I5ba679ca3d2a6f6411dae1ffdc441527508d4763
 2021-03-22 03:56:36 +00:00
SongFerng Wang
3ac3cce15b Merge "Change the behavior of notifyAllowedNetworkTypesChanged." 2021-03-21 16:45:59 +00:00
Chiachang Wang
6c7f70908e Merge "Remove hidden connectivity methods access" am: 3e737c11db am: 0080dfa65d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644546

Change-Id: I5add5b1a97885b42c324a4e9498abc5196d72557
 2021-03-19 09:03:03 +00:00
Chiachang Wang
b2da781ff9 Merge "Replace the way to get the network for no internet dialog" am: f26f579c8d am: 33855bfd7e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644547

Change-Id: I44ab529b8251c1f4630186c74ba2d16b5030e104
 2021-03-19 09:02:20 +00:00
Chiachang Wang
3e737c11db Merge "Remove hidden connectivity methods access" 2021-03-19 08:13:06 +00:00
Chiachang Wang
f26f579c8d Merge "Replace the way to get the network for no internet dialog" 2021-03-19 07:54:24 +00:00
Jeremy Goldman
8e8d13fd83 Merge "Add goldmanj to the Settings' vpn2 directory Owners file" am: 19c5d0a749 am: 218ca3cbe9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1634463

Change-Id: Ida896c587d2d02de4ccdee7faf41f25d15f9f232
 2021-03-19 07:23:09 +00:00
Jeremy Goldman
19c5d0a749 Merge "Add goldmanj to the Settings' vpn2 directory Owners file" 2021-03-19 06:15:40 +00:00
Chiachang Wang
eedfa1d307 Remove hidden connectivity methods access 
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test

Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
Merged-In: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
 2021-03-18 22:25:05 +08:00
Chiachang Wang
11c37350d9 Replace the way to get the network for no internet dialog 
It's a refactor work for incoming connectivity mainline. The
network information contained in the no ineternet notification
action was placed the target network id. The receiver which is
Settings will need to construct the network from the network id
using the hidden Network constructor. Since Network is moving
into module, Settings will not be able to access it. Apps should
use Network instead of network id, so just send the network
object to Settings.

Update the corresponding logic in Settings.

Bug: 172183305
Test: manually test with no internet dialog and check the
      behavior and log
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiNoInternetDialogTest
Change-Id: I75c04d6f1c2159ae990f6015551eb39d99266336
 2021-03-18 11:35:05 +00:00
Treehugger Robot
e5dfff612b Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a am: 207fa629bc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940

Change-Id: I4fda2ca5e2415431af1d7178064e3f05e46d2715
 2021-03-18 03:41:57 +00:00
Chiachang Wang
168298f426 Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: I7e7ec3721de73523f52718665bc1763f75184a56
 2021-03-18 03:41:16 +00:00
Treehugger Robot
959325e88a Merge "Replace hidden CM#isNetworkSupported() usage" 2021-03-18 02:39:21 +00:00
Chiachang Wang
f60f9ec14c Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: Ie3a809e901745d7143d0b2b48023f2ddd3671480
 2021-03-18 01:18:45 +00:00
Peter Wang
66fd9dbad2 Added an option in reset menu in Settings to enable resetting Euicc data 
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
Merged-In: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
 2021-03-17 15:47:48 -07:00