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

16011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Svetoslav
e7416dbe3b am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit '1154caa834d1fb502e9f80a509683faaf9b16a7f':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 21:49:11 +00:00
Svetoslav
1154caa834 Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 2014-09-19 21:41:56 +00:00
Svetoslav
43835e006e Crash in Settings cancelling a print job from the job list. 
bug:17585582

Change-Id: I44aef7e09c26141388b410762e93164d8df9a0c6
 2014-09-19 14:15:52 -07:00
PauloftheWest
9bab4ea695 Fixed a Bluetooth discovery bug. 
+ Now when a user goes to Settings->Bluetooth and turns on Bluetooth,
the device will be discoverable.

Bug: 17368189
Change-Id: Ia0d8000ddf7e3c3b43172c08ee28e7305d205462
 2014-09-19 14:07:29 -07:00
Vinit Deshpande
33812f4934 am 749c39f0: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '749c39f0a461bd979cf37c2c722e460a70175162':
  Fix automatic Wi-fi toggle
 2014-09-19 18:37:10 +00:00
Vinit Deshpande
749c39f0a4 am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '9a8c58d49dd84a45f216349fd4cbc2dacfdac9fe':
  Fix automatic Wi-fi toggle
 2014-09-19 18:29:42 +00:00
Vinit Deshpande
9a8c58d49d Merge "Fix automatic Wi-fi toggle" into lmp-dev 2014-09-19 18:21:57 +00:00
PauloftheWest
a4b8fb36b4 Fixed Settings Cellular Networks crash. 
+ Removed the Cellular Networks option from Data Usage when the user is not
  the phone owner.

Bug: 17529931
Change-Id: Ice89b8fb1e6d41fe71235af0beaa1ee3653f8cf8
 2014-09-19 08:08:26 -07:00
Zoltan Szatmary-Ban
f893501081 am ddcb808b: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit 'ddcb808be26b6f2ad368ccfcfed7cd9807256b40':
  Show Power usage details for the correct user
 2014-09-19 10:48:51 +00:00
Zoltan Szatmary-Ban
ddcb808be2 am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit '6e1d8277e6c6443ad286bf25a7decb4f5a9b0cdf':
  Show Power usage details for the correct user
 2014-09-19 10:38:06 +00:00
Zoltan Szatmary-Ban
6e1d8277e6 Merge "Show Power usage details for the correct user" into lmp-dev 2014-09-19 10:27:47 +00:00
Matthew Xie
231a81282a am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit '68f3653e638f42bc28a8e307251e22d713ca97b9':
  Do not overwrite alias with device name
 2014-09-19 00:45:21 +00:00
Matthew Xie
68f3653e63 am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit '72c34e6a956a54ed023d207b41f5d21365b15c38':
  Do not overwrite alias with device name
 2014-09-19 00:31:58 +00:00
Matthew Xie
72c34e6a95 Merge "Do not overwrite alias with device name" into lmp-dev 2014-09-19 00:23:34 +00:00