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

20643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sasha Levitskiy
0e0cff3261 Fingerprint: Add post enroll call 
Bug 22007124

Change-Id: I670e101a1b7dfa77a4e45022840dfc916fe5ee0d
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2015-07-08 16:03:11 -07:00
Selim Cinek
abd67de1ad Fixed the layout for the fingerprint renaming 
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
 2015-07-08 15:47:56 -07:00
Tim Kilbourn
49983b991c Show correct text for app link domains. 
The user's preferences were not queried on the app listing, making it
look like an app would open links even after the user disabled app
links for the app.

Bug: 21093152
Change-Id: I133ff229bb5e289ebec8df06924936fb3177f095
 2015-07-08 15:43:43 -07: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
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
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
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
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
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
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
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
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
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
Sanket Padawe
aa165e0a50 Locale based string changes in BT. 
Bug: 22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e
 2015-07-07 12:13:08 -07: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