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
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
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
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
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