PauloftheWest
00656b8e46
Fixed multiple MAP issues.
...
+ Bluetooth Settings properly stores the MAP state as a shared
preference.
+ A Bluetooth's Settings profile will display MAP even if it was
previously denied.
Bug: 17391677
Change-Id: I94dd7d1a75cc4fe09647c85d84d9e3651a07a673
2014-09-24 16:06:16 -07:00
Paul Lawrence
29df379697
Merge "Hide controls once password is known good" into lmp-dev
2014-09-24 22:59:08 +00:00
Jeff Sharkey
1de688d911
Include reason when wiping data.
...
This will help us track down who requested a data wipe.
Bug: 17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d
2014-09-24 14:08:05 -07:00
Adrian Roos
c45bfc9a3c
am 6d5c75f6
: Prevent saving credentials multiple times
...
* commit '6d5c75f6cd928befb348fa283e53edc10716f151':
Prevent saving credentials multiple times
2014-09-24 17:11:42 +00:00
Adrian Roos
6d5c75f6cd
Prevent saving credentials multiple times
...
Bug: 17610563
Change-Id: Ibb51889fc8085f8fad5e36481af2419576cda34a
2014-09-24 15:28:12 +02:00
Alexandra Gherghina
7f279cef11
Add null check for sync authorities of an account type
...
This protects against a potential NPE if there are no sync authorities for
an account of a given type.
Bug: 17612697
Change-Id: Ifd34b5b7692cbcc8de78d353eedd284e499f954e
2014-09-24 12:33:39 +01:00
Zoltan Szatmary-Ban
d50c7a8878
Start PowerUsageDetails fragment in the correct activity
...
Make sure the stack does not get corrupted by running a fragment as a
managed profile in an activity that runs as primary profile.
Bug:17523189
Change-Id: I7a066a411c7995ffe44b73c6dc27b24eec85b5b3
2014-09-24 12:33:33 +01:00
Fabrice Di Meglio
b749fd3d29
am a1c6a0c8
: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev
...
* commit 'a1c6a0c895f6d580bebfb714c7930f5ec015770d':
Fix bug #17594602 Battery Usage refresh icon needs updating
2014-09-24 00:05:54 +00:00
Fabrice Di Meglio
a1c6a0c895
Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev
2014-09-23 23:58:59 +00:00
Fabrice Di Meglio
6a5ebf5fef
Fix bug #17594602 Battery Usage refresh icon needs updating
...
- use the correct Framework asset for "refresh"
Change-Id: I57d55c0646fb3a8693cf5cc51a4c7fa213873385
2014-09-23 16:17:00 -07:00
vandwalle
0b5aedc2c5
am 3962f171
: Merge "correctly report DHCP failures" into lmp-dev
...
* commit '3962f171a9a44adea57618c5ac9bf4a47342c0b6':
correctly report DHCP failures
2014-09-23 22:41:31 +00:00
vandwalle
3962f171a9
Merge "correctly report DHCP failures" into lmp-dev
2014-09-23 22:31:56 +00:00
Fabrice Di Meglio
8a966a452d
am 575a4d2a
: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev
...
* commit '575a4d2a19e0d3e3b052c936ce973d30c8b63be6':
Fix bug #17624121 Settings crash while launching on wiped device
2014-09-23 20:27:19 +00:00
Fabrice Di Meglio
575a4d2a19
Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev
2014-09-23 20:16:22 +00:00
vandwalle
fb075455bd
correctly report DHCP failures
...
Change-Id: I7a77da83dfb91d42ae18c54ae369ee8756e8f4d6
2014-09-23 13:04:09 -07:00
Fabrice Di Meglio
b3c7a179b1
Fix bug #17624121 Settings crash while launching on wiped device
...
- check for non null reference returned by NfcAdapter.getDefaultAdapter(this)
Change-Id: I88776dbefd351ce1c77cfed6d14b8b2143294488
2014-09-23 11:36:44 -07:00
Zoltan Szatmary-Ban
9b521f8519
Make Force Stop button work for packages of managed profile
...
Call force stop of a package for the correct profile.
Bug: 17580914
Change-Id: I7c601618f7819d6775cf422dca70a929ee1089d9
2014-09-23 17:22:58 +01:00
PauloftheWest
a205445be2
am 3b04714b
: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
...
* commit '3b04714bdf970eaad831edb3531253c87aced2bc':
Fixed a Settings crash when exiting Wi-Fi Settings.
2014-09-23 13:05:53 +00:00
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