PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,991 Commits 1 Branch 0 Tags
31e554acff0106cade16516a056bdc1b0087ee6c
Commit Graph

20991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
31e554acff am babeeacb: am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 
* commit 'babeeacb58d0e24b752598de0383e082e6c76784':
  Fixed the layout for the fingerprint renaming
 2015-07-08 23:37:50 +00:00
Selim Cinek
babeeacb58 am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 
* commit 'aab3a4c84715ecb4c95b60081badd225202723df':
  Fixed the layout for the fingerprint renaming
 2015-07-08 23:22:58 +00:00
Selim Cinek
aab3a4c847 Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 2015-07-08 23:09:52 +00:00
Selim Cinek
abd67de1ad Fixed the layout for the fingerprint renaming 
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
 2015-07-08 15:47:56 -07:00
Jorim Jaggi
2986b0dc97 am 221f3771: am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '221f3771aa3830ca8b8b662994759431dae2ee5b':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:37:47 +00:00
Jeff Sharkey
05d51e2474 am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '22f664084dc0885a495194a907ce4c2af36c9c54':
  Move storage when formatting primary disk.
 2015-07-08 22:37:44 +00:00
Jorim Jaggi
221f3771aa am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '3b517b68057857a2b2552dd09e520907c809f15a':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:22:13 +00:00
Jeff Sharkey
22f664084d am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '68fdb73d0cb2e354063ff5e37349d942923e379e':
  Move storage when formatting primary disk.
 2015-07-08 22:22:11 +00:00
Jorim Jaggi
3b517b6805 am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit 'b493b2910190b95bba6cad0f328a0339acebef9b':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:08:34 +00:00
Jeff Sharkey
68fdb73d0c am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '80eba76b109efa7e48eaf7aac145e05938d4405e':
  Move storage when formatting primary disk.
 2015-07-08 22:08:32 +00:00
Jorim Jaggi
b493b29101 Merge "Hide screenshot preference when assist is disabled" into mnc-dev 2015-07-08 21:59:01 +00:00
Jeff Sharkey
80eba76b10 Merge "Move storage when formatting primary disk." into mnc-dev 2015-07-08 21:55:44 +00:00
Amit Mahajan
e08a3512bb 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'.
 2015-07-08 21:08:11 +00:00
Sanket Padawe
012876e400 am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'beb277de3c01ca1bfed1e22be682a3f79325a6bf':
  Locale based string changes in BT.
 2015-07-08 21:08:09 +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
Amit Mahajan
0757812525 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'.
 2015-07-08 20:53:35 +00:00
Sanket Padawe
beb277de3c am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'a63ee14f45f22f87d2d112ee9e5686e91e9fedc7':
  Locale based string changes in BT.
 2015-07-08 20:53:32 +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
Amit Mahajan
2856c4fcbd am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit '01ce80b574e2404d911750c16a1ddd89c787f3ff':
  Remove 'do not translate' comment for string 'None'.
 2015-07-08 20:37:19 +00:00
Sanket Padawe
a63ee14f45 am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'c7777b947097160cd89252f1f1e27704d82c25f6':
  Locale based string changes in BT.
 2015-07-08 20:37:18 +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
Jorim Jaggi
56db978c2a Hide screenshot preference when assist is disabled 
Bug: 22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
 2015-07-08 13:32:12 -07:00
Amit Mahajan
01ce80b574 Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev 2015-07-08 20:24:10 +00:00
Amit Mahajan
3cd87a2f70 Remove 'do not translate' comment for string 'None'. 
Bug: 22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
 2015-07-08 11:07:34 -07:00
Sanket Padawe
c7777b9470 Merge "Locale based string changes in BT." into mnc-dev 2015-07-08 17:15:57 +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
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
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
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
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
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
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