Sanket Padawe
0af7dec8b5
am bd19918f: am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
...
* commit 'bd19918f87903031b6c32057a347d3759d9f1aca':
Disable CA certificate for EAP-SIM, AKA & AKA'
2015-07-08 21:21:55 +00:00
Sanket Padawe
bd19918f87
am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
...
* commit '3dfe8963e6d2a02818a22f6a063fb671e7560d10':
Disable CA certificate for EAP-SIM, AKA & AKA'
2015-07-08 21:08:08 +00:00
Sanket Padawe
3dfe8963e6
am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
...
* commit 'f7a64d206869ef783820f08966ad3bbf8ebe4559':
Disable CA certificate for EAP-SIM, AKA & AKA'
2015-07-08 20:53:31 +00:00
Sanket Padawe
f7a64d2068
am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
...
* commit 'c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
Disable CA certificate for EAP-SIM, AKA & AKA'
2015-07-08 20:37:16 +00:00
Sanket Padawe
c9cdf9c814
Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev
2015-07-08 17:14:55 +00:00
Robin Lee
243a53cd6e
am a0c850f2: am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit 'a0c850f24930ce6ad240e2a12aaf8ad020a7c561':
Restore Vpn advanced options on re-init or rotate
2015-07-08 17:07:36 +00:00
Robin Lee
a0c850f249
am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit 'd81d249af4b5384c8caf8a2c3b3923684714193d':
Restore Vpn advanced options on re-init or rotate
2015-07-08 16:54:55 +00:00
Robin Lee
d81d249af4
am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit 'e46e48271aacbe3278acb0dc52b439da1c3ec8e9':
Restore Vpn advanced options on re-init or rotate
2015-07-08 16:40:44 +00:00
Geoff Mendal
4dac108977
am d1a87a4a: (-s ours) am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'd1a87a4a39d588ed320df69dde741968cb41da20':
Import translations. DO NOT MERGE
2015-07-08 16:33:55 +00:00
Robin Lee
e46e48271a
am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit '64e1e15d10b41f6993abf4cb77d220a05f79191a':
Restore Vpn advanced options on re-init or rotate
2015-07-08 16:27:42 +00:00
Geoff Mendal
d1a87a4a39
am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'd0249808fd8c1dd98b2cbe028a0448fda2e129ec':
Import translations. DO NOT MERGE
2015-07-08 16:19:49 +00:00
Robin Lee
64e1e15d10
Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
2015-07-08 16:17:23 +00:00
Geoff Mendal
d0249808fd
am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '661dbf01b7ba8cfdb1ab9d1a5dd2054c640fa183':
Import translations. DO NOT MERGE
2015-07-08 16:06:29 +00:00
Geoff Mendal
661dbf01b7
am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '4a332ee8ed15c991e29e46490d2a9d93117bca26':
Import translations. DO NOT MERGE
2015-07-08 15:50:58 +00:00
Geoff Mendal
4a332ee8ed
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-08 15:39:32 +00:00
Geoff Mendal
5a416db19e
Import translations. DO NOT MERGE
...
Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import
2015-07-08 08:19:19 -07:00
Jason Monk
d355c89358
am 90c48a41: am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
...
* commit '90c48a4134af1c654c975369f00e497799fece38':
Handle uninstall from notifications list
2015-07-08 14:27:28 +00:00
Jason Monk
90c48a4134
am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
...
* commit 'e14fc96a9c30019c4e091eef302dc407b5cd7536':
Handle uninstall from notifications list
2015-07-08 14:11:45 +00:00
Jason Monk
e14fc96a9c
am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
...
* commit 'fa10637f2b42ba0d4cc81e6bb0f0a13eaf335e79':
Handle uninstall from notifications list
2015-07-08 13:57:40 +00:00
Jason Monk
fa10637f2b
am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
...
* commit '4652115f1f75633b0cf3811910b0a5336fd90bf4':
Handle uninstall from notifications list
2015-07-08 13:44:38 +00:00
Jason Monk
4652115f1f
Merge "Handle uninstall from notifications list" into mnc-dev
2015-07-08 13:34:41 +00:00
Zoltan Szatmary-Ban
87e918cdf0
am 2f279c3a: am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '2f279c3a12e58806d8efb48bbeef031842a0ed80':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 12:55:35 +00:00
Zoltan Szatmary-Ban
8eade69d74
am 89be2eea: am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '89be2eeab0738e7db8d945ff1267dc9bf8fdaeb2':
Making Settings > Storage multiprofile aware
2015-07-08 12:55:10 +00:00
Zoltan Szatmary-Ban
2f279c3a12
am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '2cd50c45da99fa002375ad80a51d0c672cc09572':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 12:25:55 +00:00
Zoltan Szatmary-Ban
2cd50c45da
am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '03b73068128807b4308185d04ab4688e71e02000':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 12:12:30 +00:00
Zoltan Szatmary-Ban
03b7306812
am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '296e0aff022196ef2fec934878d8721828bea3f1':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 11:57:34 +00:00
Zoltan Szatmary-Ban
296e0aff02
Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
2015-07-08 11:45:04 +00:00
Zoltan Szatmary-Ban
89be2eeab0
am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '38a510df76a596007d9425270d8a927018dc2ae2':
Making Settings > Storage multiprofile aware
2015-07-08 11:37:51 +00:00
Zoltan Szatmary-Ban
38a510df76
am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '215af288957eb64235af7a67af2143d1caf37428':
Making Settings > Storage multiprofile aware
2015-07-08 11:25:44 +00:00
Zoltan Szatmary-Ban
215af28895
am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware
2015-07-08 11:10:45 +00:00
Zoltan Szatmary-Ban
461a48bac9
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
2015-07-08 10:54:19 +00:00
Wei Liu
d5e276fa6e
am 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
...
* commit '27e395427eef95fea47f06b5cc7bbba0e7853016':
Move NetworkPolicyEditor from Settings packge to settingslib.
2015-07-08 01:40:05 +00:00
Christopher Tate
0556a0a949
am 6c444a03: am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
...
* commit '6c444a03f671eb4439792506f09efe8b6b3fdb59':
App link handling is not just for "official" verified handlers
2015-07-08 01:39:59 +00:00
Amith Yamasani
4a902ffd0b
am 0531c255: am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
...
* commit '0531c255e6d00498e06811f032744b40fc453e80':
Use localized name for guest user
2015-07-08 01:36:49 +00:00
Wei Liu
27e395427e
am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
...
* commit 'e0021c426c75ea8a737714f0b8bb27988ac3a51f':
Move NetworkPolicyEditor from Settings packge to settingslib.
2015-07-08 00:42:50 +00:00
Christopher Tate
6c444a03f6
am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
...
* commit 'd0528b69d4ad70fdad8e218e618cd875eef96f4f':
App link handling is not just for "official" verified handlers
2015-07-08 00:24:08 +00:00
Wei Liu
e0021c426c
Move NetworkPolicyEditor from Settings packge to settingslib.
...
Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813
2015-07-07 17:12:30 -07:00
Christopher Tate
d0528b69d4
am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
...
* commit 'fe71156d076792eebd250dc22c5d2e9485f9cf58':
App link handling is not just for "official" verified handlers
2015-07-08 00:08:17 +00:00
Christopher Tate
fe71156d07
am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
...
* commit '8023385e56e472a55e9c6f5034e04a10f1088f57':
App link handling is not just for "official" verified handlers
2015-07-07 23:49:11 +00:00
Christopher Tate
8023385e56
Merge "App link handling is not just for "official" verified handlers" into mnc-dev
2015-07-07 23:36:15 +00:00
Christopher Tate
a08a225d18
App link handling is not just for "official" verified handlers
...
Allow apps to be enabled as link handlers for their accepted domains
even when they are not the "official" apps for those domains.
Also clean up a bunch of inconsistent/wrong state reporting in the UI.
Bug 22069429
Change-Id: Ic3b2bcc476dfc30085d3df7412b02bdc5d53df6d
2015-07-07 14:09:52 -07:00
Amith Yamasani
0531c255e6
am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
...
* commit '8a62bf97e614d7c644ce600b6e14a7aab79892f6':
Use localized name for guest user
2015-07-07 21:09:42 +00:00
Amith Yamasani
8a62bf97e6
am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
...
* commit '8e9aca37c6045aeffe83f13a0664cb950a7f7fef':
Use localized name for guest user
2015-07-07 20:54:18 +00:00
Amith Yamasani
8e9aca37c6
am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
...
* commit '7ac21204e16c797cc4f818ccc51509d425ffaf80':
Use localized name for guest user
2015-07-07 20:37:31 +00:00
Amith Yamasani
7ac21204e1
Merge "Use localized name for guest user" into mnc-dev
2015-07-07 20:20:03 +00:00
Zoltan Szatmary-Ban
6a00f6cf0b
Making Settings > Storage multiprofile aware
...
Also fixing the order of preferences there.
Bug: 22223456
Bug: 22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34
2015-07-07 20:33:30 +01:00
Jason Monk
38f1889fea
Handle uninstall from notifications list
...
Don't crash in InstalledAppDetails on invalid app and finish app
notification details when the app goes away.
Bug: 22311566
Change-Id: I0bb7302dc16dd1a6f3aca152037705ad657d5554
2015-07-07 14:57:47 -04:00
Amith Yamasani
5d69aaea2a
Use localized name for guest user
...
Rather than use the stored name, which depends on the language
in use when the Guest was created, always try to use the localized
word for Guest.
Bug: 22205776
Change-Id: I1a4912b9561196eee811eae31c8df2b72413648f
2015-07-07 10:13:12 -07:00
Zoltan Szatmary-Ban
ec323a0849
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
...
Bug: 22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3
2015-07-07 13:24:07 +01:00
Sanket Padawe
8c5d5c8c56
Disable CA certificate for EAP-SIM, AKA & AKA'
...
Bug: 21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48
2015-07-06 16:14:43 -07:00
