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

24260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
8fe6efc8e1 Update sorting for rule types and instances. 
Bug: 22977552
Change-Id: I671f45f156f8f3faa4ce55608dd1d61b9f07d16a
 2015-10-16 11:43:54 -04:00
Jason Monk
562e40f66a Fix add account screen 
Don't use layout that didn't do anything special.

Bug: 24961118
Change-Id: I9207ee16e8c2c8325f3b4c00e423ac015170d10e
 2015-10-16 10:59:02 -04:00
Jason Monk
afa3a1a0cb Fix ManagedServiceSettings to work with Preferencev14 
Bug: 25007000
Change-Id: I5e3a59b77001ce0e2928b35fa1b87878e22d4fbd
 2015-10-16 10:52:16 -04:00
Jason Monk
77b11fa470 Fix crashes in Settings 
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.

Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
 2015-10-16 10:13:53 -04:00
Clara Bayarri
fe432e838e Refactor Choose/Confirm Lock flow to take user id 
This is a first step to allow this flow to be reused for setting
a work profile-specific lock, to be used with the work challenge.

Change-Id: Iaa65fdab9021cda5f0a1d3bc526a6b54f8a7dd16
 2015-10-16 11:47:18 +01:00
Maurice Lam
bd28ceef10 Fix preferences v14 issues in lock screeen setup 
Preferences support-v14 expects a RecyclerView, and cannot override
onCreateView to inflate custom views. This changes
SetupChooseLockGeneric to use suw_template_no_scroll and let
preference framework inflate its RecyclerView inside it.

Bug: 24929660
Change-Id: Icda0fed37b68d4cffb49da46a241185f32d7e467
 2015-10-15 14:34:06 -07:00
Jason Monk
2b7592d817 Fix SUW Settings themes 
Bug: 24929660
Change-Id: I21979a115e968a9e3a7ecd42f8258d0ce470cd6e
 2015-10-15 15:37:59 -04:00
Amit Mahajan
2ffc11c069 am 7b990298: am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit '7b990298323f0e24c87123d955cfd08717a079d3':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:54:00 +00:00
Amit Mahajan
7b99029832 am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit 'f20d51f3b02fafb6001e91de8b3d5a15e6222099':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:49:08 +00:00
Amit Mahajan
f20d51f3b0 am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit '6d042a69aa23db5a50c429e7fcda9dc3327f880d':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:42:33 +00:00
Amit Mahajan
6d042a69aa am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit '1704ca968d4566218f159817625f849c1dc34d96':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:37:32 +00:00
Amit Mahajan
1704ca968d Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 2015-10-14 23:33:01 +00:00
Jeff Sharkey
cabb62faf3 Bail if activity was destroyed. 
Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
 2015-10-14 14:45:52 -07:00
Erik Kline
3acdaac1b0 am 38fc400a: am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '38fc400ac901c8cfec0aeaf07c9d11a2f29d3ce2':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 18:01:50 +00:00
Erik Kline
38fc400ac9 am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '453d52b6575ebd97c7b4c962bd3a687c1c163968':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 17:55:18 +00:00
Erik Kline
453d52b657 am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '51d71aa2bf1f84fffda6b4144520e9a3bad25985':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 17:48:50 +00:00
Erik Kline
51d71aa2bf am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '583deb524b2d6ed2fd2741c605d5ae02c5c5d52a':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 17:42:15 +00:00
Erik Kline
583deb524b Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 2015-10-14 17:37:52 +00:00
Geoff Mendal
13531ed985 am 63bb6cb9: (-s ours) am fbcbe2a9: (-s ours) am edbd1cd2: (-s ours) am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '63bb6cb9cd7e067e737a82190e4db537cb75e3ef':
  Import translations. DO NOT MERGE
 2015-10-14 14:53:03 +00:00
Geoff Mendal
63bb6cb9cd am fbcbe2a9: (-s ours) am edbd1cd2: (-s ours) am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'fbcbe2a97acb490616955f00b9ac295d6eff0360':
  Import translations. DO NOT MERGE
 2015-10-14 14:48:36 +00:00
Geoff Mendal
fbcbe2a97a am edbd1cd2: (-s ours) am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'edbd1cd28a64887279179b69f0a51c05a61212f4':
  Import translations. DO NOT MERGE
 2015-10-14 14:43:38 +00:00
Geoff Mendal
edbd1cd28a am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '74d90b3e4ed301f910b8e85616e5509822b00c14':
  Import translations. DO NOT MERGE
 2015-10-14 14:39:30 +00:00
Geoff Mendal
74d90b3e4e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-14 14:35:49 +00:00
Geoff Mendal
d71db4f50c Import translations. DO NOT MERGE 
Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5
Auto-generated-cl: translation import
 2015-10-14 07:34:20 -07:00
Geoff Mendal
b06ad28e2b Merge "Import translations. DO NOT MERGE" 2015-10-14 13:56:08 +00:00
Geoff Mendal
0652b63334 Import translations. DO NOT MERGE 
Change-Id: Iecb38744cc520c2abbad60c1b6f0efc4b276b98d
Auto-generated-cl: translation import
 2015-10-14 06:43:11 -07:00
Geoff Mendal
22871a15ec am 338b91f5: (-s ours) am 9535c47b: (-s ours) am 107baf55: (-s ours) am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '338b91f53007c908b5b3b44d2c9aa0c9b4e98fe7':
  Import translations. DO NOT MERGE
 2015-10-14 13:18:03 +00:00
Geoff Mendal
338b91f530 am 9535c47b: (-s ours) am 107baf55: (-s ours) am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '9535c47beae13a0b4e9738ab84c6f7ff649ca76d':
  Import translations. DO NOT MERGE
 2015-10-14 13:12:54 +00:00
Geoff Mendal
9535c47bea am 107baf55: (-s ours) am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '107baf5504d938828b5212eb1bbb06e36945ae49':
  Import translations. DO NOT MERGE
 2015-10-14 13:09:26 +00:00
Geoff Mendal
107baf5504 am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '0884f09acf51b2187abc5ec038590726f6923b29':
  Import translations. DO NOT MERGE
 2015-10-14 13:04:12 +00:00
Geoff Mendal
0884f09acf am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98':
  Import translations. DO NOT MERGE
 2015-10-14 12:59:54 +00:00
Geoff Mendal
67b0ffc88b am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
  Import translations. DO NOT MERGE
 2015-10-14 12:53:54 +00:00
Jason Monk
8931367a9b Merge "Fix crash language & input settings" 2015-10-14 12:51:57 +00:00
Geoff Mendal
8b6b589dbd am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit 'cec2a65a98161c6c69e373647f03745c59246097':
  Import translations. DO NOT MERGE
 2015-10-14 12:49:34 +00:00
Geoff Mendal
138b7732d6 am a1641e81: (-s ours) am e3e4bd7f: (-s ours) am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit 'a1641e814370f0f2bdfb241de249f9a8e10200a9':
  Import translations. DO NOT MERGE
 2015-10-14 12:46:52 +00:00
Geoff Mendal
cec2a65a98 am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE
 2015-10-14 12:45:51 +00:00
Geoff Mendal
a1641e8143 am e3e4bd7f: (-s ours) am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit 'e3e4bd7f32c30fa131fb84142a9c1cd05771750e':
  Import translations. DO NOT MERGE
 2015-10-14 12:43:15 +00:00
Geoff Mendal
26bb544ff2 am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
  Import translations. DO NOT MERGE
 2015-10-14 12:40:45 +00:00
Geoff Mendal
e3e4bd7f32 am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit '54158bc74debbe76637077cb354d910cfcf8ef01':
  Import translations. DO NOT MERGE
 2015-10-14 12:38:52 +00:00
Geoff Mendal
54158bc74d am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit 'd1ba8f73cebeedf4da291db868afddd34ba94092':
  Import translations. DO NOT MERGE
 2015-10-14 12:34:05 +00:00
Geoff Mendal
46eb1857b6 Import translations. DO NOT MERGE 
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
 2015-10-14 05:30:54 -07:00
Geoff Mendal
d1ba8f73ce am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91':
  Import translations. DO NOT MERGE
 2015-10-14 12:30:14 +00:00
Geoff Mendal
c6d5ac0fb7 am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit '974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
  Import translations. DO NOT MERGE
 2015-10-14 12:23:45 +00:00
Geoff Mendal
974dfc1fbd Import translations. DO NOT MERGE 
Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import
 2015-10-14 05:17:15 -07:00
Jason Monk
783718fffe Fix crash language & input settings 
Bug: 24576551
Change-Id: Ifb717689c862193cf06c23de52b3fb68f910db3c
 2015-10-13 16:45:49 -04:00
Jason Monk
39b467482d Depend on support lib preferences 
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
 2015-10-13 10:12:20 -04:00
Lorenzo Colitti
c311c94af5 Unconfigure the lockdown VPN if the user forgets its profile. 
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.

Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.

Bug: 23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
 2015-10-13 15:23:38 +09:00
Geoff Mendal
136ed7b6b2 am 878faf03: (-s ours) am 56b7a690: (-s ours) am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE 
* commit '878faf03bc2ff22faf201c2e14b97ac47f95f977':
  Import translations. DO NOT MERGE
 2015-10-13 03:59:58 +00:00
Geoff Mendal
878faf03bc am 56b7a690: (-s ours) am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE 
* commit '56b7a690d1e4ca8bf50347b72f6dc2222d326db2':
  Import translations. DO NOT MERGE
 2015-10-13 00:19:23 +00:00
Geoff Mendal
56b7a690d1 am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE 
* commit '14bd3435f306d0ece1715c8bd32e843d0f836fdd':
  Import translations. DO NOT MERGE
 2015-10-12 19:42:31 +00:00