summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs/res
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
* | | 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
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-302-4/+3
|/ | | | | Change-Id: I600637b0abc1f3de8f2156137b216b2d271cd575 Auto-generated-cl: translation import
* 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
* 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
* 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-251-0/+46
|\ | | | | | | | | | | | | dialog." into lmp-dev * commit 'baf519c9599a7ecb06db3281746708e5ccdeb10c': Restore legacy VPN stats dialog.
| * am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-devJeff Davidson2014-08-231-0/+46
| |\ | | | | | | | | | | | | * commit '785957866a3a2978929ad2c79865575204c7216a': Restore legacy VPN stats dialog.
| | * Restore legacy VPN stats dialog.Jeff Davidson2014-08-221-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 1ff358ad: am d217efb9: am 709941fd: Merge "Less intrusive VPN dialog and ↵Jeff Davidson2014-08-218-114/+15
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | other UX tweaks." into lmp-dev * commit '1ff358ad2a0b2c0702fde65ff68f4656e55c545f': Less intrusive VPN dialog and other UX tweaks.
| * | am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-devJeff Davidson2014-08-218-114/+15
| |\ \ | | |/ | | | | | | | | | * commit '709941fd34e02fb6639ab31e04404b023c820dec': Less intrusive VPN dialog and other UX tweaks.
| | * Less intrusive VPN dialog and other UX tweaks.Jeff Davidson2014-08-208-114/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -The ability to launch VPNs is now sticky; once approved by the user, further approvals are not needed UNLESS the connection is revoked in Quick Settings. -The old persistent notification has been removed in favor of the new Quick Settings UI. -The name of the VPN app is now pulled from the label of the VPN service rather than the app itself, if one is set. Bug: 12878887 Bug: 16578022 Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-153-6/+6
| |/ | | | | | | | | Change-Id: Iad4e740bda603a5a7fb00961c82f01d34b07d8d4 Auto-generated-cl: translation import
| * Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1911-330/+0
| | | | | | | | Change-Id: Iac5489639edae2373ed0ce92f7d0fe22629a249a
* | Import translations. DO NOT MERGEBaligh Uddin2014-08-111-3/+3
| | | | | | | | | | Change-Id: I2fc59a477e3f48d343b9d715093bb7ee64cb48c8 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2014-07-302-5/+5
| | | | | | | | | | Change-Id: Id7f28a52e8983b6b235d247cde93ae5d08a7d063 Auto-generated-cl: translation import
* | Remove deprecated localesBaligh Uddin2014-07-183-90/+0
| | | | | | | | Change-Id: I5aca8efd30aa8859e0d39f536a3502a9a933293f
* | Remove deprecated localesBaligh Uddin2014-07-178-240/+0
|/ | | | Change-Id: I9789601a2fffc8eb8e6eeff4a8bd6c83fbf6fb10
* Import translations. DO NOT MERGEBaligh Uddin2014-07-058-0/+240
| | | | | Change-Id: I45fc44712db4f2dafeab5f99fc2ca9a5276e75ba Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-06-3015-0/+450
| | | | | Change-Id: Ibca0bb8ef3a7f047b15355ed614651beb4795eec Auto-generated-cl: translation import