Jim Miller
75fe9e027c
API review - move confirm credential constants from Intent
...
Moves constants from Intent to KeyguardManager.
Fixes bug 17006280
Change-Id: I8ee1f534816a3fe823ad44479e227ba6d3675389
2014-08-13 17:03:50 -07:00
Paul Lawrence
ad8bd85d7a
Fix encryption strings
...
Bug: 16901855
Change-Id: I7297a88c173d5a5ca03ee404938c9d4bad550110
2014-08-13 16:02:57 -07: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
Michael Wright
48ddc94b79
am bf55863b
: Remove indexes for removed hard keyboard options.
...
* commit 'bf55863b41efc3ad29c752f133f8739aac35d103':
Remove indexes for removed hard keyboard options.
2014-08-13 22:41:17 +00:00
Michael Wright
bf55863b41
Remove indexes for removed hard keyboard options.
...
Bug: 16027438
Change-Id: If668024e3b7073b49142de7e9aae4a46b4969d40
2014-08-13 22:06:54 +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
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
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
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
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
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
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
Zoltan Szatmary-Ban
f8be13d8ca
Merge "Remove spinner in Settings > VPN" into lmp-dev
2014-08-12 23:14:49 +00:00
Zoltan Szatmary-Ban
1e6653a1b5
Remove spinner in Settings > VPN
...
This CL reverses an earlier change https://googleplex-android-review.git.corp.google.com/#/c/515209
Bug:16030111
Change-Id: I981bd8a5ab03c56b78f38c6016277aa15548adba
2014-08-13 11:11:42 +01: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
Adam Powell
aa772c9521
Merge "Use material alert dialog item view layout" into lmp-dev
2014-08-12 23:14:35 +00:00
Adam Powell
c17bdbf849
Use material alert dialog item view layout
...
Bug 16552638
Change-Id: I6d0d5c2c3d8cc7064828d223134b020a3a0ca828
2014-08-14 13:11:31 -07:00
PauloftheWest
841f760fd7
Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev
2014-08-12 23:14:35 +00:00
PauloftheWest
bc976a017e
Fixed a bug were secure Wi-Fi connections would show unsecured.
...
- Also removed secure summary code as the UX teams has determined it is
superfluous.
Bug: 16297100
Change-Id: Ib02bc2c0433f5354a8f8cf01f4d8785762a762ad
2014-08-13 14:55:00 -07:00
Amith Yamasani
e73b8ccf37
Merge "Make sure profile owner is system app" into lmp-dev
2014-08-12 23:14:35 +00:00
Amith Yamasani
080f8db85c
Make sure profile owner is system app
...
For cases where an app wants to become the profile owner after
setup has completed, make sure that it is a system app.
Bug: 17004847
Change-Id: I88249f1ce3bf841ca4d87f33acfd07a7db906332
2014-08-13 16:18:33 -07: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
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
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
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
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
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
Baligh Uddin
320bcf7b67
Import translations. DO NOT MERGE
...
Change-Id: I0470d9e27435942ef7b8712baadb1eb728641eec
Auto-generated-cl: translation import
2014-08-11 21:11:12 -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
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
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
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
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
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