summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importAbhisek Devkota2017-04-281-9/+1
| | | | Change-Id: Ifeae1515729fc73ba3198e72b3479870092af3c1
* Automatic translation importAbhisek Devkota2017-02-191-0/+28
| | | | Change-Id: I80e32cc003cc9c8707732b27a683e87cdd67375d
* Automatic translation importpinky@build012016-09-271-0/+1
| | | | | Change-Id: I77a3c0eb997d6f2aaf9b1add59480c496e55e43d Ticket: -
* Automatic translation importpinky@build012016-08-273-0/+84
| | | | | Change-Id: If7eac9a9fa7e145c9d35ece91a8ccab33601a1ca Ticket: -
* Automatic translation importblinky@build012016-08-131-0/+3
| | | | | Change-Id: I599894bfd30ff9d78253482981737fc8a440a826 Ticket: -
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-044-5/+33
| | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0" This reverts commit 0e1dbed9194839a90755670d8fdf9046a75b85f7, reversing changes made to 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8. Change-Id: Ife3a8c9c898034d5161fbf25a03eaf173ec66246
* Automatic translation importMichael Bestas2016-04-161-0/+28
| | | | Change-Id: Ib87e41106982b159d249ebbe0653e569f9c7b454
* Automatic translation importMichael Bestas2016-04-061-0/+28
| | | | Change-Id: I3849e73aee18720b20529d406c7657c0a0cee320
* Automatic translation importMichael Bestas2016-03-282-0/+56
| | | | Change-Id: Ib371d8f862dced4aa36cfe076f876e9ae4bd62c2
* Automatic translation importMichael Bestas2016-03-1813-0/+274
| | | | Change-Id: I4af2a6a904e9229b261e95818f716d6b5708a6f4
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-114-33/+5
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * am 515a8406: am 59ca7dd0: am 846362fa: Merge "Use \'dp\' paddings instead of ↵Robin Lee2015-07-072-5/+5
| |\ | | | | | | | | | | | | | | | | | | \'mm\' for VPN dialogs" into mnc-dev * commit '515a8406aa649fb5ea63a79f697eb04afadf4a3d': Use 'dp' paddings instead of 'mm' for VPN dialogs
| * \ am f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-devAlan Viverette2015-06-181-2/+2
| |\ \ | | | | | | | | | | | | | | | | * commit 'f1da9a1401fe1304bee8a550a0141c79ecc3c0b3': DO NOT MERGE: Remove DayNight theme
* | | | Automatic translation importMichael Bestas2016-02-141-0/+38
| | | | | | | | | | | | | | | | Change-Id: I6f7e9a4d7d72272d445319a26b386d7098aa26a4
* | | | Automatic translation importMichael Bestas2015-12-254-0/+130
| | | | | | | | | | | | | | | | Change-Id: I96f3c5a41d3c52473c161aaf2c97d821caa99bb9
* | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-182-1/+30
| |_|/ |/| | | | | | | | | | | Change-Id: I08b112bde5280593b52c7aa50b56d41092f94056 Auto-generated-cl: translation import
* | | Use 'dp' paddings instead of 'mm' for VPN dialogsRobin Lee2015-07-072-5/+5
| |/ |/| | | | | | | | | | | | | The values had gradually shifted away from what they need to be to line up with other UI elements (ie. title bar) Bug: 22314161 Change-Id: I03fd15632db02b723348e42066f9e45158eae148
* | DO NOT MERGE: Remove DayNight themeAlan Viverette2015-06-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Do not go gentle into that good night, Old age should burn and rave at close of day; Rage, rage against the dying of the light. Though wise men at their end know dark is right, Because their words had forked no lightning they Do not go gentle into that good night. Bug: 21854466 Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-302-4/+3
|/ | | | | Change-Id: I600637b0abc1f3de8f2156137b216b2d271cd575 Auto-generated-cl: translation import
* Support cross-user VPN calls (with permission)Robin Lee2015-05-182-6/+9
| | | | | | | | | | | | | Settings and SystemUI need to act on other users than USER_OWNER. This is gated by INTERACT_ACROSS_USERS_FULL in addition to the existing CONTROL_VPN checks, so the number of processes able to interfere with other profiles' VPNs should be quite small. Bug: 20692490 Bug: 20747154 Bug: 20872408 Change-Id: I6e5d7220f73435bec350719e7b4715935caf4e19
* DayNight theme for framework packagesAlan Viverette2015-05-051-2/+2
| | | | Change-Id: I745f90561c957c83540e75a2886e294633c83be1
* Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+87
| | | | | Change-Id: I72c5378c90345a929c525db99e47abd0c67fdb2f Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+29
| | | | | Change-Id: Ia2267065864b0a7ff750e2956f0bab7507b8c32c Auto-generated-cl: translation import
* Remove unused imports in frameworks/base.John Spurlock2015-02-281-7/+0
| | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* Import translations. DO NOT MERGEGeoff Mendal2015-01-211-3/+3
| | | | | Change-Id: I6f5eaee0cfc5d0fd3995c600fb5eaf0afa032d4d Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-01-051-3/+3
| | | | | Change-Id: I8aed2731e04350bbf8c50de7ebc81f9aaddf8fee Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-12-231-3/+3
| | | | | Change-Id: I1506acd4f2df7bda4a8d4fb968b5e9e316326ec6 Auto-generated-cl: translation import
* am b431a198: am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control ↵Jeff Davidson2014-11-181-0/+2
|\ | | | | | | | | | | | | "permission" with an actual permission." into lmp-mr1-dev * commit 'b431a198ec255be7efb30b4c81a779a4eb5009f6': Enforce VPN control "permission" with an actual permission.
| * am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an ↵Jeff Davidson2014-11-181-0/+2
| |\ | | | | | | | | | | | | | | | | | | actual permission." into lmp-mr1-dev * commit 'e6bc5adf2d4639b63001a5889ad301bae47bcd7f': Enforce VPN control "permission" with an actual permission.
| | * Enforce VPN control "permission" with an actual permission.Jeff Davidson2014-11-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation uses a whitelist of package names. Use a system|signature permission instead of rolling our own security and add that permission to the existing set of whitelisted packages (SystemUI and VpnDialogs). In addition to being less of a security risk (using well-known methods like Context.enforceCallingPermission rather than manually querying PackageManager and checking UIDs for package names), this enables other system-privileged apps to control VPN as needed per the below bug. Bug: 18327583 Change-Id: I38617965c40d62cf1ac28e3cb382c0877fb1275d
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-311-1/+1
| | | | | | | | | | | | | | | Change-Id: Ibf9918cdba50fa589ab7d179462eceefbee706a1 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-266-21/+11
| | | | | | | | | | | | | | | Change-Id: I605546fc701703baebd8e91bb6cc198223eb6c3c Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-2472-218/+156
| | | | | | | | | | | | | | | Change-Id: Ica37ab94e0e2158a111b50bff6022d180ef45e27 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-172-5/+5
| | | | | | | | | | | | | | | Change-Id: Ia455f5ceec1e3c7d2c646e0f2ff252683ec46201 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-121-3/+3
| | | | | | | | | | | | | | | Change-Id: If9cd12a06876011fcb55612cedaa24d9e1b945ff Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-3/+3
| | | | | | | | | | | | | | | Change-Id: Ied3684129384c44a0f9c374c4b1c4f22191a3f33 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-11-071-3/+3
| | | | | | | | | | | | | | | Change-Id: Iaaa6b27c60a7641bc236b062976f1b4ffd9e55d5 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-3/+3
| | | | | | | | | | | | | | | Change-Id: I47639f199561b9f1061eb77db1c2de15e03e52b3 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-3/+3
| | | | | | | | | | | | | | | Change-Id: I8569ab7d0cc1824cfe1724b9cfb3062f35aa4316 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-3/+3
| | | | | | | | | | | | | | | Change-Id: I8ed4abf1dbac2d0aae2cd37c57e41d38e6dc31e4 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-312-2/+2
| | | | | | | | | | | | | | | Change-Id: I6783166fd9372026a11fecef3a491f98152b1f74 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-2672-218/+146
| | | | | | | | | | | | | | | Change-Id: I98bdfdd87bee6fd3794cf336d96cbf8a05a8906e Auto-generated-cl: translation import
* | | am baf519c9: am 9f207f97: am 78595786: Merge "Restore legacy VPN stats ↵Jeff Davidson2014-08-253-0/+253
|\ \ \ | |/ / | | | | | | | | | | | | | | | dialog." into lmp-dev * commit 'baf519c9599a7ecb06db3281746708e5ccdeb10c': Restore legacy VPN stats dialog.
| * | am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-devJeff Davidson2014-08-233-0/+253
| |\ \ | | |/ | | | | | | | | | * commit '785957866a3a2978929ad2c79865575204c7216a': Restore legacy VPN stats dialog.
| | * Restore legacy VPN stats dialog.Jeff Davidson2014-08-223-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was originally removed in ag/522961, but restoring to keep legacy VPN behavior the same from within VpnSettings. This dialog is only accesible from VpnSettings and so should only ever be shown for legacy VPNs. Bug: 17164793 Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
* | | am 531b322e: am e00e0e4e: am daf54483: Merge "Restore legacy VPN stats ↵Jeff Davidson2014-08-251-0/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | dialog strings." into lmp-dev * commit '531b322ee6e6d1c7d192056a2cdebf2660fd4bbf': Restore legacy VPN stats dialog strings.
| * | am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-devJeff Davidson2014-08-231-0/+22
| |\ \ | | |/ | | | | | | | | | * commit 'daf5448383a02017bb761841d675c3630ec94cac': Restore legacy VPN stats dialog strings.
| | * Restore legacy VPN stats dialog strings.Jeff Davidson2014-08-221-0/+22
| | | | | | | | | | | | | | | Bug: 17164793 Change-Id: I5927cdc4f1ceef4cd1cc1b5d17ae97d285bd9a39
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-08-222-4/+4
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-08-182-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I18c5d0d4a4c0512ed892347d46a0af8697bcd8c9 Auto-generated-cl: translation import