git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Jeff Sharkey [Wed, 8 Jul 2015 23:06:35 +0000 (23:06 +0000)]

am 2f87423c: am 05d51e24: am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev

* commit '2f87423cb3b3e8ccdd40a08d26d535c716061b9d':
Move storage when formatting primary disk.

commit | commitdiff | tree

Jeff Sharkey [Wed, 8 Jul 2015 22:52:06 +0000 (22:52 +0000)]

am 05d51e24: am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev

* commit '05d51e24744cb99edf00ea52b840be4d9662b8c2':
Move storage when formatting primary disk.

commit | commitdiff | tree

Jeff Sharkey [Wed, 8 Jul 2015 22:37:44 +0000 (22:37 +0000)]

am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev

* commit '22f664084dc0885a495194a907ce4c2af36c9c54':
Move storage when formatting primary disk.

commit | commitdiff | tree

Jeff Sharkey [Wed, 8 Jul 2015 22:22:11 +0000 (22:22 +0000)]

am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev

* commit '68fdb73d0cb2e354063ff5e37349d942923e379e':
Move storage when formatting primary disk.

commit | commitdiff | tree

Jeff Sharkey [Wed, 8 Jul 2015 22:08:32 +0000 (22:08 +0000)]

am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev

* commit '80eba76b109efa7e48eaf7aac145e05938d4405e':
Move storage when formatting primary disk.

commit | commitdiff | tree

Jeff Sharkey [Wed, 8 Jul 2015 21:55:17 +0000 (21:55 +0000)]

Merge "Move storage when formatting primary disk." into mnc-dev

commit | commitdiff | tree

Amit Mahajan [Wed, 8 Jul 2015 21:37:53 +0000 (21:37 +0000)]

am f3053c15: am e08a3512: am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev

* commit 'f3053c15e3cb09af1e6939d2632a3476506be74a':
Remove 'do not translate' comment for string 'None'.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 21:37:52 +0000 (21:37 +0000)]

am d49fbb37: am 012876e4: am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev

* commit 'd49fbb372a504b1644b8880da59108a3816f6f36':
Locale based string changes in BT.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 21:37:51 +0000 (21:37 +0000)]

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'

commit | commitdiff | tree

Robin Lee [Wed, 8 Jul 2015 21:37:50 +0000 (21:37 +0000)]

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

commit | commitdiff | tree

Amit Mahajan [Wed, 8 Jul 2015 21:21:57 +0000 (21:21 +0000)]

am e08a3512: am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev

* commit 'e08a3512bbfb9c3ab73790cf382b514ec4924397':
Remove 'do not translate' comment for string 'None'.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 21:21:56 +0000 (21:21 +0000)]

am 012876e4: am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev

* commit '012876e400d573c9f2deb3c076c611f651e6e2ec':
Locale based string changes in BT.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 21:21:55 +0000 (21:21 +0000)]

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'

commit | commitdiff | tree

Amit Mahajan [Wed, 8 Jul 2015 21:08:11 +0000 (21:08 +0000)]

am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev

* commit '0757812525349f31d921bc877886ece7d3a44c4d':
Remove 'do not translate' comment for string 'None'.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 21:08:09 +0000 (21:08 +0000)]

am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev

* commit 'beb277de3c01ca1bfed1e22be682a3f79325a6bf':
Locale based string changes in BT.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 21:08:08 +0000 (21:08 +0000)]

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'

commit | commitdiff | tree

Amit Mahajan [Wed, 8 Jul 2015 20:53:35 +0000 (20:53 +0000)]

am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev

* commit '2856c4fcbd4d4453245f4ed0aa7bb1bc02b2bd14':
Remove 'do not translate' comment for string 'None'.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 20:53:32 +0000 (20:53 +0000)]

am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev

* commit 'a63ee14f45f22f87d2d112ee9e5686e91e9fedc7':
Locale based string changes in BT.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 20:53:31 +0000 (20:53 +0000)]

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'

commit | commitdiff | tree

Amit Mahajan [Wed, 8 Jul 2015 20:37:19 +0000 (20:37 +0000)]

am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev

* commit '01ce80b574e2404d911750c16a1ddd89c787f3ff':
Remove 'do not translate' comment for string 'None'.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 20:37:18 +0000 (20:37 +0000)]

am c7777b94: Merge "Locale based string changes in BT." into mnc-dev

* commit 'c7777b947097160cd89252f1f1e27704d82c25f6':
Locale based string changes in BT.

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 20:37:16 +0000 (20:37 +0000)]

am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev

* commit 'c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
Disable CA certificate for EAP-SIM, AKA & AKA'

commit | commitdiff | tree

Amit Mahajan [Wed, 8 Jul 2015 20:23:45 +0000 (20:23 +0000)]

Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev

commit | commitdiff | tree

Amit Mahajan [Wed, 8 Jul 2015 18:07:34 +0000 (11:07 -0700)]

Remove 'do not translate' comment for string 'None'.

Bug: 22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 17:15:56 +0000 (17:15 +0000)]

Merge "Locale based string changes in BT." into mnc-dev

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jul 2015 17:14:54 +0000 (17:14 +0000)]

Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev

commit | commitdiff | tree

Robin Lee [Wed, 8 Jul 2015 17:07:36 +0000 (17:07 +0000)]

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

commit | commitdiff | tree

Robin Lee [Wed, 8 Jul 2015 16:54:55 +0000 (16:54 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 16:46:10 +0000 (16:46 +0000)]

am 4dac1089: (-s ours) 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 '4dac108977026b0fdf943b74f443cc127a4c8cd9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Robin Lee [Wed, 8 Jul 2015 16:40:44 +0000 (16:40 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 16:33:55 +0000 (16:33 +0000)]

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

commit | commitdiff | tree

Robin Lee [Wed, 8 Jul 2015 16:27:42 +0000 (16:27 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 16:19:49 +0000 (16:19 +0000)]

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

commit | commitdiff | tree

Robin Lee [Wed, 8 Jul 2015 16:17:22 +0000 (16:17 +0000)]

Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 16:06:29 +0000 (16:06 +0000)]

am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '661dbf01b7ba8cfdb1ab9d1a5dd2054c640fa183':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 15:50:58 +0000 (15:50 +0000)]

am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '4a332ee8ed15c991e29e46490d2a9d93117bca26':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 15:39:31 +0000 (15:39 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 15:28:25 +0000 (15:28 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 15:19:19 +0000 (08:19 -0700)]

Import translations. DO NOT MERGE

Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import

commit | commitdiff | tree

Jason Monk [Wed, 8 Jul 2015 15:16:55 +0000 (15:16 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 15:16:29 +0000 (15:16 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 15:05:49 +0000 (16:05 +0100)]

resolved conflicts for merge of 8eade69d to master

Change-Id: Id2a2269b506c2ffa06dcfd3a02b32eced5e7632b

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 14:41:58 +0000 (07:41 -0700)]

Import translations. DO NOT MERGE

Change-Id: I12aef3de5553a5aae064a8b40dc99a869ed02d90
Auto-generated-cl: translation import

commit | commitdiff | tree

Jason Monk [Wed, 8 Jul 2015 14:27:28 +0000 (14:27 +0000)]

am 90c48a41: am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev

* commit '90c48a4134af1c654c975369f00e497799fece38':
Handle uninstall from notifications list

commit | commitdiff | tree

Jason Monk [Wed, 8 Jul 2015 14:11:45 +0000 (14:11 +0000)]

am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev

* commit 'e14fc96a9c30019c4e091eef302dc407b5cd7536':
Handle uninstall from notifications list

commit | commitdiff | tree

Jason Monk [Wed, 8 Jul 2015 13:57:40 +0000 (13:57 +0000)]

am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev

* commit 'fa10637f2b42ba0d4cc81e6bb0f0a13eaf335e79':
Handle uninstall from notifications list

commit | commitdiff | tree

Jason Monk [Wed, 8 Jul 2015 13:44:38 +0000 (13:44 +0000)]

am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev

* commit '4652115f1f75633b0cf3811910b0a5336fd90bf4':
Handle uninstall from notifications list

commit | commitdiff | tree

Jason Monk [Wed, 8 Jul 2015 13:34:40 +0000 (13:34 +0000)]

Merge "Handle uninstall from notifications list" into mnc-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:35 +0000 (12:55 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:10 +0000 (12:55 +0000)]

am 89be2eea: am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit '89be2eeab0738e7db8d945ff1267dc9bf8fdaeb2':
Making Settings > Storage multiprofile aware

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:25:55 +0000 (12:25 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:12:30 +0000 (12:12 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:57:34 +0000 (11:57 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:45:03 +0000 (11:45 +0000)]

Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:37:51 +0000 (11:37 +0000)]

am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit '38a510df76a596007d9425270d8a927018dc2ae2':
Making Settings > Storage multiprofile aware

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:25:44 +0000 (11:25 +0000)]

am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit '215af288957eb64235af7a67af2143d1caf37428':
Making Settings > Storage multiprofile aware

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:10:45 +0000 (11:10 +0000)]

am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit '461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 10:54:05 +0000 (10:54 +0000)]

Merge "Making Settings > Storage multiprofile aware" into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 8 Jul 2015 05:14:15 +0000 (22:14 -0700)]

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

commit | commitdiff | tree

Wei Liu [Wed, 8 Jul 2015 02:06:51 +0000 (02:06 +0000)]

am d5e276fa: am 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.

* commit 'd5e276fa6e53ab940bec3af0610df3daae2c0052':
Move NetworkPolicyEditor from Settings packge to settingslib.

commit | commitdiff | tree

Christopher Tate [Wed, 8 Jul 2015 02:06:49 +0000 (02:06 +0000)]

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

commit | commitdiff | tree

Amith Yamasani [Wed, 8 Jul 2015 02:06:48 +0000 (02:06 +0000)]

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

commit | commitdiff | tree

Wei Liu [Wed, 8 Jul 2015 01:40:05 +0000 (01:40 +0000)]

am 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.

* commit '27e395427eef95fea47f06b5cc7bbba0e7853016':
Move NetworkPolicyEditor from Settings packge to settingslib.

commit | commitdiff | tree

Christopher Tate [Wed, 8 Jul 2015 01:39:59 +0000 (01:39 +0000)]

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

commit | commitdiff | tree

Amith Yamasani [Wed, 8 Jul 2015 01:36:49 +0000 (01:36 +0000)]

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

commit | commitdiff | tree

Wei Liu [Wed, 8 Jul 2015 00:42:50 +0000 (00:42 +0000)]

am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.

* commit 'e0021c426c75ea8a737714f0b8bb27988ac3a51f':
Move NetworkPolicyEditor from Settings packge to settingslib.

commit | commitdiff | tree

Christopher Tate [Wed, 8 Jul 2015 00:24:08 +0000 (00:24 +0000)]

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

commit | commitdiff | tree

Wei Liu [Tue, 7 Jul 2015 22:37:11 +0000 (15:37 -0700)]

Move NetworkPolicyEditor from Settings packge to settingslib.

Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813

commit | commitdiff | tree

Christopher Tate [Wed, 8 Jul 2015 00:08:17 +0000 (00:08 +0000)]

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

commit | commitdiff | tree

Christopher Tate [Tue, 7 Jul 2015 23:49:11 +0000 (23:49 +0000)]

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

commit | commitdiff | tree

Christopher Tate [Tue, 7 Jul 2015 23:35:52 +0000 (23:35 +0000)]

Merge "App link handling is not just for "official" verified handlers" into mnc-dev

commit | commitdiff | tree

Christopher Tate [Wed, 1 Jul 2015 23:52:43 +0000 (16:52 -0700)]

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

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Jul 2015 21:09:42 +0000 (21:09 +0000)]

am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '8a62bf97e614d7c644ce600b6e14a7aab79892f6':
Use localized name for guest user

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Jul 2015 20:54:18 +0000 (20:54 +0000)]

am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '8e9aca37c6045aeffe83f13a0664cb950a7f7fef':
Use localized name for guest user

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Jul 2015 20:37:31 +0000 (20:37 +0000)]

am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '7ac21204e16c797cc4f818ccc51509d425ffaf80':
Use localized name for guest user

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Jul 2015 20:20:03 +0000 (20:20 +0000)]

Merge "Use localized name for guest user" into mnc-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 1 Jul 2015 15:45:34 +0000 (16:45 +0100)]

Making Settings > Storage multiprofile aware

Also fixing the order of preferences there.

Bug: 22223456
Bug: 22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34

commit | commitdiff | tree

Sanket Padawe [Tue, 7 Jul 2015 19:13:08 +0000 (12:13 -0700)]

Locale based string changes in BT.

Bug: 22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e

commit | commitdiff | tree

Jason Monk [Tue, 7 Jul 2015 18:57:47 +0000 (14:57 -0400)]

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

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Jul 2015 17:13:12 +0000 (10:13 -0700)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 7 Jul 2015 12:24:07 +0000 (13:24 +0100)]

Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on

Bug: 22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3

commit | commitdiff | tree

Jorim Jaggi [Tue, 7 Jul 2015 00:32:56 +0000 (00:32 +0000)]

am bbd59cc2: am 21b05211: am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit 'bbd59cc252ec037c5b385b2c1c74c39f00e27c49':
Text changes to assist & voice input

commit | commitdiff | tree

Jeff Sharkey [Tue, 7 Jul 2015 00:31:45 +0000 (00:31 +0000)]

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.

commit | commitdiff | tree

Jeff Sharkey [Tue, 7 Jul 2015 00:31:43 +0000 (00:31 +0000)]

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.

commit | commitdiff | tree

Sanket Padawe [Mon, 6 Jul 2015 23:14:43 +0000 (16:14 -0700)]

Disable CA certificate for EAP-SIM, AKA & AKA'

Bug: 21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48

commit | commitdiff | tree

Jorim Jaggi [Mon, 6 Jul 2015 22:32:41 +0000 (22:32 +0000)]

am 21b05211: am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '21b05211955ed9646324eb5f1c1c6a48a596d355':
Text changes to assist & voice input

commit | commitdiff | tree

Jorim Jaggi [Mon, 6 Jul 2015 21:33:39 +0000 (21:33 +0000)]

am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit 'a03576049fb71b42829304a46740a2696a233e29':
Text changes to assist & voice input

commit | commitdiff | tree

Jorim Jaggi [Mon, 6 Jul 2015 21:20:03 +0000 (21:20 +0000)]

am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '30001127b22ef39e02155919adaa3906829c9688':
Text changes to assist & voice input

commit | commitdiff | tree

Jorim Jaggi [Mon, 6 Jul 2015 21:04:31 +0000 (21:04 +0000)]

am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
Text changes to assist & voice input

commit | commitdiff | tree

Jorim Jaggi [Mon, 6 Jul 2015 20:48:39 +0000 (20:48 +0000)]

Merge "Text changes to assist & voice input" into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 6 Jul 2015 19:18:52 +0000 (19:18 +0000)]

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.

commit | commitdiff | tree

Jeff Sharkey [Mon, 6 Jul 2015 19:18:51 +0000 (19:18 +0000)]

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.

commit | commitdiff | tree

Jeff Sharkey [Mon, 6 Jul 2015 19:02:19 +0000 (19:02 +0000)]

am fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit 'fe015ffe40c19d60d11b394790e259c513f15ef8':
Fix init order so we have something to measure.

commit | commitdiff | tree

Jeff Sharkey [Mon, 6 Jul 2015 19:02:18 +0000 (19:02 +0000)]

am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit 'fc963764ab93bd2e6fce2a214f9cc992dbceda73':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.

commit | commitdiff | tree

Jorim Jaggi [Mon, 6 Jul 2015 18:48:27 +0000 (11:48 -0700)]

Text changes to assist & voice input

Bug: 22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50

commit | commitdiff | tree

Jeff Sharkey [Mon, 6 Jul 2015 18:45:37 +0000 (18:45 +0000)]

am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit '355c13d294a6c572637571d7df6369916e92394d':
Fix init order so we have something to measure.

commit | commitdiff | tree

Jeff Sharkey [Mon, 6 Jul 2015 18:45:35 +0000 (18:45 +0000)]

am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit 'bdb64bf194c882242af6d2c30cdb421a06cce69a':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.

commit | commitdiff | tree

Robin Lee [Thu, 2 Jul 2015 02:10:22 +0000 (19:10 -0700)]

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

commit | commitdiff | tree

Jeff Sharkey [Mon, 6 Jul 2015 18:12:56 +0000 (18:12 +0000)]

am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit '66b5a58a6850cbf3a3fdbb8df913f0fc5ea5bdaa':
Fix init order so we have something to measure.

commit | commitdiff | tree

Jeff Sharkey [Mon, 6 Jul 2015 18:12:55 +0000 (18:12 +0000)]

am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit '7616b00bb5968382c5f49394fc842049f7ce9185':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.