PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,495 Commits 1 Branch 0 Tags
8f37500b08060bbbbfb0c2215787b2ebcbcd8db8
Commit Graph

23495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
74d8ac2e27 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:30 +00:00
Geoff Mendal
4a332ee8ed Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 15:39:32 +00:00
Geoff Mendal
2b374308fe Merge "Import translations. DO NOT MERGE" 2015-07-08 15:28:26 +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
b2f2d45af4 am d355c893: am 90c48a41: am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev 
* commit 'd355c8935840d69c87f37154c33dc1f5b0dfcebb':
  Handle uninstall from notifications list
 2015-07-08 15:16:55 +00:00
Zoltan Szatmary-Ban
f601bec35e am 87e918cd: 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 '87e918cdf0ff92c8beee43b9f0be514d608c7b4c':
  Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
 2015-07-08 15:16:29 +00:00
Zoltan Szatmary-Ban
df57fa52ab resolved conflicts for merge of 8eade69d to master 
Change-Id: Id2a2269b506c2ffa06dcfd3a02b32eced5e7632b
 2015-07-08 16:05:49 +01:00
Geoff Mendal
4a1433e375 Import translations. DO NOT MERGE 
Change-Id: I12aef3de5553a5aae064a8b40dc99a869ed02d90
Auto-generated-cl: translation import
 2015-07-08 07:41:58 -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
49c7861984 am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev 
* commit '4652115f1f75633b0cf3811910b0a5336fd90bf4':
  Handle uninstall from notifications list
 2015-07-08 13:43:21 +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
909ddcca43 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:58:50 +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
e78d9ab78f am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev 
* commit '461a48bac97c24706fd3b2f789648f61a42def42':
  Making Settings > Storage multiprofile aware
 2015-07-08 11:10:28 +00:00
Zoltan Szatmary-Ban
461a48bac9 Merge "Making Settings > Storage multiprofile aware" into mnc-dev 2015-07-08 10:54:19 +00:00
Jeff Sharkey
697ff544bf Move storage when formatting primary disk. 
On devices where the primary storage is configured as a physical
device, and when we adopt that device, automatically move the
primary storage to be hosted on the newly created emulated volume.

Bug: 20275423
Change-Id: I759e65a01b323ef3c9ffb86d0b7c8e7b4768a45c
 2015-07-07 22:14:18 -07:00
Wei Liu
918286ff60 am d5e276fa: am 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib. 
* commit 'd5e276fa6e53ab940bec3af0610df3daae2c0052':
  Move NetworkPolicyEditor from Settings packge to settingslib.
 2015-07-08 02:06:51 +00:00
Christopher Tate
4ce5b0e3b9 am 0556a0a9: am 6c444a03: am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev 
* commit '0556a0a94974f202c92d9f31fa86b00857c51ab9':
  App link handling is not just for "official" verified handlers
 2015-07-08 02:06:49 +00:00
Amith Yamasani
0c777692e1 am 4a902ffd: am 0531c255: am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev 
* commit '4a902ffd0b8b19493d5079bd75faed6a61f580c6':
  Use localized name for guest user
 2015-07-08 02:06:48 +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
2db668d547 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:48 +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
5ce2a7f5c4 am 7ac21204: Merge "Use localized name for guest user" into mnc-dev 
* commit '7ac21204e16c797cc4f818ccc51509d425ffaf80':
  Use localized name for guest user
 2015-07-07 20:39:50 +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
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