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
Jason Monk
783718fffe
Fix crash language & input settings
...
Bug: 24576551
Change-Id: Ifb717689c862193cf06c23de52b3fb68f910db3c
2015-10-13 16:45:49 -04:00
Jason Monk
39b467482d
Depend on support lib preferences
...
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
2015-10-13 10:12:20 -04: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
136ed7b6b2
am 878faf03
: (-s ours) am 56b7a690
: (-s ours) am 14bd3435
: (-s ours) am c16b10ea
: (-s ours) Import translations. DO NOT MERGE
...
* commit '878faf03bc2ff22faf201c2e14b97ac47f95f977':
Import translations. DO NOT MERGE
2015-10-13 03:59:58 +00:00
Geoff Mendal
878faf03bc
am 56b7a690
: (-s ours) am 14bd3435
: (-s ours) am c16b10ea
: (-s ours) Import translations. DO NOT MERGE
...
* commit '56b7a690d1e4ca8bf50347b72f6dc2222d326db2':
Import translations. DO NOT MERGE
2015-10-13 00:19:23 +00:00
Geoff Mendal
56b7a690d1
am 14bd3435
: (-s ours) am c16b10ea
: (-s ours) Import translations. DO NOT MERGE
...
* commit '14bd3435f306d0ece1715c8bd32e843d0f836fdd':
Import translations. DO NOT MERGE
2015-10-12 19:42:31 +00:00
Geoff Mendal
14bd3435f3
am c16b10ea
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c16b10ea6bc544c3707adfada28b68c98aea5bb4':
Import translations. DO NOT MERGE
2015-10-12 19:36:14 +00: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
Toni Barzic
1ab714057e
Merge "Fix plurals messages for autoclick delay strings"
2015-10-12 17:38:05 +00:00
Geoff Mendal
5c59606e7c
am 8788bd83
: (-s ours) am 93c6f4fc
: (-s ours) am 20625ebc
: (-s ours) am 49848a63
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '8788bd837b608933ad909274ed4ed5adadaf4009':
Import translations. DO NOT MERGE
2015-10-12 17:13:48 +00:00
Geoff Mendal
a356afdaf3
am 956d9545
: (-s ours) am 7f15902c
: (-s ours) am f999d572
: (-s ours) am c123f953
: (-s ours) 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 '956d9545af6d6af42907f08fdd57c39d6f7be981':
Import translations. DO NOT MERGE
2015-10-12 17:13:23 +00:00
Geoff Mendal
110450dbcd
am 61a49083
: (-s ours) am 30d1619a
: (-s ours) am c483a5e3
: (-s ours) am 5a761be3
: (-s ours) am 7d521a8f
: (-s ours) am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '61a490837cd54c6e31de74b35762f7cbb0a85d80':
Import translations. DO NOT MERGE
2015-10-12 17:13:20 +00:00
Tony Mantler
551659e94a
Merge "Move DreamBackend to SettingsLib"
2015-10-12 15:56:52 +00:00
Geoff Mendal
8788bd837b
am 93c6f4fc
: (-s ours) am 20625ebc
: (-s ours) am 49848a63
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '93c6f4fc3a0459bad43efd02097c3f133cc0679b':
Import translations. DO NOT MERGE
2015-10-12 14:58:21 +00:00
Geoff Mendal
93c6f4fc3a
am 20625ebc
: (-s ours) am 49848a63
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '20625ebc5ba22b7b0d9a38a79a9a70e12143f6e2':
Import translations. DO NOT MERGE
2015-10-12 14:54:45 +00:00
Geoff Mendal
20625ebc5b
am 49848a63
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '49848a637a341d64317b0fcb371ca695919a8cd1':
Import translations. DO NOT MERGE
2015-10-12 14:49:06 +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
516eca685d
Import translations. DO NOT MERGE
...
Change-Id: I825c42e25f353952adc02f2c99beb1ad2768c4d5
Auto-generated-cl: translation import
2015-10-12 06:51:40 -07:00
Geoff Mendal
956d9545af
am 7f15902c
: (-s ours) am f999d572
: (-s ours) am c123f953
: (-s ours) 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 '7f15902c4bfaf2c74f7702cb68af03e9f9d08008':
Import translations. DO NOT MERGE
2015-10-12 13:27:09 +00:00
Geoff Mendal
7f15902c4b
am f999d572
: (-s ours) am c123f953
: (-s ours) 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 'f999d57278db3c12ce0911d83781978f657f8ede':
Import translations. DO NOT MERGE
2015-10-12 13:22:50 +00:00
Geoff Mendal
f999d57278
am c123f953
: (-s ours) 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 'c123f953007aefb7297b399eb03397d1a7406593':
Import translations. DO NOT MERGE
2015-10-12 13:17:48 +00: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
61a490837c
am 30d1619a
: (-s ours) am c483a5e3
: (-s ours) am 5a761be3
: (-s ours) am 7d521a8f
: (-s ours) am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '30d1619a4472537317eb99a46c6ef3eb08e6c225':
Import translations. DO NOT MERGE
2015-10-12 12:52:36 +00:00
Geoff Mendal
30d1619a44
am c483a5e3
: (-s ours) am 5a761be3
: (-s ours) am 7d521a8f
: (-s ours) am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c483a5e3fc3377c5ea3535e908c60ba1ac901936':
Import translations. DO NOT MERGE
2015-10-12 12:47:52 +00:00
Geoff Mendal
c483a5e3fc
am 5a761be3
: (-s ours) am 7d521a8f
: (-s ours) am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5a761be3dd72b5a318f9387d104f7010b327bfec':
Import translations. DO NOT MERGE
2015-10-12 12:43:04 +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
02858cc0c6
resolved conflicts for 192248cc
to master
...
Change-Id: I636e9c78445c3bbd8b290ec0601a45d68b36a06d
2015-10-09 17:49:13 -07:00
Christopher Tate
192248cc9a
am eba9ff7c
: am 78f7fa0f
: am 90de3beb
: Disable app-link preferences for browser apps
...
* commit 'eba9ff7c64767ba903a424adf6c74844317908cb':
Disable app-link preferences for browser apps
2015-10-10 00:14:12 +00:00
Christopher Tate
eba9ff7c64
am 78f7fa0f
: am 90de3beb
: Disable app-link preferences for browser apps
...
* commit '78f7fa0fc8ed3ede373cdb42e2af2046c87ac470':
Disable app-link preferences for browser apps
2015-10-10 00:09:02 +00:00
Christopher Tate
78f7fa0fc8
am 90de3beb
: Disable app-link preferences for browser apps
...
* commit '90de3bebf432d0897607adaca281fe248cd6575f':
Disable app-link preferences for browser apps
2015-10-09 23:57:48 +00: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
Tony Mantler
bff7116ff0
Move DreamBackend to SettingsLib
...
Change-Id: Ia3f3f68e7182c74f4db6e00635fa0c928032a8fc
2015-10-09 14:37:16 -07:00
Toni Barzic
18727d5cf2
Fix plurals messages for autoclick delay strings
...
Add missing one quantities
BUG=24810663
Change-Id: I6ecb9d4bf1cadb1b64ff247ed97eac8d467fb612
2015-10-09 14:01:30 -07:00
Julia Reynolds
3ef3ad6b73
Merge "Use id-based zen rule APIs."
2015-10-08 22:27:01 +00:00
Amit Mahajan
5787be339f
Change to add user_visible field to Carriers table.
...
Also adding config to control if adding APNs is allowed.
Bug: 24519879
Bug: 24681288
Change-Id: I59466f5489606162a10e883ede378e575a189fb3
2015-10-08 10:36:03 -07:00
Julia Reynolds
25cb8f0691
Use id-based zen rule APIs.
...
Also names no longer have to be unique.
Bug: 22977552
Change-Id: I8dbee85c15d12d5380345447047a0d49c903522e
2015-10-08 13:07:07 -04:00
Toni Barzic
496f099752
Merge "Add a11y setting for Automatically click after pointer stops"
2015-10-07 18:25:09 +00:00
Wale Ogunwale
f541d95f92
Merge "Revert "Added Developer Options settings for multi-window mode.""
2015-10-07 17:35:32 +00:00
Wale Ogunwale
b4d7efbfa2
Revert "Added Developer Options settings for multi-window mode."
...
This reverts commit 4c9d667bc2
.
Bug: 24462906
Bug: 19494313
Change-Id: Iaa698868d8896a09c377b5da03c20b2a0b72d253
2015-10-07 09:24:23 -07:00