PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,305 Commits 1 Branch 0 Tags
2a26ac58f025ea510800053b97aa39bef16091fa
Commit Graph

15305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
2a26ac58f0 am 6da3f84c: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit '6da3f84c9789378d701894a0a65be536da5e220c':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 16:39:16 +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
Zoltan Szatmary-Ban
6da3f84c97 am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit '7258650efdea447dea6f2f557cb9d2b90df92754':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 16:24:17 +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
Zoltan Szatmary-Ban
7258650efd Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 2014-09-25 10:35:58 +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
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
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
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
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
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
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
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
Baligh Uddin
165e3db336 am b4d0d4da: (-s ours) Import translations. DO NOT MERGE 
* commit 'b4d0d4da2e6a2d0fa28b6471b088eeabc80b8f5f':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:30 +00:00
Baligh Uddin
f3bea4ddd7 am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE 
* commit '2bfd4a5f2cb7e92331f9a4f44f1b70105cc2cb79':
  Import translations. DO NOT MERGE
 2014-09-21 18:19:31 +00:00
Baligh Uddin
b4d0d4da2e Import translations. DO NOT MERGE 
Change-Id: Ic065056673757eb2cc68d1102d5e480418e7cc47
Auto-generated-cl: translation import
 2014-09-20 23:34:37 -07:00
Baligh Uddin
9ca34e9ad6 Import translations. DO NOT MERGE 
Change-Id: I03201beb1e3307a852bef4cdae23e6d313588e0b
Auto-generated-cl: translation import
 2014-09-20 23:28:12 -07:00
Baligh Uddin
2bfd4a5f2c Import translations. DO NOT MERGE 
Change-Id: I628b5768f52d634b8ce2a08b1fee5f07de7a8b68
Auto-generated-cl: translation import
 2014-09-20 23:24:41 -07:00
PauloftheWest
04301e3d9b am 3845f270: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev 
* commit '3845f270ff1c51611cc14b524878ae6c83e41590':
  Fixed a Bluetooth discovery bug.
 2014-09-20 00:00:54 +00:00
PauloftheWest
e9a8b3df7d am 1f604d5b: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev 
* commit '1f604d5b83475011bc9ee3dba24d7bad900466d9':
  Fixed Settings Cellular Networks crash.
 2014-09-20 00:00:53 +00:00
PauloftheWest
3845f270ff am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev 
* commit '27dcfbbd893cb5a65fa27ac6b968559e22bf59e4':
  Fixed a Bluetooth discovery bug.
 2014-09-19 23:53:09 +00:00