PauloftheWest
3b04714bdf
Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
2014-09-23 13:00:02 +00:00
Michael Wright
29aaa20442
If a device identifier is specified, bring up keyboard layouts dialog.
...
Bug: 17614683
Change-Id: I0c25033d05d482ba45f17b3141b0a8673d0ff4b5
2014-09-22 20:09:56 -07: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
65a7bc6449
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:04 +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
PauloftheWest
3845f270ff
am 27dcfbbd
: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
...
* commit '27dcfbbd893cb5a65fa27ac6b968559e22bf59e4':
Fixed a Bluetooth discovery bug.
2014-09-19 23:53:09 +00:00
PauloftheWest
1f604d5b83
am 1977342e
: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
...
* commit '1977342e43a921005e40d213bef3fe66b0bbefbc':
Fixed Settings Cellular Networks crash.
2014-09-19 23:53:08 +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
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
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
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
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
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
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
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
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
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
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
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
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
Edward Jee
c64a51cb60
am ac8b5b7f
: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
* commit 'ac8b5b7fd6b6774d22d39bb9a4becca1908915c7':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
2014-09-16 08:31:59 +00:00
Edward Jee
299faadbfc
am b0954c1d
: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
...
* commit 'b0954c1d1e02958fd357cae11613f4539fbe270a':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
2014-09-16 08:31:58 +00:00
PauloftheWest
99f7d73b47
am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 08:31:57 +00:00
Dianne Hackborn
9e4b526951
am 94aae9af
: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit '94aae9afd18c17848aed68addd19d93c937c7555':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-16 08:31:56 +00:00
Dianne Hackborn
ebcba9dca7
am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit 'ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 08:31:55 +00:00
Vinit Deshpande
e2c1d504fc
Fix automatic Wi-fi toggle
...
It is happening because there previous view doesn't disconnect
itself from setting change; and then two views alternatively
enable/disable wifi.
Bug: 17157005
Change-Id: I42916a7bbd735960a26efbae670c9b927ec8574d
2014-09-15 20:18:35 -07:00
Edward Jee
ac8b5b7fd6
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.
However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.
Bug: 17158953
Change-Id: I44fde350ea35027df0de77feec1ea19c65f2f1c6
2014-09-16 01:25:47 +00:00
Edward Jee
b0954c1d1e
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
2014-09-16 01:19:07 +00:00
Edward Jee
a539716a94
Do not show phonebook access permission dialog if pairing dialog has already been shown.
...
Bug: 16964116, 13886947, 16345619
Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
2014-09-15 14:33:13 -07:00
PauloftheWest
0ca0c8ad20
Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
2014-09-15 21:25:13 +00:00
Dianne Hackborn
94aae9afd1
Little more on issue #17495264 : tweak when we ignore initial times.
...
Change-Id: I7053eb64d7d2281984baef9606334c2df4783cc5
2014-09-15 14:00:37 -07:00
Sander Alewijnse
e625a57a28
Update targetSdkVersion check.
...
Bug:16509819
Change-Id: Ibc0afd234eaa13c1862c8e8dd60d68940aa559f5
2014-09-15 18:55:56 +01:00