PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,502 Commits 1 Branch 0 Tags
0abb9b7d69fb2e6cf60b1c9952893dba1bb9201c
Commit Graph

109 Commits

Author SHA1 Message Date
Geoff Mendal
0abb9b7d69 Import translations. DO NOT MERGE 
Change-Id: Ief396718afca7ea286c8ad923eb1448074fd2d4d
Auto-generated-cl: translation import
 2015-07-29 06:05:53 -07:00
Geoff Mendal
c9541e5fda Import translations. DO NOT MERGE 
Change-Id: Iee81fc4d17f748e4a9fd294c6d813a773dc44b89
Auto-generated-cl: translation import
 2015-07-20 15:26:26 -07:00
Narayan Kamath
485db87a11 am 5152086a: am 83a25842: Merge "Lose some deprecated test annotations." 
* commit '5152086a17f23a7271ca6a56ea5456af46777aa9':
  Lose some deprecated test annotations.
 2015-07-14 20:37:05 +00:00
Narayan Kamath
5152086a17 am 83a25842: Merge "Lose some deprecated test annotations." 
* commit '83a25842e720ddb838519e194679b464d0114301':
  Lose some deprecated test annotations.
 2015-07-14 20:27:36 +00:00
Robin Lee
4e3635d8db am 722d5e22: am be638020: am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev 
* commit '722d5e221aef34220f0e6be874f62b14b7dea13f':
  Match getLegacyVpn calls to changed interface
 2015-07-10 20:09:32 +00:00
Robin Lee
be638020e5 am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev 
* commit '719cbc4acfe01d3aaf0dfb1061c06b69b7db2d29':
  Match getLegacyVpn calls to changed interface
 2015-07-10 19:41:01 +00:00
Narayan Kamath
e92cc80bbf Lose some deprecated test annotations. 
Will be deleted shortly. They're no-ops because nobody knows
how to process them.

Change-Id: I2898a57e508b0bc39edb2cc2ab7a26f98de608e0
 2015-07-09 17:58:27 +01:00
Robin Lee
290784afde Match getLegacyVpn calls to changed interface 
The userId argument is now explicit. Pre-requisite for bug 21499103

Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
 2015-07-07 12:35:14 -07:00
Robin Lee
2196afd9ae am d234296b: am c0d07e31: am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev 
* commit 'd234296b96d6dfbcf2fef205d7b86a1456e69631':
  VPN: UI for forgetting disconnected VPNs
 2015-05-19 10:48:26 +00:00
Robin Lee
c0d07e314a am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev 
* commit 'b5c48a4c347f7aa64b99e80370a63b3f60d3203c':
  VPN: UI for forgetting disconnected VPNs
 2015-05-19 10:25:58 +00:00
Robin Lee
01b35bcae3 VPN: UI for forgetting disconnected VPNs 
Made possible by expanded internal VPN APIs.

Bug: 20872408
Bug: 20692490
Bug: 20747154
Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe
 2015-05-18 22:55:15 +01:00
Geoff Mendal
07803c0bfe Import translations. DO NOT MERGE 
Change-Id: Ia831500abc9de4dd293c116e0a81f4bcccad0672
Auto-generated-cl: translation import
 2015-05-13 21:12:10 -07:00
Geoff Mendal
a287c8ebb0 Import translations. DO NOT MERGE 
Change-Id: Icce0b46b679e33df1fb7cd069d01aaae5afeeea4
Auto-generated-cl: translation import
 2015-05-13 06:58:02 -07:00
Chad Brubaker
6c3b678ca2 Track keystore password method changes 
(cherry-picked from commit 7236f2abba)

Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
 2015-05-11 11:21:55 -07:00
Chad Brubaker
9fb71afb73 am 2f23695a: am 1cfc32d1: am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev 
* commit '2f23695ad523d0577e11e13d52d484f548db4465':
  Track keystore password method changes
 2015-05-08 22:36:03 +00:00
Chad Brubaker
7236f2abba Track keystore password method changes 
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
 2015-05-07 16:14:51 -07:00
Geoff Mendal
3321e72cb2 Import translations. DO NOT MERGE 
Change-Id: I05ee02c638e4a9152d80b013a97f5e9b84404558
Auto-generated-cl: translation import
 2015-05-04 05:47:44 -07:00
Geoff Mendal
3141270a1e Import translations. DO NOT MERGE 
Change-Id: If39a43ecd48ea382144660b0c47e864b014b239e
Auto-generated-cl: translation import
 2015-04-29 08:11:54 -05:00
Geoff Mendal
23562e4605 Import translations. DO NOT MERGE 
Change-Id: I05bb4f3a511b9b620bb9fbcf0a9be40ece9eb0ad
Auto-generated-cl: translation import
 2015-04-25 00:12:23 -07:00
Geoff Mendal
6d61061518 Import translations. DO NOT MERGE 
Change-Id: I921201f47bbaa1b29c6f4c42131123c439207e40
Auto-generated-cl: translation import
 2015-04-22 08:11:16 -05:00
Alex Klyubin
b009023c76 Make Settings app not use cleartext network traffic. 
This CL switches the only two places which use cleartext HTTP in this
app to HTTPS. It also declares in the AndroidManifest.xml that this
app does not use cleartext network traffic, thus asking the platform
and tools to block any such traffic from this app on best effort
basis.

NOTE: The only test that uses cleartext HTTP traffic is in VpnTests.
This test makes cleartext HTTP requests to a third-party service which
does not appear to support HTTPS. Thus, this CL temporarily relaxes
the cleartext traffic policy during this test to keep it working. The
correct longer-term fix for this test is to use a service that offers
HTTPS.

Bug: 19215516
Change-Id: Idf1ff8c66d43d77ef2114b2f1b676927844150e5
 2015-04-02 11:30:15 -07:00
Geoff Mendal
d697b11a13 Import translations. DO NOT MERGE 
Change-Id: I98b7918077e100eb54eaeb121e53ed9b60b624d5
Auto-generated-cl: translation import
 2015-03-21 02:21:25 -05:00
Geoff Mendal
cfad6fc1ff Import translations. DO NOT MERGE 
Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import
 2015-02-26 13:08:22 -08:00
Geoff Mendal
8d15f5b991 Import translations. DO NOT MERGE 
Change-Id: Ie87f2b8f1370dfc3bbde2ff76c3ca0816c86949b
Auto-generated-cl: translation import
 2015-01-21 07:12:37 -08:00
Geoff Mendal
11c2c80f9d Import translations. DO NOT MERGE 
Change-Id: Ib29187f3cc18e0b6774a65b7fc34623fd290c0f9
Auto-generated-cl: translation import
 2015-01-05 06:34:10 -08:00
Baligh Uddin
36ddc8a1c3 Import translations. DO NOT MERGE 
Change-Id: I0276ab183a6b8f4f2afef13961cd91e1e4593587
Auto-generated-cl: translation import
 2014-12-22 09:12:51 -08:00
Geoff Mendal
3c08ea9741 Import translations. DO NOT MERGE 
Change-Id: Ie9e5f675f83b6e8b48302066d22578c23f96f070
Auto-generated-cl: translation import
 2014-12-17 06:39:27 -08:00
Narayan Kamath
62d35b65f2 resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp 
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
 2014-12-15 16:27:39 +00:00
Narayan Kamath
7a250b8288 Stop using apache-http in settings. 
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

(cherry picked from commit f25627c0c9)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
 2014-12-15 14:32:38 +00:00
Narayan Kamath
f25627c0c9 Stop using apache-http in settings. 
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
 2014-12-12 14:22:06 +00:00
Geoff Mendal
3260f78cb5 Import translations. DO NOT MERGE 
Change-Id: Ide3e406681ef2f9a6198de5436f4cd1df3888282
Auto-generated-cl: translation import
 2014-12-08 06:51:46 -08:00
Geoff Mendal
0bda36df16 Import translations. DO NOT MERGE 
Change-Id: I937efd74232d29cf16ddf148661da8e0f2f6896e
Auto-generated-cl: translation import
 2014-11-10 14:33:04 -08:00
Baligh Uddin
15adc9b3ac Import translations. DO NOT MERGE 
Change-Id: I547111eb6c7ff68ebe835d65bb24e0a841ecdb90
Auto-generated-cl: translation import
 2014-11-06 10:02:24 -08:00
Baligh Uddin
43b675e01e Import translations. DO NOT MERGE 
Change-Id: I802b868cb89763e3a0ee655415b08303a467c9bb
Auto-generated-cl: translation import
 2014-10-30 11:46:41 -07:00
Geoff Mendal
bfe382468c Import translations. DO NOT MERGE 
Change-Id: I1688e8e51ff69ce47c65145e12550f712fc9b58d
Auto-generated-cl: translation import
 2014-10-15 18:03:52 -07:00
Geoff Mendal
bed6c4d1d4 Import translations. DO NOT MERGE 
Change-Id: I80c9e03e345f2a8ec20a4237922d0eb7e08b5502
Auto-generated-cl: translation import
 2014-10-13 13:03:15 -07:00
Geoff Mendal
691793a059 Import translations. DO NOT MERGE 
Change-Id: I78911b5f73395927c6981792f4ec9b0f4e48c236
Auto-generated-cl: translation import
 2014-10-06 17:20:48 -07:00
Baligh Uddin
5b025e75fb Import translations. DO NOT MERGE 
Change-Id: I390fa4d46d53d077b371b1f0cc2d880208aedb7f
Auto-generated-cl: translation import
 2014-08-26 21:00:49 -07:00
Baligh Uddin
0a07ee810c Import translations. DO NOT MERGE 
Change-Id: I369c46e528751386b3c713143036b233d715dc29
Auto-generated-cl: translation import
 2014-08-18 19:09:47 -07:00
Baligh Uddin
b82066e238 Import translations. DO NOT MERGE 
Change-Id: Ibd15fd67b24d78f6c4378008e24d7a50874b7491
Auto-generated-cl: translation import
 2014-08-11 21:22:01 -07:00
Geoff Mendal
179544d151 Import translations. DO NOT MERGE 
Change-Id: I7a8d40cfecee4835e65e0366a8cfe0f05a3dace2
Auto-generated-cl: translation import
 2014-07-30 18:41:18 -07:00
Baligh Uddin
9ab097413a Remove deprecated locales 
Change-Id: Ibba34d691800aaa4fad4f4e8cfe6ca09aaae2cd3
 2014-07-18 11:43:06 -07:00
Baligh Uddin
a45d1f8320 Remove deprecated locales - DO NOT MERGE 
Change-Id: Ibf5ac73ae0784925297180cfec0236687d584fd4
 2014-07-19 13:05:24 -07:00
Baligh Uddin
befb4e2e79 Remove deprecated locales 
Change-Id: If897a5a2b65236d1b9da8b01198b9292602ee179
 2014-07-17 15:43:14 -07:00
Xia Wang
52ddc781a1 am 70ce016f: am d2f56f07: am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it. 
* commit '70ce016f84ce6c54b2c5f07adf86e415de5598cb':
  Allow VPN to stay connected for some time before disconnecting it.
 2014-04-05 00:54:54 +00:00
Xia Wang
d2f56f07f9 am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it. 
* commit 'ac768973bc23b9f8f266013c20d301554729fd70':
  Allow VPN to stay connected for some time before disconnecting it.
 2014-04-05 00:48:38 +00:00
Xia Wang
ce11881acc Allow VPN to stay connected for some time before disconnecting it. 
Change-Id: I25994b8329514a32b5b6f383abef231d3decb4ec
 2014-04-04 17:23:47 -07:00
Xia Wang
c4e68c1dcd am 2f633ca3: am 8361a97c: am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev 
* commit '2f633ca3a5813eb3fece716448308bf8e7d351ee':
  Add legacy VPN test framework and test cases
 2014-04-02 03:55:59 +00:00
Xia Wang
8361a97c43 am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev 
* commit '3e23823015d2ad0679d89adc2a62c7d568adada8':
  Add legacy VPN test framework and test cases
 2014-04-02 03:45:56 +00:00
Xia Wang
340bda7154 Add legacy VPN test framework and test cases 
- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases

Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c
 2014-04-01 17:45:58 -07:00