PauloftheWest
7fc1cb9dc0
am df7a8207
: am 2e11b99b
: am f42a0a27
: Refreshing Bluetooth devices will clear all available devices.
...
* commit 'df7a8207f21f30cf3c52d805de224ef5a79764ca':
Refreshing Bluetooth devices will clear all available devices.
2014-08-12 17:56:37 +00:00
PauloftheWest
df7a8207f2
am 2e11b99b
: am f42a0a27
: Refreshing Bluetooth devices will clear all available devices.
...
* commit '2e11b99bb5eaa5ca2195f636134e29f3360a3eb7':
Refreshing Bluetooth devices will clear all available devices.
2014-08-12 17:51:07 +00:00
PauloftheWest
2e11b99bb5
am f42a0a27
: Refreshing Bluetooth devices will clear all available devices.
...
* commit 'f42a0a27e3b67602f63ab138e78fdefde81a40b6':
Refreshing Bluetooth devices will clear all available devices.
2014-08-12 17:45:00 +00:00
PauloftheWest
f42a0a27e3
Refreshing Bluetooth devices will clear all available devices.
...
Bug: 16851309
Change-Id: I9ffb1ddaeb8e785be145ea79467fc361a022d8d7
2014-08-12 07:35:11 -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
9df6f5180b
am 40698b76
: am 898671f1
: Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
...
* commit '40698b76c4ea094f5ae8341563640080237d10b2':
Update SecuritySettings to use SwitchPreference
2014-08-12 00:56:52 +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
1cff2416a1
am 047a6aa5
: am 19465fa3
: Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
...
* commit '047a6aa59a1878f3a121fd60f80851f9c591d1e8':
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
2014-08-12 00:08:14 +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
afba43a159
am 10697f70
: am 26d8c0e9
: Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev
...
* commit '10697f7098d84cd64ed47f36c5b2440e8e275093':
Fix bug #16951566 Switchbar color needs to change to ff37474f
2014-08-11 22:39:56 +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
596dd64f42
am 9edd2e4a
: am ccf49c02
: Merge "Fix UI to mocks" into lmp-dev
...
* commit '9edd2e4a6bb2e9a925327519da116d9a671d18e0':
Fix UI to mocks
2014-08-11 22:18:49 +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
Jeff Davidson
6364c7c028
am 9496f758
: am a99343a1
: am 581af8cf
: Merge "Clean up Wi-Fi Assistant card." into lmp-dev
...
* commit '9496f758ae4c91e392aaca02b14ef7906f4c8753':
Clean up Wi-Fi Assistant card.
2014-08-11 21:44:41 +00:00
Jeff Davidson
9496f758ae
am a99343a1
: am 581af8cf
: Merge "Clean up Wi-Fi Assistant card." into lmp-dev
...
* commit 'a99343a1643d4ca7ab9ebcb982cf27bdc6dc65e3':
Clean up Wi-Fi Assistant card.
2014-08-11 21:40:24 +00:00
Jeff Davidson
a99343a164
am 581af8cf
: Merge "Clean up Wi-Fi Assistant card." into lmp-dev
...
* commit '581af8cfeee955cdcc0fbf995d3b462d1b1c6cc6':
Clean up Wi-Fi Assistant card.
2014-08-11 21:36:10 +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
985758bf60
am f52904e5
: am 84086bef
: am ace6dc4f
: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
...
* commit 'f52904e5be418afd7a66b62498fb304436d79d42':
Show physical keyboard settings even when IME is enabled.
2014-08-11 21:02:58 +00:00
Michael Wright
8190ee16c1
am 7d558271
: am bb76ee92
: Merge "Remove non-functional hardware keyboard options." into lmp-dev
...
* commit '7d55827198197f1cfb3d3c77e484ec95b35e0a57':
Remove non-functional hardware keyboard options.
2014-08-11 20:58:27 +00:00
Michael Wright
f52904e5be
am 84086bef
: am ace6dc4f
: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
...
* commit '84086bef852e6c4009dbe71c10f38fa2d7c96262':
Show physical keyboard settings even when IME is enabled.
2014-08-11 20:58:24 +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
84086bef85
am ace6dc4f
: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
...
* commit 'ace6dc4f28bf3188c85d48ddebcd7c53d6d14079':
Show physical keyboard settings even when IME is enabled.
2014-08-11 20:53:15 +00:00
PauloftheWest
348ab5d8c6
am 7b8a6a27
: am c7396657
: am 242b1e51
: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
...
* commit '7b8a6a27f05e874f65bce0764a1f31ef7f752ea6':
Removed the white icon from Bluetooth rename dialog.
2014-08-11 20:32:22 +00:00
PauloftheWest
7b8a6a27f0
am c7396657
: am 242b1e51
: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
...
* commit 'c7396657e7765da5a448e32e0b9558d8078cad1a':
Removed the white icon from Bluetooth rename dialog.
2014-08-11 20:25:50 +00:00
PauloftheWest
c7396657e7
am 242b1e51
: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
...
* commit '242b1e51d45134f150487f60c3c00027737da05a':
Removed the white icon from Bluetooth rename dialog.
2014-08-11 20:20:04 +00:00
Michael Wright
ace6dc4f28
Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
2014-08-11 18:26:04 +00:00
Michael Wright
02d501433d
Show physical keyboard settings even when IME is enabled.
...
The WindowManager lies about the configuration in order to get the
IME to show but the Settings page should still show the physical
keyboard options if one is connected though, so remove the
configuration check and just always check to see if there's a full
keyboard connected.
Bug: 14066881
Change-Id: I085fe4160f3524f3c95737a6809ee03fec5230b4
2014-08-11 13:02:01 -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
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
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
242b1e51d4
Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
2014-08-11 18:05:12 +00:00
PauloftheWest
cefd0c93ce
Removed the white icon from Bluetooth rename dialog.
...
Bug: 15538917
Change-Id: I4e3bca9e8ff6c348af22cdfb17ee3b047ae12d2c
2014-08-11 11:49:31 -07:00
Jeff Davidson
581af8cfee
Merge "Clean up Wi-Fi Assistant card." into lmp-dev
2014-08-11 17:55:01 +00:00
Jeff Davidson
2e7162618d
Clean up Wi-Fi Assistant card.
...
Use a ListView header instead of a Preference to display the card at
the top of the list.
Also clean some dead code.
Bug: 16378017
Change-Id: I5a7f1d197cde071c45395b6d7f6016aa7201187a
2014-08-11 14:07:55 -07:00
Jason Monk
801b2b1cd4
am b86fef6e
: am c2a716aa
: am 918c23bd
: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev
...
* commit 'b86fef6e22187c2c85bfa04aafe62e4ec033f16d':
Don't allow creating guest when can't create user
2014-08-11 17:24:01 +00:00
Jason Monk
b86fef6e22
am c2a716aa
: am 918c23bd
: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev
...
* commit 'c2a716aaca10ec3469573e13616dcccf70c1e088':
Don't allow creating guest when can't create user
2014-08-11 17:19:49 +00:00
Dianne Hackborn
d78d71edf6
am 90a5bffe
: am 4154354f
: am f09fd458
: Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev
...
* commit '90a5bffe672c0affba919652cb8ca8521f4d0a36':
Fix issues in Settings: 16660423, 13172381, 16868094
2014-08-11 17:19:04 +00:00
Jason Monk
c2a716aaca
am 918c23bd
: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev
...
* commit '918c23bd5ff6b8903634320723e57d8c0d79471f':
Don't allow creating guest when can't create user
2014-08-11 17:16:27 +00:00
Dianne Hackborn
90a5bffe67
am 4154354f
: am f09fd458
: Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev
...
* commit '4154354f6280c31f3b39e345c4cd8d0105f46d4e':
Fix issues in Settings: 16660423, 13172381, 16868094
2014-08-11 17:16:01 +00:00
Dianne Hackborn
4154354f62
am f09fd458
: Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev
...
* commit 'f09fd458c4429f88f2d8678ffa147c0ca4cee064':
Fix issues in Settings: 16660423, 13172381, 16868094
2014-08-11 17:11:42 +00:00
Jason Monk
918c23bd5f
Merge "Don't allow creating guest when can't create user" into lmp-dev
2014-08-11 17:09:03 +00:00