Glenn Kasten
f3aa4abd4b
am 38e472df: am 6a5aad7b: am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev
...
* commit '38e472df158a553f38f7e1e2ba69e61268709226':
Add setting to disable automatic USB audio routing
2014-08-14 05:20:51 +00:00
Glenn Kasten
6a5aad7b2e
am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev
...
* commit 'f51dacedd8ccbe99584e05320a92adbb8e95abfe':
Add setting to disable automatic USB audio routing
2014-08-13 22:56:05 +00:00
Jim Miller
aa4d4b7311
am ad0a630b: am a063a84c: am 5a10a8df: Use SwitchPreference in TrustAgentSettings.
...
* commit 'ad0a630bac1411914091483ac0950961f2d60d27':
Use SwitchPreference in TrustAgentSettings.
2014-08-13 20:00:42 +00:00
Jim Miller
a063a84ce2
am 5a10a8df: Use SwitchPreference in TrustAgentSettings.
...
* commit '5a10a8df0efcf034077cbfcd28dd2e495b8d0441':
Use SwitchPreference in TrustAgentSettings.
2014-08-13 19:48:21 +00:00
Jim Miller
5a10a8df0e
Use SwitchPreference in TrustAgentSettings.
...
Fixes bug 16900059
Change-Id: I52dcfd2a2651f8f770477df3c72176303a9d1b39
2014-08-13 19:43:20 +00:00
PauloftheWest
eda2292101
am 22e3dbac: am 4fae753d: am e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev
...
* commit '22e3dbac1beb126849b2636741a05c9a7ec2f47a':
Revert "Add BT message access"
2014-08-13 14:52:43 +00:00
PauloftheWest
4fae753ddb
am e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev
...
* commit 'e1fd76a85bf86fe5cd6637d3fdfe6420283395ed':
Revert "Add BT message access"
2014-08-13 14:46:02 +00:00
Glenn Kasten
f51dacedd8
Merge "Add setting to disable automatic USB audio routing" into lmp-dev
2014-08-12 23:14:35 +00:00
Glenn Kasten
ca54234efc
Add setting to disable automatic USB audio routing
...
Bug: 16381952
Change-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43
2014-08-13 11:04:25 -07:00
PauloftheWest
f8cdcbf19c
Revert "Add BT message access"
...
- removed Message Access screen from Bluetooth overflow
Bug: 15720425
Change-Id: I68191a4639ea7e6b6cd3a60e88160443fab2ba0e
2014-08-12 14:18:35 -07:00
Maurice Lam
b449417d8a
am 40543dcb: am a12d7ba2: am aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev
...
* commit '40543dcb8bef6b2d44b87e0c78860dfa894a0034':
[WifiSetup] Fix colors during setup
2014-08-12 20:33:03 +00:00
PauloftheWest
8fb9053d1c
am 675c02ca: am fb070ed7: am cccc5def: Merge "Added WiFi Assistant settings." into lmp-dev
...
* commit '675c02ca0deb9991198ee1a10d978298179dce85':
Added WiFi Assistant settings.
2014-08-12 20:33:00 +00:00
Maurice Lam
a12d7ba2da
am aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev
...
* commit 'aea9ae000441940842ba3ec9f93562b684eb9053':
[WifiSetup] Fix colors during setup
2014-08-12 20:25:21 +00:00
PauloftheWest
fb070ed76e
am cccc5def: Merge "Added WiFi Assistant settings." into lmp-dev
...
* commit 'cccc5defd61d836af3b4d3dbaa8edb4928f2a031':
Added WiFi Assistant settings.
2014-08-12 20:25:21 +00:00
Maurice Lam
aea9ae0004
Merge "[WifiSetup] Fix colors during setup" into lmp-dev
2014-08-12 20:02:46 +00:00
PauloftheWest
dab86ad25b
am c2321bfe: am 40e1d0db: am 0cfb3c07: Merge "Revised Bluetooth discoverability string." into lmp-dev
...
* commit 'c2321bfe294fe2794b4e8a2c194eaa61d1f516c8':
Revised Bluetooth discoverability string.
2014-08-12 18:42:45 +00:00
PauloftheWest
40e1d0db82
am 0cfb3c07: Merge "Revised Bluetooth discoverability string." into lmp-dev
...
* commit '0cfb3c079f2bcf3cdfb4d8b54ff856ff0228271e':
Revised Bluetooth discoverability string.
2014-08-12 18:33:29 +00:00
Maurice Lam
7a77a8b2a4
[WifiSetup] Fix colors during setup
...
Fixed background color for dark theme, Wi-Fi icon color for light
and dark themes, "Add another network" button color for light and
dark themes. Created wifi_signal_colored which uses wifi_signal_color
to tint the Wi-Fi icon.
Also fixed theme extra propagation.
Bug: 16903606
Change-Id: Iab24828f888d7827184762d0d63d139d0a2c381e
2014-08-11 18:53:21 -07:00
Jim Miller
968c25bb4a
am 9df6f518: am 40698b76: am 898671f1: Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
...
* commit '9df6f5180bce0f2d33aec16b79b66536546716e9':
Update SecuritySettings to use SwitchPreference
2014-08-12 01:01:31 +00:00
Jim Miller
40698b76c4
am 898671f1: Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
...
* commit '898671f14123695d74bd308450a462d11a341d1a':
Update SecuritySettings to use SwitchPreference
2014-08-12 00:54:00 +00:00
Etan Cohen
d024f03bf7
am 1cff2416: am 047a6aa5: am 19465fa3: Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
...
* commit '1cff2416a15de353597d81b458c236849df60b04':
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
2014-08-12 00:13:23 +00:00
Etan Cohen
047a6aa59a
am 19465fa3: Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
...
* commit '19465fa3eb8f9a4047f83cf422a77c3b0c2e19f6':
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
2014-08-12 00:00:03 +00:00
Etan Cohen
19465fa3eb
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
...
Superseded by "Enhanced 4G LTE Mode" official setting.
This reverts commit 572d253982 .
2014-08-11 23:55:01 +00:00
Fabrice Di Meglio
bf33c50ddd
am afba43a1: am 10697f70: am 26d8c0e9: Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev
...
* commit 'afba43a159d4549581dcc3f3c3b9e44ae0dcf0cb':
Fix bug #16951566 Switchbar color needs to change to ff37474f
2014-08-11 22:43:44 +00:00
Fabrice Di Meglio
10697f7098
am 26d8c0e9: Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev
...
* commit '26d8c0e99e51025b4dd9b50820ed94033fac4d66':
Fix bug #16951566 Switchbar color needs to change to ff37474f
2014-08-11 22:35:08 +00:00
Paul Lawrence
3299c3e3de
am 596dd64f: am 9edd2e4a: am ccf49c02: Merge "Fix UI to mocks" into lmp-dev
...
* commit '596dd64f4298229cc081e9f360313394117518f4':
Fix UI to mocks
2014-08-11 22:21:55 +00:00
Paul Lawrence
9edd2e4a6b
am ccf49c02: Merge "Fix UI to mocks" into lmp-dev
...
* commit 'ccf49c0206d84f5b20a98a8a60278c3e357675eb':
Fix UI to mocks
2014-08-11 22:14:14 +00:00
Michael Wright
32f48265c2
am 8190ee16: am 7d558271: am bb76ee92: Merge "Remove non-functional hardware keyboard options." into lmp-dev
...
* commit '8190ee16c1c7d7150d3d6b29fe3974c73a62327d':
Remove non-functional hardware keyboard options.
2014-08-11 21:02:59 +00:00
Michael Wright
7d55827198
am bb76ee92: Merge "Remove non-functional hardware keyboard options." into lmp-dev
...
* commit 'bb76ee92bc69a6ccae7c9085e23a45504c2c1217':
Remove non-functional hardware keyboard options.
2014-08-11 20:53:16 +00:00
Michael Wright
bb76ee92bc
Merge "Remove non-functional hardware keyboard options." into lmp-dev
2014-08-11 18:20:32 +00:00
Michael Wright
572f90bdf8
Remove non-functional hardware keyboard options.
...
Bug: 16027438
Bug: 16486654
Change-Id: Ia53d5d98c05586bbbd232519d8094706877ecaaf
2014-08-11 13:02:09 -07:00
Fabrice Di Meglio
26d8c0e99e
Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev
2014-08-11 18:20:32 +00:00
Fabrice Di Meglio
8da603f230
Fix bug #16951566 Switchbar color needs to change to ff37474f
...
- change the SwitchBar color as requested by UX
Change-Id: I3ca81e8ac0276fa9aab205f0045cd8b14855ddf7
2014-08-11 15:31:33 -07:00
Paul Lawrence
ccf49c0206
Merge "Fix UI to mocks" into lmp-dev
2014-08-11 18:20:32 +00:00
Paul Lawrence
4fd2e5f398
Fix UI to mocks
...
Bug: 16034329
Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
2014-08-11 15:00:00 -07:00
Jim Miller
898671f141
Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
2014-08-11 18:14:57 +00:00
Jim Miller
4a9065e654
Update SecuritySettings to use SwitchPreference
...
Fixes bug 16900059
Change-Id: Ic3d498c3c4da32f1ba75559073957bb1087912f1
2014-08-11 16:35:41 -07:00
PauloftheWest
cccc5defd6
Merge "Added WiFi Assistant settings." into lmp-dev
2014-08-11 17:55:01 +00:00
PauloftheWest
d60f85daad
Added WiFi Assistant settings.
...
+ Added ability to setup Wifi Assistant.
- Removed 'Avoid poor connections' from WiFi Advance Settings.
- Removed 'Optimize Wi-Fi' from WiFi Advance Settings.
+ Replaced checkboxes with switches in WifFI Advance Settings.
+ Added horizontal rule to seperate MAC/IP address text.
Bug: 15698824
Change-Id: Ia319ff5fb2566854666a07d0e77c8816a49fd3d6
2014-08-12 11:27:38 -07:00
PauloftheWest
ad11a0f989
Revised Bluetooth discoverability string.
...
Bug: 16882911
Change-Id: I89ec10c42747079e9714ae618294d06997059159
2014-08-12 09:09:05 -07:00
Zoltan Szatmary-Ban
15c212b855
am 986df0c9: am 3acb8874: am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
...
* commit '986df0c92ae5900f196a114396802a7d1edaeed7':
Increase CHAR_LIMIT on Device Admins Settings message
2014-08-11 12:19:42 +00:00
Zoltan Szatmary-Ban
3acb88746a
am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
...
* commit 'd58f0bd64f1554a4c15b812bcd90fc52f00860b6':
Increase CHAR_LIMIT on Device Admins Settings message
2014-08-11 12:13:51 +00:00
Alexandra Gherghina
80f5a84bf0
am d857636e: am bad9e585: am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev
...
* commit 'd857636eec3bbb862a9259130fca569c95de3b72':
Show managed profile under accounts rather than users
2014-08-11 09:35:53 +00:00
Alexandra Gherghina
bad9e585dd
am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev
...
* commit 'ad54ba7030be6654bd76b3ee1a001d388130bcac':
Show managed profile under accounts rather than users
2014-08-11 09:29:20 +00:00
Paul Lawrence
9ab22ac93d
am b1f3a008: am c4427491: am f8811a59: Merge "Strings for next change" into lmp-dev
...
* commit 'b1f3a00884dd1e68e460313b1dbb33fbe3c56ba2':
Strings for next change
2014-08-08 23:11:24 +00:00
Paul Lawrence
c44274917f
am f8811a59: Merge "Strings for next change" into lmp-dev
...
* commit 'f8811a59ffd4fa39997154681d753d3370697b83':
Strings for next change
2014-08-08 22:59:36 +00:00
Zoltan Szatmary-Ban
d58f0bd64f
Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
2014-08-08 20:34:05 +00:00
Zoltan Szatmary-Ban
a1373770c1
Increase CHAR_LIMIT on Device Admins Settings message
...
Increased CHAR_LIMIT to 120 on @string/managed_profile_device_admin_info to
accomodate translation.
Bug:16838113
Change-Id: I111ed73d6ff546387c4a2b5df5f4edf8a3932be7
2014-08-11 11:50:39 +01:00
Alexandra Gherghina
ad54ba7030
Merge "Show managed profile under accounts rather than users" into lmp-dev
2014-08-08 20:34:05 +00:00
Alexandra Gherghina
83adb564de
Show managed profile under accounts rather than users
...
Also fixes overflow menu to update on remove/add managed profile.
Bug: 16234745
Bug: 16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
2014-08-11 10:02:13 +01:00