Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,178 Commits 1 Branch 0 Tags
583deb524b2d6ed2fd2741c605d5ae02c5c5d52a
Commit Graph

21178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Kline
583deb524b Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 2015-10-14 17:37:52 +00:00
Geoff Mendal
74d90b3e4e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-14 14:35:49 +00:00
Geoff Mendal
d71db4f50c Import translations. DO NOT MERGE 
Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5
Auto-generated-cl: translation import
 2015-10-14 07:34:20 -07:00
Geoff Mendal
0884f09acf am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98':
  Import translations. DO NOT MERGE
 2015-10-14 12:59:54 +00:00
Geoff Mendal
67b0ffc88b am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
  Import translations. DO NOT MERGE
 2015-10-14 12:53:54 +00:00
Geoff Mendal
8b6b589dbd am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit 'cec2a65a98161c6c69e373647f03745c59246097':
  Import translations. DO NOT MERGE
 2015-10-14 12:49:34 +00:00
Geoff Mendal
cec2a65a98 am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE
 2015-10-14 12:45:51 +00:00
Geoff Mendal
26bb544ff2 am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
  Import translations. DO NOT MERGE
 2015-10-14 12:40:45 +00:00
Geoff Mendal
46eb1857b6 Import translations. DO NOT MERGE 
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
 2015-10-14 05:30:54 -07:00
Geoff Mendal
d1ba8f73ce am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91':
  Import translations. DO NOT MERGE
 2015-10-14 12:30:14 +00:00
Geoff Mendal
c6d5ac0fb7 am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit '974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
  Import translations. DO NOT MERGE
 2015-10-14 12:23:45 +00:00
Geoff Mendal
974dfc1fbd Import translations. DO NOT MERGE 
Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import
 2015-10-14 05:17:15 -07:00
Lorenzo Colitti
c311c94af5 Unconfigure the lockdown VPN if the user forgets its profile. 
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.

Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.

Bug: 23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
 2015-10-13 15:23:38 +09:00
Geoff Mendal
c16b10ea6b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Change-Id: I324bc1847519b9058a6951a6ef63e5668e9746ba
 2015-10-12 19:28:03 +00:00
Geoff Mendal
49848a637a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-12 14:43:57 +00:00
Geoff Mendal
0ec2f9f6be Import translations. DO NOT MERGE 
Change-Id: Ib419916b4455d3b42a8a8b2395c14dba9afcc8a3
Auto-generated-cl: translation import
 2015-10-12 07:43:01 -07:00
Geoff Mendal
c123f95300 am 4accfd0b: (-s ours) am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '4accfd0b121d2b258bca301b16f62c1ac760d89c':
  Import translations. DO NOT MERGE
 2015-10-12 13:14:14 +00:00
Geoff Mendal
4accfd0b12 am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '1bd19dd17e2038df6c374ca6ed48498de4dde730':
  Import translations. DO NOT MERGE
 2015-10-12 13:11:42 +00:00
Geoff Mendal
1bd19dd17e am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '0e3ffe7cce1ceeac9eeac839d41db40ba983f97d':
  Import translations. DO NOT MERGE
 2015-10-12 13:04:48 +00:00
Geoff Mendal
0e3ffe7cce am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
  Import translations. DO NOT MERGE
 2015-10-12 13:00:56 +00:00
Geoff Mendal
5fa0a93d3e am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
  Import translations. DO NOT MERGE
 2015-10-12 12:55:33 +00:00
Geoff Mendal
5a761be3dd am 7d521a8f: (-s ours) am f598d0bc: (-s ours) Import translations. DO NOT MERGE 
* commit '7d521a8ff28ac8bc6110bc6eaff38c58bb792ca0':
  Import translations. DO NOT MERGE
 2015-10-12 12:37:43 +00:00
Geoff Mendal
4fedc0fdaf Import translations. DO NOT MERGE 
Change-Id: Ia5044b8f155b8256dedc8581f8c7147ffdd0d2bc
Auto-generated-cl: translation import
 2015-10-12 05:34:25 -07:00
Geoff Mendal
7d521a8ff2 am f598d0bc: (-s ours) Import translations. DO NOT MERGE 
* commit 'f598d0bcf70e27a14462bc5403c83822c5600945':
  Import translations. DO NOT MERGE
 2015-10-12 12:30:37 +00:00
Geoff Mendal
f598d0bcf7 Import translations. DO NOT MERGE 
Change-Id: I0eb630b2b5dec19d48787ff56367a3f05b41483a
Auto-generated-cl: translation import
 2015-10-12 05:21:40 -07:00
Christopher Tate
90de3bebf4 Disable app-link preferences for browser apps 
Also make sure that the 'Clear defaults' action unsets the app's
standing as the default browser, when applicable.

Bug 23751034

Change-Id: I6131b763bfa76ba38d18cad2abbb35caffe789aa
 2015-10-09 16:02:00 -07:00
Geoff Mendal
47e870adc8 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-07 15:45:36 +00:00
Geoff Mendal
7d0343ae39 Import translations. DO NOT MERGE 
Change-Id: I3b42883202e9bc41fcd5b4bcc844db53e7ee6efd
Auto-generated-cl: translation import
 2015-10-07 07:44:44 -07:00
Geoff Mendal
e3d8faa5ba am 4f7f05a0: (-s ours) am ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit '4f7f05a00bf1b909140119884b65373b6248c0db':
  Import translations. DO NOT MERGE
 2015-10-07 13:07:48 +00:00
Geoff Mendal
4f7f05a00b am ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit 'ad36aa0ed1b7ba2541d28bc447473e27f3d04e22':
  Import translations. DO NOT MERGE
 2015-10-07 13:01:25 +00:00
Geoff Mendal
ad36aa0ed1 am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit '3963b980bebacb58dd2ed57fd45b042a01f125a0':
  Import translations. DO NOT MERGE
 2015-10-07 12:56:45 +00:00
Geoff Mendal
3963b980be am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit '793b2a2d444192ee587a643c88e535ebf0c98158':
  Import translations. DO NOT MERGE
 2015-10-07 12:51:18 +00:00
Geoff Mendal
793b2a2d44 am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit 'd4fd061d6e33abb96dd8a6cac2d14cdbca154ce9':
  Import translations. DO NOT MERGE
 2015-10-07 12:46:38 +00:00
Geoff Mendal
bd64cd59d6 am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE 
* commit '35d2cf1c0c75342b307fa90f1508741b10169c9f':
  Import translations. DO NOT MERGE
 2015-10-07 12:46:25 +00:00
Geoff Mendal
35d2cf1c0c am b4a027d0: (-s ours) Import translations. DO NOT MERGE 
* commit 'b4a027d07bdd6b488a0ca576f7369beb0cad17c6':
  Import translations. DO NOT MERGE
 2015-10-07 12:41:35 +00:00
Geoff Mendal
d4fd061d6e Import translations. DO NOT MERGE 
Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import
 2015-10-07 05:36:18 -07:00
Geoff Mendal
b4a027d07b Import translations. DO NOT MERGE 
Change-Id: Ifeb18585f7add2909ad50d12839ba920a76cf44c
Auto-generated-cl: translation import
 2015-10-07 05:23:13 -07:00
Geoff Mendal
3203791351 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-05 15:30:33 +00:00
Geoff Mendal
71f3c7791b Import translations. DO NOT MERGE 
Change-Id: Iaf5ad5766d6f6fbd163d612ad1314f62cf07cc1d
Auto-generated-cl: translation import
 2015-10-05 07:42:17 -07:00
Geoff Mendal
37166a4cf6 am a4cd63f6: (-s ours) am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit 'a4cd63f6cc3a835ab268a9854f5ea8d7f41342c0':
  Import translations. DO NOT MERGE
 2015-10-05 13:01:52 +00:00
Geoff Mendal
a4cd63f6cc am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit '032262578565c928b47996d096f3518cf1f09aa7':
  Import translations. DO NOT MERGE
 2015-10-05 12:55:55 +00:00
Geoff Mendal
0322625785 am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit '45335b0c5eeaeb068af6c35bcaa25b08cf10db9d':
  Import translations. DO NOT MERGE
 2015-10-05 12:52:33 +00:00
Geoff Mendal
45335b0c5e am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit '0070fbfe01eab83402949298188322f1168b5b3c':
  Import translations. DO NOT MERGE
 2015-10-05 12:45:22 +00:00
Geoff Mendal
0070fbfe01 am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit 'f0338376779311f2ee0c709e9735dfe5e89cde56':
  Import translations. DO NOT MERGE
 2015-10-05 12:41:50 +00:00
Geoff Mendal
7521c1a03e am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE 
* commit '82c61b2dd878eae9a30bd7953bf3e2390e1e5611':
  Import translations. DO NOT MERGE
 2015-10-05 12:34:59 +00:00
Geoff Mendal
f033837677 Import translations. DO NOT MERGE 
Change-Id: I2aa93f9635911e98133a6ab0cbba1740c62551cf
Auto-generated-cl: translation import
 2015-10-05 05:33:27 -07:00
Geoff Mendal
82c61b2dd8 am 010d2fcd: (-s ours) Import translations. DO NOT MERGE 
* commit '010d2fcd2a4b8fda906ff0a0e04554475a45489c':
  Import translations. DO NOT MERGE
 2015-10-05 12:32:07 +00:00
Geoff Mendal
010d2fcd2a Import translations. DO NOT MERGE 
Change-Id: I56f2a38c8fee8b9cc019538933dfeead37a14d75
Auto-generated-cl: translation import
 2015-10-05 05:20:30 -07:00
Zach Kuznia
ae8aea76e5 Merge "Allow manual to be read from disk" into mnc-dr-dev 2015-10-01 00:08:05 +00:00
Geoff Mendal
1207a50100 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-30 16:48:17 +00:00