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
Baligh Uddin
f015d47cf5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-19 22:34:18 +00:00
Baligh Uddin
ae7c180ad7 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-19 22:34:16 +00:00
Svetoslav
90d5dc6310 am 4b1a41c4: am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit '4b1a41c4c657b704e65f7d515b91118feb109693':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 22:20:10 +00:00
Svetoslav
4b1a41c4c6 am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit 'd56668a7d13227780005fcffdcdbd75810cf926f':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 22:11:02 +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
d56668a7d1 am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit 'abcf0302e4351089322debf3739ac169ec299a5a':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 22:00:59 +00:00
Svetoslav
abcf0302e4 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:18 +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
579e970a90 am cce30794: am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit 'cce30794f06310c56024d80e45dcb5d8e7d4a4fa':
  Fix automatic Wi-fi toggle
 2014-09-19 18:58:46 +00:00
Vinit Deshpande
cce30794f0 am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '50234a19aa8d2a5b4b640bbe3cf4f6d735a8baee':
  Fix automatic Wi-fi toggle
 2014-09-19 18:49:14 +00: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
50234a19aa am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '22592afdd5d35618ddd5f8662994d8c15cf43d3f':
  Fix automatic Wi-fi toggle
 2014-09-19 18:37:05 +00:00
Vinit Deshpande
22592afdd5 am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '9a8c58d49dd84a45f216349fd4cbc2dacfdac9fe':
  Fix automatic Wi-fi toggle
 2014-09-19 18:29:45 +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
073c9eb9ab am dd320ec8: am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit 'dd320ec86920d87a6bc38036ca3e9824272ffd2e':
  Show Power usage details for the correct user
 2014-09-19 13:26:57 +00:00
Zoltan Szatmary-Ban
dd320ec869 am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit '30b4aa9f27e36a729f37e0c3bb3e7ebf45f851d1':
  Show Power usage details for the correct user
 2014-09-19 11:00:19 +00:00
Zoltan Szatmary-Ban
30b4aa9f27 am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit '28277ee9fa51cd039e83fd6a87fe60fefb07158a':
  Show Power usage details for the correct user
 2014-09-19 10:49:08 +00: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
28277ee9fa 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:17 +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
c0e25a1ad2 am 1d3a3fb5: am 3d76c268: am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit '1d3a3fb52c76e2203e85bb2a5152846f209fae34':
  Do not overwrite alias with device name
 2014-09-19 09:28:57 +00:00
Matthew Xie
1d3a3fb52c am 3d76c268: am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit '3d76c26887bb0e8f74e76bf64801b6c291ce8847':
  Do not overwrite alias with device name
 2014-09-19 08:40:18 +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
3d76c26887 am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit 'a93c4cae6df26926a8e8b054135c40c71f147226':
  Do not overwrite alias with device name
 2014-09-19 00:43:55 +00:00
Matthew Xie
a93c4cae6d 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:59 +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
Matthew Xie
2f837509dd Do not overwrite alias with device name 
Bug: 17287682
Change-Id: Iea29e85125ae4720fd99f893f516c301b7aed7c6
 2014-09-18 22:54:22 +00:00
Paul Lawrence
ced7db460f Hide controls once password is known good 
Bug: 17551103
Change-Id: I4fd182b7ac7a9ad7c1483979d4510b50b52e520f
 2014-09-18 11:23:40 -07:00
PauloftheWest
7612e0d709 am 21afc838: am 50a53bdb: am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '21afc838de9cf6cc495ccba36dcbc7c014b06220':
  Removed an extraneous messge when pairing.
 2014-09-18 16:35:51 +00:00
PauloftheWest
21afc838de am 50a53bdb: am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '50a53bdbe39d4da11a493aa14cd085460e31f525':
  Removed an extraneous messge when pairing.
 2014-09-18 16:24:29 +00:00
PauloftheWest
58da4c3727 am c932957d: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit 'c932957d4e56c756acea56c11347b4da35a30983':
  Removed an extraneous messge when pairing.
 2014-09-18 16:12:14 +00:00
PauloftheWest
50a53bdbe3 am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit 'f6526146250ff68df0f8941fe0b91ae74d55ab8d':
  Removed an extraneous messge when pairing.
 2014-09-18 16:11:54 +00:00
PauloftheWest
f652614625 am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
  Removed an extraneous messge when pairing.
 2014-09-18 16:01:15 +00:00
PauloftheWest
c932957d4e am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
  Removed an extraneous messge when pairing.
 2014-09-18 16:00:59 +00:00
PauloftheWest
0f01eeff84 Merge "Removed an extraneous messge when pairing." into lmp-dev 2014-09-18 15:51:50 +00:00
Sander Alewijnse
18d99ceab6 am fc10b1e8: am 09c1ddc5: am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'fc10b1e8774a6a579bca3ff6546d73d4753197a1':
  Update targetSdkVersion check.
 2014-09-18 12:18:18 +00:00
Sander Alewijnse
fc10b1e877 am 09c1ddc5: am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '09c1ddc565c6d0954669b4c1642ad8218313bc84':
  Update targetSdkVersion check.
 2014-09-18 12:07:36 +00:00
Sander Alewijnse
0fe16796c5 am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'c995e73391bb4f46154d506f198ee4dec85bae4c':
  Update targetSdkVersion check.
 2014-09-18 11:56:32 +00:00
Sander Alewijnse
09c1ddc565 am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'b997bd50ec5962842c50b1fdf4a50995e7b2a251':
  Update targetSdkVersion check.
 2014-09-18 11:55:46 +00:00
Sander Alewijnse
c995e73391 am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '4241b0a9627e424adb897ec894a34ddce8fd77e3':
  Update targetSdkVersion check.
 2014-09-18 11:46:11 +00:00
Sander Alewijnse
b997bd50ec am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '4241b0a9627e424adb897ec894a34ddce8fd77e3':
  Update targetSdkVersion check.
 2014-09-18 11:45:44 +00:00
Sander Alewijnse
4241b0a962 Merge "Update targetSdkVersion check." into lmp-dev 2014-09-18 11:36:31 +00:00
Zoltan Szatmary-Ban
7a2ccf201e Show Power usage details for the correct user 
Settings > Battery > Details has to observe managed profiles and start the
Power Usage Detail fragment for the correct profile.

Bug: 17523189

Change-Id: I7a47b972a8a0492b4a411197cd2c8c65f24c2e7e
 2014-09-18 12:06:56 +01:00