Amith Yamasani
ab88802192
am 81fa31a1: am 561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev
...
* commit '81fa31a104846112c6c7f193ab81a7201ee9914e':
Allow creating last user even if a guest exists.
2014-08-13 20:18:51 +00:00
Amith Yamasani
81fa31a104
am 561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev
...
* commit '561d6bc9bb3f1473ac67f4bef5edac7b3046a901':
Allow creating last user even if a guest exists.
2014-08-13 20:13:13 +00:00
Paul Lawrence
5ae69f7919
am 3007a85e: am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev
...
* commit '3007a85e1136d942c6805c9384688b233565d782':
Bring up factory reset UI when decryption fails but password is correct
2014-08-13 20:00:51 +00:00
Paul Lawrence
3007a85e11
am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev
...
* commit 'd6d0cd53d00a84619f3f90761ee3907732fac898':
Bring up factory reset UI when decryption fails but password is correct
2014-08-13 19:55:41 +00:00
Jim Miller
ad0a630bac
am a063a84c: am 5a10a8df: Use SwitchPreference in TrustAgentSettings.
...
* commit 'a063a84ce26092001cdded38b416b13dc073fde4':
Use SwitchPreference in TrustAgentSettings.
2014-08-13 19:53:10 +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
Jason Monk
f56c9664bd
am 4ee07862: am b37ad3d0: Merge "Handle default properly to avoid scary logging." into lmp-dev
...
* commit '4ee07862cbadeb782fbe598e7f334984070d6c5e':
Handle default properly to avoid scary logging.
2014-08-13 17:38:55 +00:00
Jason Monk
4ee07862cb
am b37ad3d0: Merge "Handle default properly to avoid scary logging." into lmp-dev
...
* commit 'b37ad3d0e903a602272c8ce6e5c51630b5ca063b':
Handle default properly to avoid scary logging.
2014-08-13 17:35:10 +00:00
PauloftheWest
95ff67d500
am fa575c5c: am d8e08e55: Merge "Changed PBAP\'s default permission from allow to UNKNOWN." into lmp-dev
...
* commit 'fa575c5c5fb4cd00a18c786574b8464786436cce':
Changed PBAP's default permission from allow to UNKNOWN.
2014-08-13 17:21:14 +00:00
PauloftheWest
fa575c5c5f
am d8e08e55: Merge "Changed PBAP\'s default permission from allow to UNKNOWN." into lmp-dev
...
* commit 'd8e08e55cd6669f5c576b58d8ed7c79ff27c8fa6':
Changed PBAP's default permission from allow to UNKNOWN.
2014-08-13 17:16:55 +00:00
Amith Yamasani
561d6bc9bb
Merge "Allow creating last user even if a guest exists." into lmp-dev
2014-08-13 16:52:03 +00:00
Paul Lawrence
d6d0cd53d0
Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev
2014-08-13 16:52:03 +00:00
PauloftheWest
22e3dbac1b
am 4fae753d: am e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev
...
* commit '4fae753ddb496d6e7f5b6729da2113f384266dec':
Revert "Add BT message access"
2014-08-13 14:48:39 +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
Dianne Hackborn
017c03822a
am a6d49645: am b51253cf: Add action targets for voice input and usage access settings.
...
* commit 'a6d496455317372a6d3f134e38e89dbcf4c059c8':
Add action targets for voice input and usage access settings.
2014-08-13 04:29:01 +00:00
Dianne Hackborn
a6d4964553
am b51253cf: Add action targets for voice input and usage access settings.
...
* commit 'b51253cfed0796b20e03a104aaca4d8d3e2d3024':
Add action targets for voice input and usage access settings.
2014-08-13 02:09:14 +00:00
Dianne Hackborn
b51253cfed
Add action targets for voice input and usage access settings.
...
Change-Id: I5ea0b34ed440b2cfdce0c63e2c4976c89202eb64
2014-08-12 18:22:06 -07:00
Jason Monk
b37ad3d0e9
Merge "Handle default properly to avoid scary logging." into lmp-dev
2014-08-12 23:14:49 +00:00
Jason Monk
b08853aad9
Handle default properly to avoid scary logging.
...
Lock-to-app enabled should default to false and not bother logging
about it not being set yet.
Bug: 16958525
Change-Id: If0d595107d4d40a62ac5d2cc461a8aa18ff80e19
2014-08-13 13:09:31 -04:00
PauloftheWest
e1fd76a85b
Merge "Revert "Add BT message access"" into lmp-dev
2014-08-12 23:14:49 +00:00
PauloftheWest
d8e08e55cd
Merge "Changed PBAP's default permission from allow to UNKNOWN." into lmp-dev
2014-08-12 23:14:35 +00:00
Fabrice Di Meglio
35513c6258
am ba11d0e9: am 9dc5f808: Fix bug #16958103 android.content.res.Resources: String resource ID #0x7f080971
...
* commit 'ba11d0e9c3137a9a0ca3cc37708ded32e03627f9':
Fix bug #16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
2014-08-12 22:13:35 +00:00
Fabrice Di Meglio
ba11d0e9c3
am 9dc5f808: Fix bug #16958103 android.content.res.Resources: String resource ID #0x7f080971
...
* commit '9dc5f80874709866500744a48d8cf5d734688aaf':
Fix bug #16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
2014-08-12 22:08:09 +00:00
Fabrice Di Meglio
9dc5f80874
Fix bug #16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
...
- remove the indexing offending part from InputMethodAndLanguageSettings as the strings
has been changed
- add indexing for VoiceInputSettings
Change-Id: Ib8da55c935e00538ad6fff2f2590b0d525140734
2014-08-12 22:01:01 +00:00
PauloftheWest
58938ba0d6
Changed PBAP's default permission from allow to UNKNOWN.
...
Bug: 16956658
Change-Id: Ib08bb873a22b8f6b3fb25172aa8612a132257d66
2014-08-12 14:50:10 -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
40543dcb8b
am a12d7ba2: am aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev
...
* commit 'a12d7ba2dab5d9db4d26b8dd6f91b61c11337dbd':
[WifiSetup] Fix colors during setup
2014-08-12 20:28:11 +00:00
PauloftheWest
675c02ca0d
am fb070ed7: am cccc5def: Merge "Added WiFi Assistant settings." into lmp-dev
...
* commit 'fb070ed76e0d9b00891069c2846ebd80f199b648':
Added WiFi Assistant settings.
2014-08-12 20:28:10 +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
c2321bfe29
am 40e1d0db: am 0cfb3c07: Merge "Revised Bluetooth discoverability string." into lmp-dev
...
* commit '40e1d0db82dba22c6011f6e1d1644f127308e9c6':
Revised Bluetooth discoverability string.
2014-08-12 18:37:25 +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
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
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
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
Amith Yamasani
f2663abe1d
Allow creating last user even if a guest exists.
...
Bug: 15934700
Also fix missing icon when user has no icon.
Change-Id: I07c76043df9cda8aeccecb09289d570845dc4560
2014-08-11 17:17:29 -07: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
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
384d8e52b6
Bring up factory reset UI when decryption fails but password is correct
...
Needs string change
Bug: 11477689
Change-Id: I1dcca59483bff32a939b8a7d052eafebd8a1eef0
2014-08-11 15:28:47 -07: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
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