PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,359 Commits 1 Branch 0 Tags
9e9b54961d8e59bd89505dc8f20b337995cc2fcc
Commit Graph

15359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
9e9b54961d am 72cf0cf9: am 94e2341b: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit '72cf0cf96d13054569f58109aaf6c0543af1d796':
  Add null check for sync authorities of an account type
 2014-09-25 16:57:50 +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
Alexandra Gherghina
72cf0cf96d am 94e2341b: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit '94e2341bb5557b405792d3040cc67ce24a965485':
  Add null check for sync authorities of an account type
 2014-09-25 16:39:16 +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
Alexandra Gherghina
94e2341bb5 am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit 'eac7cc5eead6d79fb6e0558d8005b4c8ea1911a1':
  Add null check for sync authorities of an account type
 2014-09-25 16:24: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
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
Alexandra Gherghina
eac7cc5eea Merge "Add null check for sync authorities of an account type" into lmp-dev 2014-09-25 09:37:58 +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
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
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
Alexandra Gherghina
7f279cef11 Add null check for sync authorities of an account type 
This protects against a potential NPE if there are no sync authorities for
an account of a given type.

Bug: 17612697
Change-Id: Ifd34b5b7692cbcc8de78d353eedd284e499f954e
 2014-09-24 12:33:39 +01: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
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
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
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
PauloftheWest
b28cfb2001 am 7f397ef5: am a205445b: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev 
* commit '7f397ef5cc28f21680d0ed2872aeda14c70c6623':
  Fixed a Settings crash when exiting Wi-Fi Settings.
 2014-09-23 13:27:37 +00:00
PauloftheWest
7f397ef5cc am a205445b: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev 
* commit 'a205445be28f4c0b0f972344c99d7158c1cc5c2e':
  Fixed a Settings crash when exiting Wi-Fi Settings.
 2014-09-23 13:16:16 +00:00
PauloftheWest
a205445be2 am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev 
* commit '3b04714bdf970eaad831edb3531253c87aced2bc':
  Fixed a Settings crash when exiting Wi-Fi Settings.
 2014-09-23 13:05:53 +00:00
PauloftheWest
3b04714bdf Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev 2014-09-23 13:00:02 +00:00
PauloftheWest
4da0e819ee Fixed a Settings crash when exiting Wi-Fi Settings. 
Bug: 17600287
Change-Id: Id2d35e450798785db8e485972036483946f67ef3
 2014-09-22 15:12:13 -07:00
John Spurlock
a7fb5fbc7b am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option. 
* commit '7d085d6de5c8a75afe4d68bc91cc9e1e3a4bc483':
  Settings: Wire up new zen events config option.
 2014-09-22 21:44:22 +00:00
John Spurlock
7d085d6de5 am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option. 
* commit '65a7bc6449c598cb5ea10e0899f1885339563424':
  Settings: Wire up new zen events config option.
 2014-09-22 21:32:28 +00:00
John Spurlock
65a7bc6449 am 7e905488: Settings: Wire up new zen events config option. 
* commit '7e90548836b3e7c4ec8132d9965ba11f055f6931':
  Settings: Wire up new zen events config option.
 2014-09-22 21:21:04 +00:00
John Spurlock
7e90548836 Settings: Wire up new zen events config option. 
Add a new switch to zen mode settings for the new
events config attribute.

Depends on frameworks/base:
  Iff10df385206ad73c3423ff118c79e94a10918d9

Bug:17580878
Change-Id: Ib6c74a871aa02f9379dce58dd5bca817dcd3929a
 2014-09-22 16:45:06 -04:00
Baligh Uddin
349a3eff41 am 667eb931: (-s ours) am f3bea4dd: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE 
* commit '667eb931552d6cafeb26f064655f8c4f4ebf09f7':
  Import translations. DO NOT MERGE
 2014-09-22 19:38:18 +00:00
Baligh Uddin
19a416826d am 165e3db3: (-s ours) am b4d0d4da: (-s ours) Import translations. DO NOT MERGE 
* commit '165e3db3366290c1397ea753c69f46d6730cd4bc':
  Import translations. DO NOT MERGE
 2014-09-22 19:38:16 +00:00
Baligh Uddin
667eb93155 am f3bea4dd: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE 
* commit 'f3bea4ddd76485014626d7997a0ecbcc5f36217c':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:38 +00:00