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

15697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Baligh Uddin
422deeb2fb Import translations. DO NOT MERGE 
Change-Id: I74adcddc2559efb083c46667f51b7849dd0cf952
Auto-generated-cl: translation import
 2014-09-16 20:52:09 -07:00
Baligh Uddin
7107f3e324 Import translations. DO NOT MERGE 
Change-Id: Iac811e557bb7b8e9910ff7e9cdcdefad13c99f8a
Auto-generated-cl: translation import
 2014-09-16 20:48:40 -07:00
Amith Yamasani
f5d14b2aed Don't allow creating a guest from a secondary user... 
unless the primary user has allowed Guest and user creation from
lockscreen.

Bug: 17482220
Change-Id: Idd05889da330d6cbe0d3ccab2e98abfdeba94b96
 2014-09-16 16:36:40 -07:00
Maurice Lam
ac115451eb am 7fc505a1: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '7fc505a1ca9ba65b95189187bc3bde78258be547':
  [WifiSetup] Update connection state for auto-finish
 2014-09-16 18:57:34 +00:00
Maurice Lam
7fc505a1ca am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '27d74fa288c195aa5e1190da5599965472f1aded':
  [WifiSetup] Update connection state for auto-finish
 2014-09-16 18:46:36 +00:00
Maurice Lam
27d74fa288 Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 2014-09-16 18:35:39 +00:00
Maurice Lam
610fdf3343 [WifiSetup] Update connection state for auto-finish 
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.

Bug: 17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
 2014-09-16 11:05:28 -07:00
Baligh Uddin
bbaad6b9a7 am 453053db: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '453053dbcd97bede894e1354e8153039c06a17bb':
  Import translations. DO NOT MERGE
 2014-09-16 16:50:33 +00:00
PauloftheWest
ebb04444a1 am 9e7073ae: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit '9e7073aeb9c5ba03fe6d4f4a46a07a20eefad887':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 16:47:35 +00:00
Edward Jee
a17545faaf am c64a51cb: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit 'c64a51cb603193079ab0f695242012bf803ef4aa':
  Migrates PBAP and MAP access permission data from Settings to Bluetooth.
 2014-09-16 16:47:35 +00:00
Edward Jee
ea9c43ca65 am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '299faadbfc73f62ed0e8be968d62a42daf203e87':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 16:47:34 +00:00
PauloftheWest
f4713e0fad am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '99f7d73b4722b196ba66d9e70741db0ced53b3c9':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 16:47:33 +00:00