PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,022 Commits 1 Branch 0 Tags
1742c46ba8b755316ac802d003753ea9dfaf349a
Commit Graph

17022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
1742c46ba8 am f3065166: am 390b0bae: am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit 'f3065166021cd8b63422508d2d0ec9e2ac283c73':
  Include reason when wiping data.
 2014-09-25 18:42:38 +00:00
Jeff Sharkey
f306516602 am 390b0bae: am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit '390b0bae5ddc0cf400d09193fea06e02630d8a41':
  Include reason when wiping data.
 2014-09-25 18:32:30 +00:00
Jeff Sharkey
390b0bae5d am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit '8acdcf7a522af8c4f21e1727ae82be516e34c113':
  Include reason when wiping data.
 2014-09-25 16:57:49 +00:00
Jeff Sharkey
8acdcf7a52 am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit 'a522e9a83739446bf89d801f7ceac5f7effc3727':
  Include reason when wiping data.
 2014-09-25 16:39:15 +00:00
Jeff Sharkey
a522e9a837 am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit 'd642d1abcfed427e4c152e28e39b50cdb68b81c6':
  Include reason when wiping data.
 2014-09-25 16:22:25 +00:00
Paul Lawrence
adeed27664 am d54a2e05: am 1bbaf081: am f295f01b: am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit 'd54a2e0506de833b3461a649d217a478f4046b4d':
  Hide controls once password is known good
 2014-09-25 10:35:01 +00:00
Paul Lawrence
d54a2e0506 am 1bbaf081: am f295f01b: am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit '1bbaf081363e04506896965192c1d316c2e22ab6':
  Hide controls once password is known good
 2014-09-25 10:24:13 +00:00
Paul Lawrence
1bbaf08136 am f295f01b: am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit 'f295f01bcc7200d46d24893392ce9522ace3928c':
  Hide controls once password is known good
 2014-09-25 10:14:08 +00:00
Paul Lawrence
f295f01bcc am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit '2c4de435bf4dfb339fe7b36ab0f9ac93ed8120ce':
  Hide controls once password is known good
 2014-09-25 10:03:46 +00:00
Paul Lawrence
2c4de435bf am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit '29df37969794aa4db73af0d0fdbcde273aef5ab2':
  Hide controls once password is known good
 2014-09-25 09:51:35 +00:00
Jeff Sharkey
d642d1abcf Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:28:00 +00:00
Paul Lawrence
29df379697 Merge "Hide controls once password is known good" into lmp-dev 2014-09-24 22:59:08 +00:00
Jeff Sharkey
1de688d911 Include reason when wiping data. 
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d
 2014-09-24 14:08:05 -07:00
Adrian Roos
2cd9f4c631 am b88b3ea8: am ec93c7b0: am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times 
* commit 'b88b3ea88b490291c684ecc11c923032f4d755a9':
  Prevent saving credentials multiple times
 2014-09-24 17:56:35 +00:00
Adrian Roos
b88b3ea88b am ec93c7b0: am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times 
* commit 'ec93c7b071ff36051a89e8ac339f4e76f3c9e26b':
  Prevent saving credentials multiple times
 2014-09-24 17:43:22 +00:00
Adrian Roos
ec93c7b071 am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times 
* commit 'ed5953026910534857ffd7169b1e4da13f5b6588':
  Prevent saving credentials multiple times
 2014-09-24 17:36:58 +00:00
Adrian Roos
ed59530269 am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times 
* commit 'c45bfc9a3cb46af2fadd8e400d8a691108b94be1':
  Prevent saving credentials multiple times
 2014-09-24 17:24:14 +00:00
Alan Viverette
ebaa0f02e7 am f1f7af01: am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit 'f1f7af01deb8e5c2bfd102ed4455e2d3d59c8e72':
  Fix background colors to point directly to theme attribute
 2014-09-24 17:17:06 +00:00
Fabrice Di Meglio
e1cbf3993b am bd5d45a4: am 4f392ba8: am d1f70635: am b749fd3d: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit 'bd5d45a486c80b7ae2d543b8f0bb3d6f0c460451':
  Fix bug #17594602 Battery Usage refresh icon needs updating
 2014-09-24 17:17:05 +00:00
vandwalle
ff42018639 am 92cc8dbb: am 6767666d: am 333f5b85: am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '92cc8dbb739d5e396a1e2bcecead834f4966b5d6':
  correctly report DHCP failures
 2014-09-24 17:16:31 +00:00
Adrian Roos
c45bfc9a3c am 6d5c75f6: Prevent saving credentials multiple times 
* commit '6d5c75f6cd928befb348fa283e53edc10716f151':
  Prevent saving credentials multiple times
 2014-09-24 17:11:42 +00:00
Adrian Roos
6d5c75f6cd Prevent saving credentials multiple times 
Bug: 17610563
Change-Id: Ibb51889fc8085f8fad5e36481af2419576cda34a
 2014-09-24 15:28:12 +02:00
Alan Viverette
f1f7af01de am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit '05df9029e951816888b06599dd7320de9362f038':
  Fix background colors to point directly to theme attribute
 2014-09-24 04:13:11 +00:00
Fabrice Di Meglio
bd5d45a486 am 4f392ba8: am d1f70635: am b749fd3d: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit '4f392ba82fd0a07ae3bb2662e2fa6253798dae6f':
  Fix bug #17594602 Battery Usage refresh icon needs updating
 2014-09-24 04:13:10 +00:00
Alan Viverette
05df9029e9 am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit 'e4031966eb90c1b457bf92ca353676877b9ef8e2':
  Fix background colors to point directly to theme attribute
 2014-09-24 03:57:42 +00:00
Fabrice Di Meglio
4f392ba82f am d1f70635: am b749fd3d: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit 'd1f7063532e004e235b98a719d619e1e68d5c7bf':
  Fix bug #17594602 Battery Usage refresh icon needs updating
 2014-09-24 03:57:41 +00:00
Alan Viverette
e4031966eb am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit '6f6e547e6ad93eb21599e721526909273e6d4fef':
  Fix background colors to point directly to theme attribute
 2014-09-24 03:29:41 +00:00
Fabrice Di Meglio
d1f7063532 am b749fd3d: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit 'b749fd3d298c72b3377a6bcfd081d3739f40bcf9':
  Fix bug #17594602 Battery Usage refresh icon needs updating
 2014-09-24 03:24:58 +00:00
Alan Viverette
6f6e547e6a am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit '3156e38f5ec788048439a401ea5f5012e11ea2a7':
  Fix background colors to point directly to theme attribute
 2014-09-24 01:34:44 +00:00
Alan Viverette
3156e38f5e Merge "Fix background colors to point directly to theme attribute" into lmp-dev 2014-09-24 01:25:07 +00:00
Alan Viverette
f81f72ffed Fix background colors to point directly to theme attribute 
BUG: 17520824
Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95
 2014-09-23 18:14:54 -07:00
Fabrice Di Meglio
b749fd3d29 am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit 'a1c6a0c895f6d580bebfb714c7930f5ec015770d':
  Fix bug #17594602 Battery Usage refresh icon needs updating
 2014-09-24 00:05:54 +00:00
Fabrice Di Meglio
a1c6a0c895 Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 2014-09-23 23:58:59 +00:00
vandwalle
92cc8dbb73 am 6767666d: am 333f5b85: am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '6767666d25005cdd0ad4fb962b182fdf13a10848':
  correctly report DHCP failures
 2014-09-23 23:18:20 +00:00
Fabrice Di Meglio
6a5ebf5fef Fix bug #17594602 Battery Usage refresh icon needs updating 
- use the correct Framework asset for "refresh"

Change-Id: I57d55c0646fb3a8693cf5cc51a4c7fa213873385
 2014-09-23 16:17:00 -07:00
vandwalle
6767666d25 am 333f5b85: am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '333f5b857666565ba89f6197fd253fd9c9c9b7da':
  correctly report DHCP failures
 2014-09-23 23:05:58 +00:00
vandwalle
333f5b8576 am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '0b5aedc2c560be1af7344e9a7ecacd85ab2cd0c0':
  correctly report DHCP failures
 2014-09-23 22:57:59 +00:00
vandwalle
0b5aedc2c5 am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '3962f171a9a44adea57618c5ac9bf4a47342c0b6':
  correctly report DHCP failures
 2014-09-23 22:41:31 +00:00
vandwalle
3962f171a9 Merge "correctly report DHCP failures" into lmp-dev 2014-09-23 22:31:56 +00:00
Fabrice Di Meglio
ce94dfe030 am ef2a7137: am 6fd07d23: am 615a9f68: am 8a966a45: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit 'ef2a7137d31631d80721c46a9f149868e7300de9':
  Fix bug #17624121 Settings crash while launching on wiped device
 2014-09-23 21:13:22 +00:00
Fabrice Di Meglio
ef2a7137d3 am 6fd07d23: am 615a9f68: am 8a966a45: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit '6fd07d2382d04e30a9120d024f83601174aa5b23':
  Fix bug #17624121 Settings crash while launching on wiped device
 2014-09-23 21:00:48 +00:00
Fabrice Di Meglio
6fd07d2382 am 615a9f68: am 8a966a45: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit '615a9f68fb85f09944d7e98dc0e00ec7ed558712':
  Fix bug #17624121 Settings crash while launching on wiped device
 2014-09-23 20:48:44 +00:00
Fabrice Di Meglio
615a9f68fb am 8a966a45: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit '8a966a452d4ce8b2251a6e9607c64ab56a5d3d1e':
  Fix bug #17624121 Settings crash while launching on wiped device
 2014-09-23 20:38:12 +00:00
Fabrice Di Meglio
8a966a452d am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit '575a4d2a19e0d3e3b052c936ce973d30c8b63be6':
  Fix bug #17624121 Settings crash while launching on wiped device
 2014-09-23 20:27:19 +00:00
Fabrice Di Meglio
575a4d2a19 Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 2014-09-23 20:16:22 +00:00
vandwalle
fb075455bd correctly report DHCP failures 
Change-Id: I7a77da83dfb91d42ae18c54ae369ee8756e8f4d6
 2014-09-23 13:04:09 -07:00
PauloftheWest
9140101b60 am c501efb0: am b28cfb20: am 7f397ef5: am a205445b: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev 
* commit 'c501efb09a0486f49e3c1b54967be7ca638c75a2':
  Fixed a Settings crash when exiting Wi-Fi Settings.
 2014-09-23 19:06:44 +00:00
John Spurlock
edb8125abf am 2c383942: am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option. 
* commit '2c383942b3fbda90e390cf8975fd3de32a0c007e':
  Settings: Wire up new zen events config option.
 2014-09-23 19:06:42 +00:00
Fabrice Di Meglio
b3c7a179b1 Fix bug #17624121 Settings crash while launching on wiped device 
- check for non null reference returned by NfcAdapter.getDefaultAdapter(this)

Change-Id: I88776dbefd351ce1c77cfed6d14b8b2143294488
 2014-09-23 11:36:44 -07:00
Baligh Uddin
b30e33ceba am 76fbe05a: (-s ours) am 349a3eff: (-s ours) am 667eb931: (-s ours) am f3bea4dd: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE 
* commit '76fbe05a6e8acd36775fc7798dc4528ce0dc1fea':
  Import translations. DO NOT MERGE
 2014-09-23 16:17:52 +00:00