PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,076 Commits 1 Branch 0 Tags
324f29c86db2e746ec5fc41ddd0b81444e6bf76c
Commit Graph

16076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
4bda5d6e25 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 09:48:39 +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
7c8e48703b am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit 'd642d1abcfed427e4c152e28e39b50cdb68b81c6':
  Include reason when wiping data.
 2014-09-24 23:35:40 +00:00
Jeff Sharkey
d642d1abcf Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:28:00 +00:00
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
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
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
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
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
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
3962f171a9 Merge "correctly report DHCP failures" into lmp-dev 2014-09-23 22:31:56 +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
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
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
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
34f78835b9 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:51 +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
Michael Wright
29aaa20442 If a device identifier is specified, bring up keyboard layouts dialog. 
Bug: 17614683
Change-Id: I0c25033d05d482ba45f17b3141b0a8673d0ff4b5
 2014-09-22 20:09:56 -07: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
87fdccdc57 am f1a24609: am 7e905488: Settings: Wire up new zen events config option. 
* commit 'f1a2460992ca95886e4c938b18129ff707261b3f':
  Settings: Wire up new zen events config option.
 2014-09-22 21:32:18 +00:00
John Spurlock
f1a2460992 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:31 +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
f6cb6bab0b am acbd8195: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE 
* commit 'acbd8195002b4f5315f5de907149c2084626e28b':
  Import translations. DO NOT MERGE
 2014-09-21 18:30:33 +00:00
Baligh Uddin
acbd819500 am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE 
* commit '2bfd4a5f2cb7e92331f9a4f44f1b70105cc2cb79':
  Import translations. DO NOT MERGE
 2014-09-21 18:19:49 +00: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
6ff1b3d37b am c43b84e3: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev 
* commit 'c43b84e39b11bc8a6bb89dc590cfc6ebd4f6cd6b':
  Fixed a Bluetooth discovery bug.
 2014-09-20 00:02:17 +00:00
PauloftheWest
55d5d83f38 am 8f771c1f: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev 
* commit '8f771c1f990a40044b1f7c3abe2b724abcfc119b':
  Fixed Settings Cellular Networks crash.
 2014-09-20 00:02:16 +00:00
PauloftheWest
c43b84e39b am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev 
* commit '27dcfbbd893cb5a65fa27ac6b968559e22bf59e4':
  Fixed a Bluetooth discovery bug.
 2014-09-19 23:51:46 +00:00
PauloftheWest
8f771c1f99 am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev 
* commit '1977342e43a921005e40d213bef3fe66b0bbefbc':
  Fixed Settings Cellular Networks crash.
 2014-09-19 23:51:45 +00:00
PauloftheWest
27dcfbbd89 Merge "Fixed a Bluetooth discovery bug." into lmp-dev 2014-09-19 23:45:25 +00:00
PauloftheWest
1977342e43 Merge "Fixed Settings Cellular Networks crash." into lmp-dev 2014-09-19 23:44:01 +00:00
Baligh Uddin
85c0622678 am 3cf09bfe: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3cf09bfe98ce0d8ebeb3dbb10f3408d086155607':
  Import translations. DO NOT MERGE
 2014-09-19 22:56:42 +00:00
Baligh Uddin
3cf09bfe98 am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f015d47cf526b2bc6061f8d10dd28b82df1da4ab':
  Import translations. DO NOT MERGE
 2014-09-19 22:46:17 +00:00
Baligh Uddin
f015d47cf5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-19 22:34:18 +00:00
Svetoslav
c269be3928 am e7416dbe: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit 'e7416dbe3bac3f953008cd15b592a2fa125f45d8':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 22:01:39 +00:00