Commit Graph

15525 Commits

Author SHA1 Message Date
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
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
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
5d46fbe6f7 am 017c0382: am a6d49645: am b51253cf: Add action targets for voice input and usage access settings.
* commit '017c03822a843003777f3850f35fbace1b00c9bf':
  Add action targets for voice input and usage access settings.
2014-08-13 05:20:42 +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
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
e6cbb374f5 am 35513c62: am ba11d0e9: am 9dc5f808: Fix bug #16958103 android.content.res.Resources: String resource ID #0x7f080971
* commit '35513c6258abfa84925cf5ac413fa51bf4774715':
  Fix bug #16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
2014-08-12 22:19:10 +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
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
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
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
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
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
Baligh Uddin
b82066e238 Import translations. DO NOT MERGE
Change-Id: Ibd15fd67b24d78f6c4378008e24d7a50874b7491
Auto-generated-cl: translation import
2014-08-11 21:22:01 -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
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