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
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
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
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
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
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
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
2295581373
am 5f288bc1
: am 894af268
: logd: settings: ro.config.low_ram support
...
* commit '5f288bc17c79c76090075db3a8a307c6421b9eb0':
logd: settings: ro.config.low_ram support
2014-09-17 23:32:07 +00:00
Mark Salyzyn
5f288bc17c
am 894af268
: logd: settings: ro.config.low_ram support
...
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
logd: settings: ro.config.low_ram support
2014-09-17 23:25:57 +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
2f8b417358
am ae2da7a9
: am 69b67465
: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
...
* commit 'ae2da7a90bd9dad3522611f1f105788e1d11fe81':
Don't allow creating a guest from a secondary user...
2014-09-17 20:28:06 +00:00
Amith Yamasani
ae2da7a90b
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:43 +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
ab4fe2d94f
am 9e51261d
: am ae9d437b
: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
...
* commit '9e51261dcc5db11be92660a3bde6b1f1e59ee128':
Settings: Ensure CryptKeeper dismisses secure keyguards.
2014-09-17 19:53:54 +00:00
John Spurlock
9e51261dcc
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:11 +00:00
John Spurlock
ae9d437b4a
Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
2014-09-17 19:37:27 +00:00
PauloftheWest
63f9500e0d
am 08183704
: am 3cc81aea
: Increase char limit for translation.
...
* commit '0818370405da62d427620da5407ca4c5f9c969a0':
Increase char limit for translation.
2014-09-17 18:41:09 +00:00
PauloftheWest
0818370405
am 3cc81aea
: Increase char limit for translation.
...
* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
Increase char limit for translation.
2014-09-17 18:30:12 +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
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
2ffb10d28b
am fd4e0f25
: am 27d74fa2
: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
...
* commit 'fd4e0f2567c97c71615d8defc3b12ed51ce77c05':
[WifiSetup] Update connection state for auto-finish
2014-09-16 19:36:47 +00:00
Maurice Lam
fd4e0f2567
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:47:07 +00:00