PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,388 Commits 1 Branch 0 Tags
c7f02876cd74151178b7e15b69bf3f757ffa3e37
Commit Graph

10185 Commits

Author SHA1 Message Date
Sanket Padawe
0c9d1b7ba3 am 0af7dec8: am bd19918f: am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit '0af7dec8b5c9916c5c05c565d365f6871f35bbf6':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 21:37:51 +00:00
Robin Lee
d3e81eb74a am 243a53cd: am a0c850f2: am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 
* commit '243a53cd6e3af7e52d5e00bbb1841bedf038f477':
  Restore Vpn advanced options on re-init or rotate
 2015-07-08 21:37:50 +00:00
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
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
88701273e3 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:36:58 +00:00
Jorim Jaggi
56db978c2a Hide screenshot preference when assist is disabled 
Bug: 22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
 2015-07-08 13:32:12 -07: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
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
Robin Lee
d1e93240aa 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:30 +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
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
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
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
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
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
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
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
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
e0021c426c Move NetworkPolicyEditor from Settings packge to settingslib. 
Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813
 2015-07-07 17:12:30 -07: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
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
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
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
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
Jeff Sharkey
fa7c4905d4 am fe7cea03: am 41e81016: am fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev 
* commit 'fe7cea03af1b5fca75a0e8931945c8e288a5d7ae':
  Fix init order so we have something to measure.
 2015-07-07 00:31:45 +00:00
Jeff Sharkey
d17921337d am b126a4ea: am 084dd048: am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev 
* commit 'b126a4ea4abffecd9580b1c56cde22f58e7f742d':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
 2015-07-07 00:31:43 +00: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
Jeff Sharkey
fe7cea03af am 41e81016: am fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev 
* commit '41e81016f6a2720bf86268fd9562fa4b9654b619':
  Fix init order so we have something to measure.
 2015-07-06 19:18:52 +00:00
Jeff Sharkey
b126a4ea4a am 084dd048: am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev 
* commit '084dd0487cc310e6aed81933a32d7f23b39797cf':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
 2015-07-06 19:18:51 +00:00
Robin Lee
6f4951a1fa Restore Vpn advanced options on re-init or rotate 
Visibility isn't restored as part of instance state by default.

Bug: 22183281
Change-Id: I86a7165e918251bc32f6884b9ad5f9c5987ca075
 2015-07-06 11:40:27 -07:00