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

17849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
7af02e13bf am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit '29df37969794aa4db73af0d0fdbcde273aef5ab2':
  Hide controls once password is known good
 2014-09-24 23:06:41 +00:00
PauloftheWest
00656b8e46 Fixed multiple MAP issues. 
+ Bluetooth Settings properly stores the MAP state as a shared
preference.
+ A Bluetooth's Settings profile will display MAP even if it was
previously denied.

Bug: 17391677
Change-Id: I94dd7d1a75cc4fe09647c85d84d9e3651a07a673
 2014-09-24 16:06:16 -07: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
98d94401fa am 6d5c75f6: Prevent saving credentials multiple times 
* commit '6d5c75f6cd928befb348fa283e53edc10716f151':
  Prevent saving credentials multiple times
 2014-09-24 17:50:13 +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
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
Zoltan Szatmary-Ban
d50c7a8878 Start PowerUsageDetails fragment in the correct activity 
Make sure the stack does not get corrupted by running a fragment as a
managed profile in an activity that runs as primary profile.

Bug:17523189

Change-Id: I7a066a411c7995ffe44b73c6dc27b24eec85b5b3
 2014-09-24 12:33:33 +01: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
c0277ea2cf am c394e380: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit 'c394e380c5773d257a7b99d22575ca242ab868bc':
  Fix background colors to point directly to theme attribute
 2014-09-24 02:26:34 +00:00
Alan Viverette
c394e380c5 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:45:02 +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
8c3f35a659 am 5fe578d8: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit '5fe578d8fdd161cad9d5fcc99fdb157e47fe8771':
  Fix bug #17594602 Battery Usage refresh icon needs updating
 2014-09-24 00:17:21 +00:00
Fabrice Di Meglio
5fe578d8fd 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:09:03 +00: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
7cc43f7718 am 0490e707: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '0490e707a91a144a309106d20e8291a118661aa8':
  correctly report DHCP failures
 2014-09-23 22:57:33 +00:00
vandwalle
0490e707a9 am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '3962f171a9a44adea57618c5ac9bf4a47342c0b6':
  correctly report DHCP failures
 2014-09-23 22:41:49 +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
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
f931c6db85 am b517f4c5: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit 'b517f4c55e2d28d8a266b9d20863dea44ef73e3a':
  Fix bug #17624121 Settings crash while launching on wiped device
 2014-09-23 20:38:31 +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
b517f4c55e 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:20 +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
Zoltan Szatmary-Ban
9b521f8519 Make Force Stop button work for packages of managed profile 
Call force stop of a package for the correct profile.

Bug: 17580914
Change-Id: I7c601618f7819d6775cf422dca70a929ee1089d9
 2014-09-23 17:22:58 +01:00
PauloftheWest
c501efb09a am b28cfb20: am 7f397ef5: am a205445b: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev 
* commit 'b28cfb2001182a99f6177e16ae241563159503b5':
  Fixed a Settings crash when exiting Wi-Fi Settings.
 2014-09-23 15:53:23 +00:00
John Spurlock
2c383942b3 am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option. 
* commit 'a7fb5fbc7b35ba905d84362582bdf67d53ad5d40':
  Settings: Wire up new zen events config option.
 2014-09-23 15:48:31 +00: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
a50ef37de8 am 34f78835: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev 
* commit '34f78835b9d482010f712183ce2d0b10fd0b8b79':
  Fixed a Settings crash when exiting Wi-Fi Settings.
 2014-09-23 13:16:25 +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