summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/vpn2
Commit message (Expand)AuthorAgeFilesLines
* Use if instead of switch for resourcesColin Cross2019-05-131-10/+8
* Merge "Change the owners of vpn2 settings again" into qt-devRobin Lee2019-04-111-2/+1
|\
| * Change the owners of vpn2 settings againRobin Lee2019-04-111-2/+1
* | Merge "Add OWNERS file for settings/vpn2" into qt-devRobin Lee2019-04-111-0/+10
|\|
| * Add OWNERS file for settings/vpn2Robin Lee2019-04-111-0/+10
* | Merge "Fix code for NPE when click add and cancel repeatly VPN profile" am: 7...sj.cha2019-04-091-0/+4
|\ \ | |/ |/|
| * Fix code for NPE when click add and cancel repeatly VPN profilesj.cha2019-03-271-0/+4
* | Make the text appearance consistant in add vpn dialoglindatseng2019-03-281-0/+2
* | Merge "Support VPN Proxy(2/2)" am: 2a695c4b7b am: e2f74af063Chalard Jean2019-03-091-2/+63
|\|
| * Support VPN Proxy(2/2)Ryusuke Sawa2019-03-061-2/+63
* | Merge "Update to use new ConnectivityManager API." am: 70b1830e7e am: 7c47743851Pavel Grafov2019-01-283-3/+4
|\|
| * Update to use new ConnectivityManager API.Pavel Grafov2019-01-253-3/+4
| * Revert "Update to use new ConnectivityManager API."Dan Albert2019-01-243-4/+3
| * Update to use new ConnectivityManager API.Pavel Grafov2019-01-233-3/+4
| * Migrate Settings to androidx.Aurimas Liutikas2018-08-284-7/+7
* | Further Credentials-related clean-upEran Messeri2019-01-241-23/+0
* | Migrate all MetricsProto enums to SettingsEnumsFan Zhang2019-01-175-11/+11
* | RestrictedLockUtils was split into ...InternalPhilip P. Moltmann2018-08-301-2/+2
* | Sort importsFan Zhang2018-08-289-25/+25
* | Migrate all AlertDialogs to AndroidX versiontmfang2018-07-206-6/+9
* | Clean up: fix incorrect @VisibleForTesting importsFan Zhang2018-07-132-2/+2
* | Settings Fragment Migration (Change imports)tmfang2018-07-113-3/+5
* | Reorder and clean up imports.Fan Zhang2018-06-187-11/+12
* | Clean up KeyStore exception warning caused by adding a new VPN.Irina Dumitrescu2018-06-121-1/+2
* | Rename SubSettingLauncher.setTitle, add java dochjchangliao2018-05-091-1/+1
* | Migrate Settings to androidx.Aurimas Liutikas2018-04-204-7/+7
|/
* Use proper icon size for default app prefs.Fan Zhang2018-04-091-1/+1
* Remove wrapper for ConnectionManager/IPackageManagerFan Zhang2018-04-021-2/+1
* Migrate more subsetting launching to SubSettingLauncherFan Zhang2018-02-151-4/+9
* Refactor help menu stuff into a controllerFan Zhang2017-11-291-1/+1
* Use small icon in location and vpn settings UIFan Zhang2017-10-301-1/+3
* Consolidate all wrappers used for testing.Doris Ling2017-09-143-134/+1
* Disable always-on VPN options if an app has opted out.Charles He2017-06-271-18/+4
* Add a "sign into network" button to the wifi details page.Lorenzo Colitti2017-05-032-0/+53
* Update vpn icon from setting gear to vpn key.Fan Zhang2017-04-291-1/+1
* Don't show vpn info box when we don't have anything usefulFan Zhang2017-04-111-3/+7
* VPN settings: add missing string resourceCharles He2017-04-011-1/+1
* VPN: uncheck lockdown if always-on is offRobin Lee2017-03-301-3/+3
* resolve merge conflicts of 90f009ebb5 to masterRobin Lee2017-03-271-2/+10
|\
| * [VpnSettings]Crash when activity has been recycledliurong2017-03-241-3/+10
* | VPN settings: update strings for always-on VPNCharles He2017-03-241-2/+2
* | VPN settings: gray out always-on checkbox dynamicallyCharles He2017-03-221-13/+46
* | VPN screen clean upFan Zhang2017-03-071-1/+1
* | Update string: lockdown confirmation dialog titleRobin Lee2017-02-161-1/+2
* | Log source with visibility changeFan Zhang2017-02-152-4/+4
* | Move GearPreference to widget package.Fan Zhang2017-02-082-5/+5
* | resolve merge conflicts of cb1968148a to masterRobin Lee2017-01-192-2/+22
|\|
| * Clear VPN after Clear credentials if VPN is being establishedinsight.lee2017-01-182-3/+27
* | Add global HTTP proxy to Privacy Settings pageBartosz Fabianowski2017-01-122-0/+15
* | Add Always on VPN to Privacy Settings pageBartosz Fabianowski2017-01-123-0/+70