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
PauloftheWest
f4b548c0f5
Removed all references to "Google Wi-Fi Assistant" from Settings.
...
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card. Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.
Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
2014-09-15 09:31:56 -07:00
Dianne Hackborn
2b54a9fa57
Fix issue #17495264 : Battery history graph is bad
...
Deal better with wall clock time changes in the battery history.
Change-Id: I9d63edafc37bbf663e328a08ba09300be2142594
2014-09-14 19:17:17 -07:00
Prem Kumar
319e7a27c8
am c0deb7da
: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
...
* commit 'c0deb7dac00b4fcbc64866042788e3247474538e':
Remove UI for Forget AP as a secondary user.
2014-09-15 00:00:25 +00:00
Prem Kumar
c0deb7dac0
Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
2014-09-14 23:51:21 +00:00
John Spurlock
f97ec54684
am 2e205e9b
: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
...
* commit '2e205e9b4b16133b29efba91e67bee8f20a51a88':
Settings: Use new PowerManager call to set low power mode.
2014-09-14 21:04:52 +00:00
John Spurlock
2e205e9b4b
Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
2014-09-14 19:36:20 +00:00
John Spurlock
41e8351448
Settings: Use new PowerManager call to set low power mode.
...
Bind the master switch to the power manager state instead
of directly to the single setting.
Depends on frameworks/base change:
Ic030504c9cad9868a7137abbe837b170da37852b
Bug:17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a
2014-09-14 11:23:01 -04:00
Tyler Gunn
86e452f957
am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
2014-09-13 20:12:59 +00:00
Tyler Gunn
3e71b197f7
Renaming Telecomm to Telecom.
...
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.
Bug: 17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
2014-09-12 20:22:25 -07:00
Kenny Guy
1ede808c61
am db9e3f68
: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit 'db9e3f682fd251a9c996141af73b285974dd9d1c':
Fix crash when showing accounts.
2014-09-12 19:37:22 +00:00
Kenny Guy
db9e3f682f
Merge "Fix crash when showing accounts." into lmp-dev
2014-09-12 19:17:10 +00:00
Kenny Guy
7b72e2835b
Fix crash when showing accounts.
...
Accounts page crashed when showing a disabled
manged profile.
Bug: 17486462
Change-Id: Iaaef23e135ee723bcf0d3101d85f9f0422b64c33
2014-09-12 19:49:11 +01:00
Alexandra Gherghina
69af2c6adc
am f738895d
: Merge "Switch to using system-wide default user icons" into lmp-dev
...
* commit 'f738895dc06c5afd6c9525e49eaa50566580d8d6':
Switch to using system-wide default user icons
2014-09-12 17:27:25 +00:00
PauloftheWest
9f96ac6f73
am 37b1253a
: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
...
* commit '37b1253a0195392c13661ad4504e8b8ef3af2ef4':
Fixed multiple Bluetooth Settings crashes.
2014-09-12 17:27:25 +00:00
Alexandra Gherghina
f738895dc0
Merge "Switch to using system-wide default user icons" into lmp-dev
2014-09-12 16:03:53 +00:00
Alexandra Gherghina
bc6e78f9da
Switch to using system-wide default user icons
...
User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.
Bug: 17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b
2014-09-12 17:00:40 +01:00
PauloftheWest
37b1253a01
Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
2014-09-12 13:06:42 +00:00