PauloftheWest
d0ec53e333
Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
2014-08-27 20:40:38 +00:00
Paul West
ad280a9b09
Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev
2014-08-27 20:33:30 +00:00
Paul West
c0963dd7c5
Revert "Tapping a connected Bluetooth device now presents its settings dialog."
...
This reverts commit 893be9cc34
.
Change-Id: Idefe6a1972ca1130a687632f74051e5b5a2e54e1
2014-08-27 20:31:38 +00:00
PauloftheWest
e49c30e533
Applied Material Spec to Bluetooth pairing dialog.
...
Bug: 17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
2014-08-27 13:17:51 -07:00
Jeff Davidson
ffb76318f9
Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev
2014-08-27 18:47:11 +00:00
Jeff Davidson
eadeb11b1b
Use NetworkScoreManager when disabling scoring.
...
Otherwise previous scores will not be cleared and the SCORER_CHANGED
broadcast will not be sent.
Bug: 17299736
Change-Id: I57b0c44a7972d885cf084aacf74829cf7d391dae
2014-08-27 11:20:09 -07:00
PauloftheWest
18fbf724aa
Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev
2014-08-27 17:24:41 +00:00
Maurice Lam
cf3c9ba291
Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev
2014-08-27 17:04:47 +00:00
Sander Alewijnse
320dc05125
Merge "Add extra to home settings starting intent." into lmp-dev
2014-08-26 16:59:24 +00:00
Amith Yamasani
e352845eca
Merge "Fix toggle button clickability in app restrictions" into lmp-dev
2014-08-25 23:18:33 +00:00
Nancy Chen
a1ca4ed14d
Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
2014-08-25 22:24:15 +00:00
Amith Yamasani
3391321e2f
Fix toggle button clickability in app restrictions
...
Also fix side padding
Bug: 17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
2014-08-25 15:20:34 -07:00
Paul Lawrence
ee2a85c7c8
Merge "Honor hide pattern on crypto screen" into lmp-dev
2014-08-25 21:59:27 +00:00
Maurice Lam
b6c414a6d2
[WifiSetup] Progress when wifi scanning
...
Use a custom empty view to show the status while wifi is scanning
or off. Cannot use android.R.id.empty because in phone portrait
layout the illustration is the listview header, which will be hidden
if the list is empty and we use ListView.setEmptyView.
Bug: 17183006
Change-Id: Ie8598303f4e61f87e078008fb7a03918ba92c9ef
2014-08-25 13:19:49 -07:00
PauloftheWest
aa5c7565e4
Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
2014-08-25 16:44:25 +00:00
PauloftheWest
7560e22d76
Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
2014-08-25 15:48:16 +00:00
PauloftheWest
656c88cb71
Updated Tethering and portable hotspot to use switches.
...
Bug: 17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
2014-08-25 08:45:05 -07:00
PauloftheWest
893be9cc34
Tapping a connected Bluetooth device now presents its settings dialog.
...
Bug: 14184769
Change-Id: I1de3110dd7460e0329dbe6df99abf3451d3041cc
2014-08-25 15:40:56 +00:00
Dianne Hackborn
c436b15953
Merge "Tweak voice settings strings." into lmp-dev
2014-08-24 18:53:17 +00:00
Dianne Hackborn
7912a76cd2
Tweak voice settings strings.
...
Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50
2014-08-23 14:11:12 -07:00
Amith Yamasani
8fe710682a
Merge "Don't index the ChooseLockGeneric screen" into lmp-dev
2014-08-23 01:07:03 +00:00
Jeff Davidson
8e6edba560
Merge "Restore legacy VPN stats dialog." into lmp-dev
2014-08-23 00:55:40 +00:00
Amith Yamasani
644907a86f
Don't index the ChooseLockGeneric screen
...
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.
Instead, add some of the relevant keywords up one level in Security
settings.
Bug: 17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
2014-08-22 15:38:16 -07:00
Jim Miller
1351b0fbcd
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
2014-08-22 22:25:16 +00:00
Nancy Chen
db848a5de6
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
...
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both
Bug: 16960458
Change-Id: I8285f15747b66fdfad93d203d848d4a62c0f9b2a
2014-08-22 15:12:01 -07:00
Elliott Hughes
d5ee3bc858
Merge "Settings psuedolocalization fixes." into lmp-dev
2014-08-22 20:42:38 +00:00
Jeff Davidson
b2bb1973fe
Restore legacy VPN stats dialog.
...
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.
Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
2014-08-22 13:12:01 -07:00
Amith Yamasani
8802ccf853
Merge "Switch user on clicking on a user in User Settings" into lmp-dev
2014-08-22 19:37:09 +00:00
Amith Yamasani
f7ba74df59
Switch user on clicking on a user in User Settings
...
This slipped out of the code somehow.
Bug: 15761405
Change-Id: I89c47221f999d5ef23aa7910d31a95bfa730353c
2014-08-22 12:33:23 -07:00
Elliott Hughes
c550f0bff4
Settings psuedolocalization fixes.
...
We don't need -c zz_ZZ any more, and LocalePicker now checks
the global developer options settings itself.
Also remove some dead code now zz_ZY and zz_ZZ are gone.
Bug: 17190407
Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb
2014-08-22 12:24:00 -07:00
Alexandra Gherghina
9239d6d0a2
Merge "Update strings for removing work profile" into lmp-dev
2014-08-22 12:53:29 +00:00
Alexandra Gherghina
4c96267acd
Update strings for removing work profile
...
Bug: 17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169
2014-08-22 11:17:31 +01:00
Jim Miller
9d25005e7a
Show trust agent entries as disabled rather than removing them.
...
Fixes bug 17108810
Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
2014-08-21 19:46:26 -07:00
Paul Lawrence
0f11e15f50
Honor hide pattern on crypto screen
...
Also clear pattern a little more quickly, and show owner info
even from before encrypting (since we're fixing pattern visible,
we should fix owner info too in the same way)
Bug: 17059314
Change-Id: Ie9ccd4a892a1dec32ebe60567d3b72dd6fe25060
2014-08-21 15:41:42 -07:00
Kenny Guy
66b0d9e809
Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
2014-08-21 17:44:25 +00:00
Diego Pontoriero
dbfd04d80a
Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev
2014-08-21 16:34:37 +00:00
PauloftheWest
98f61b71ac
Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
2014-08-21 16:24:11 +00:00
Kenny Guy
333f2bc71a
Disable non-permitted accessibility services and IMEs
...
Bug: 14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
2014-08-21 17:15:49 +01:00
PauloftheWest
b358f6d0f2
Fixed a crash when sharing video through Bluetooth.
...
+ Fixed an issue where Settings would crash when the user tries to share a
youtube video through Bluetooth and rotates the screen.
Bug: 17023413
Change-Id: Ied284da736cf9bfc7424982a516c8305c700dd0b
2014-08-21 08:18:30 -07:00
vandwalle
10673f1a1e
Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
2014-08-21 14:55:45 +00:00
Tadashi G. Takaoka
fe3794a937
Remove "Choose Keyboards" settings
...
Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
2014-08-21 11:41:57 +09:00
Diego Pontoriero
ff9f67dddd
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell
...
for determining carrier app instead of MCC/MNC.
Related WirelessSettings change: http://ag/374330
Related Aeroshell change to SetupWizard: http://ag/520857
Bug: 16457806
Change-Id: I60277b27e9e205041eb3969a110a57da0fb62023
2014-08-20 16:44:46 -07:00
vandwalle
1dfdcdb470
rename ScanResult.status -> autoJoinStatus
...
This CL is dependent on Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3
Change-Id: Iec1a1e4718530f149051bd5de5235f0e0e4a438d
2014-08-20 21:11:18 +00:00
PauloftheWest
27bd00ba27
Entering Bluetooth in Settings will always initiate a scan.
...
Bug: 17060518
Change-Id: I4ba13097f664b4a758ba714f423fa8b34af60ce6
2014-08-20 13:23:49 -07:00
Jeff Davidson
8a983e438b
Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev
2014-08-20 20:15:45 +00:00
Jeff Davidson
4e064343b3
Merge "Less intrusive VPN dialog." into lmp-dev
2014-08-20 21:39:11 +00:00
PauloftheWest
e847e7ef56
Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev
2014-08-20 21:39:11 +00:00
PauloftheWest
5badff7622
Added a default Bluetooth icon for Bluetooth Preferences.
...
Bug: 17139683
Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7
2014-08-20 14:48:38 -07:00
Jon Miranda
735219be8f
Merge "Added a developer option to save attribute data." into lmp-dev
2014-08-20 01:43:56 +00:00
Alan Viverette
aaa066b66d
Add "experimental" subtitle to color correction and inversion
...
BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
2014-08-19 17:37:16 -07:00