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

16546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Mark Salyzyn
218d49625b am b340d01e: am 9d690250: am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit 'b340d01e2cd9564e61c73aa410a794055a46348b':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:59:12 +00:00
Mark Salyzyn
b340d01e2c am 9d690250: am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit '9d690250b8f6b85d0471477f9385657cdeb4d3a3':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:49:59 +00:00
Mark Salyzyn
9d690250b8 am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit '66718d5a6e51d58a83b186bdd2cc1b6665d0020c':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:32:00 +00:00
Mark Salyzyn
66718d5a6e am 894af268: logd: settings: ro.config.low_ram support 
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:25:54 +00:00
Mark Salyzyn
894af268de logd: settings: ro.config.low_ram support 
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size

Bug: 17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
 2014-09-17 22:26:16 +00:00
PauloftheWest
10773b4d4d Removed an extraneous messge when pairing. 
+ When two devices are executing Bluetooth simply pairing, which does
not need keyboard input, the message "Type the pairing code then press
Return or Enter." has been removed.
+ Note that in legacy pairing the message to type in the pairing key
should remain even if the user is only verifying the key.  The reason is
that we are not able to guarantee the other device does not have to input
the key.
+ Also updated pin entry to Material/Quantum specification.

Bug: 17400402
Change-Id: I7853fa13835f7f60d0e71102de9a079708f3544e
 2014-09-17 14:46:14 -07:00
Amith Yamasani
e1d6666452 am befe3c6f: am c7ab2db7: am 80a1ced5: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit 'befe3c6ff75995fd2bfd45155ff3064e1a4b3fbe':
  Don't allow creating a guest from a secondary user...
 2014-09-17 20:50:55 +00:00
Amith Yamasani
befe3c6ff7 am c7ab2db7: am 80a1ced5: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit 'c7ab2db7dfd6526318da0ae06384dec8e1d79e25':
  Don't allow creating a guest from a secondary user...
 2014-09-17 20:39:13 +00:00
Amith Yamasani
c7ab2db7df am 80a1ced5: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit '80a1ced5b22a24e472c4c465c8fcb8dca7a74da8':
  Don't allow creating a guest from a secondary user...
 2014-09-17 20:27:03 +00:00
Amith Yamasani
80a1ced5b2 am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit '69b674656af869219189fe0f7985c011d29d9b7e':
  Don't allow creating a guest from a secondary user...
 2014-09-17 20:16:44 +00:00
John Spurlock
f1f11b5b25 am 7cd016e3: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit '7cd016e3e0a6256b38f3f64423c0d90e63a873bc':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
 2014-09-17 20:10:04 +00:00
Amith Yamasani
69b674656a Merge "Don't allow creating a guest from a secondary user..." into lmp-dev 2014-09-17 20:06:59 +00:00
John Spurlock
7cd016e3e0 am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit '7dfc3540a33c0bf53227db86ce193dc8ef0f02f4':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
 2014-09-17 20:01:36 +00:00
John Spurlock
7dfc3540a3 am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit '0f01eb7f1ad7939753633becfafc67f2446c9318':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
 2014-09-17 19:53:47 +00:00
John Spurlock
0f01eb7f1a am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit 'ae9d437b4ab8dc98c347e4218390a38900979faa':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
 2014-09-17 19:48:26 +00:00
John Spurlock
ae9d437b4a Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 2014-09-17 19:37:27 +00:00
PauloftheWest
f03f6ab376 am ed9fd0dd: am 01de9832: am b2737bc0: am 3cc81aea: Increase char limit for translation. 
* commit 'ed9fd0ddeda4a3be5f60745af99b8a80460afcae':
  Increase char limit for translation.
 2014-09-17 19:09:08 +00:00
PauloftheWest
ed9fd0dded am 01de9832: am b2737bc0: am 3cc81aea: Increase char limit for translation. 
* commit '01de98321a8485d3aa943976f8192caccba50887':
  Increase char limit for translation.
 2014-09-17 18:56:18 +00:00
PauloftheWest
01de98321a am b2737bc0: am 3cc81aea: Increase char limit for translation. 
* commit 'b2737bc028cdfc72e81b45b149dc8adde639b6ac':
  Increase char limit for translation.
 2014-09-17 18:36:39 +00:00
PauloftheWest
b2737bc028 am 3cc81aea: Increase char limit for translation. 
* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
  Increase char limit for translation.
 2014-09-17 18:27:04 +00:00
John Spurlock
2c52651577 Settings: Ensure CryptKeeper dismisses secure keyguards. 
Otherwise, the lockscreen can be shown during the decryption
challenge, which hides the challenge activity window until
the next reboot.

Bug:17512377
Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af
 2014-09-17 13:33:38 -04:00
PauloftheWest
3cc81aeabf Increase char limit for translation. 
Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
 2014-09-17 08:30:09 -07:00
Maurice Lam
5130a2e453 am 670e1e5e: am ac115451: am 7fc505a1: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '670e1e5e5a7e8aae7fbac3e798d7508d2452707d':
  [WifiSetup] Update connection state for auto-finish
 2014-09-17 05:15:18 +00:00
Baligh Uddin
0bb9427b4a am c6954436: (-s ours) am bbaad6b9: (-s ours) am 453053db: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c6954436fb5b605525ac4ca3c6a47dfa4264dc70':
  Import translations. DO NOT MERGE
 2014-09-17 05:13:08 +00:00
PauloftheWest
3244c683a2 am 2aed3a5e: am ebb04444: am 9e7073ae: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit '2aed3a5ef7c63a29102b405681e0ae15337097d0':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-17 05:13:07 +00:00