Geoff Mendal
3f2ece6cea
am 04250824: (-s ours) Import translations. DO NOT MERGE
...
* commit '04250824ff4d5231ee17a060a7ce77fcc02a6657':
Import translations. DO NOT MERGE
2015-01-12 16:14:25 +00:00
Geoff Mendal
04250824ff
Import translations. DO NOT MERGE
...
Change-Id: I3174bd9c344b8bf618340c4b21b0f739ba198095
Auto-generated-cl: translation import
2015-01-12 07:03:11 -08:00
Sanket Padawe
dd0a5db0dd
am 058b0561: Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev automerge: 270af42
...
* commit '058b0561b3712f19aba28020dad3cd63762050f5':
Display Voice nw type if Data nw is Unknown for Sprout.
2015-01-09 19:17:18 +00:00
Sanket Padawe
058b0561b3
Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev
...
automerge: 270af42
2015-01-09 19:11:35 +00:00
Sanket Padawe
270af427cd
Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev
2015-01-09 19:08:26 +00:00
Sanket Padawe
c7e5b42ac4
am 0c3b1371: am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
...
* commit '0c3b13718defb18191120c578c1658c26c4d13e0':
Fixed Cellular data toggling issue in settings for multisim
2015-01-08 23:19:38 +00:00
Sanket Padawe
0c3b13718d
am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
...
* commit 'f5a4abc2057f1e2d242f95e5251e563cff7c9da4':
Fixed Cellular data toggling issue in settings for multisim
2015-01-08 23:15:10 +00:00
Sanket Padawe
f5a4abc205
Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
2015-01-08 23:09:11 +00:00
Sanket Padawe
4201391899
Display Voice nw type if Data nw is Unknown for Sprout.
...
For multisim device when default data connection is set to 1st sim,
getDataNetworkType() returns Unknown for 2nd sim. In that case use
getVoiceNetworkType() to display Cellular nw type in sim status.
Bug: 18922147
Change-Id: Id7c39f8717737b60bde988cbd1c85ce8f6768a6f
2015-01-08 12:37:34 -08:00
Sanket Padawe
24f834d745
Fixed Cellular data toggling issue in settings for multisim
...
Bug: 18916033
Bug: 18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
2015-01-08 11:23:11 -08:00
Benjamin Franz
cc18d7393b
am d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge: ceee535
...
* commit 'd8e53f271f1aa90f92d239f48120ffc6c5b87055':
Block BluetoothPermissionRequest notification on managed profiles.
2015-01-08 17:49:11 +00:00
Benjamin Franz
d8e53f271f
Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev
...
automerge: ceee535
2015-01-08 17:43:02 +00:00
Benjamin Franz
ceee535c65
Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev
2015-01-08 17:40:09 +00:00
Andres Morales
dfb448d23e
am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
...
* commit 'f58a646bc01cc8d416d5babae2d06dad5018cc6d':
Don't display Write NFC option if no NFC
2015-01-07 16:31:57 +00:00
Andres Morales
f58a646bc0
am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
...
* commit 'f11feccf99948d166e6873315252fdaf416ae272':
Don't display Write NFC option if no NFC
2015-01-07 16:26:19 +00:00
Andres Morales
f11feccf99
Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev
2015-01-07 16:21:48 +00:00
Geoff Mendal
634b17063b
am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
...
* commit '0347196c6992e490be74c2a4015bc6cd64504f15':
Import translations. DO NOT MERGE
2015-01-07 14:34:03 +00:00
Geoff Mendal
620a5bd077
am 51aedf86: (-s ours) Import translations. DO NOT MERGE
...
* commit '51aedf86037f027898ec279befe869c80ef9730c':
Import translations. DO NOT MERGE
2015-01-07 14:29:23 +00:00
Geoff Mendal
0347196c69
am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
...
* commit '1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0':
Import translations. DO NOT MERGE
2015-01-07 14:28:07 +00:00
Geoff Mendal
51aedf8603
Import translations. DO NOT MERGE
...
Change-Id: I6ad655aeb29d245a44a42ccb3f8d43d84a47d422
Auto-generated-cl: translation import
2015-01-07 06:22:13 -08:00
Geoff Mendal
1dcc3e5ca9
Import translations. DO NOT MERGE
...
Change-Id: I3fc38eff7245760c96eac6222d4afd53f4169718
Auto-generated-cl: translation import
2015-01-07 06:14:40 -08:00
Mikhail Naganov
8ada2c53b9
am 2399c450: am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
...
* commit '2399c4500c5801cead4ce89132751fd21551213a':
Add an item to "Legal information" screen for WebView license
2015-01-07 12:50:04 +00:00
Zoltan Szatmary-Ban
c374175f61
am d4e7dcb9: am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
...
* commit 'd4e7dcb9d55ae5d5c0196f6e77c05a8d02698e16':
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
2015-01-07 12:50:02 +00:00
Mikhail Naganov
2399c4500c
am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
...
* commit '59f4d20b2e818c56e30b9a6e9fa6b693aaad7bbf':
Add an item to "Legal information" screen for WebView license
2015-01-07 12:40:43 +00:00
Zoltan Szatmary-Ban
d4e7dcb9d5
am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
...
* commit '15e2c54a2f4b75812b04bb32c6feb58158f0f318':
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
2015-01-07 12:40:42 +00:00
Mikhail Naganov
59f4d20b2e
Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
2015-01-07 12:33:30 +00:00
Zoltan Szatmary-Ban
15e2c54a2f
Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
2015-01-07 12:31:57 +00:00
Sanket Padawe
310b533689
am 2c9d75a7: am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
...
* commit '2c9d75a7c379c07bf84bfc87cbe4d1a4666bfc47':
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
2015-01-06 20:56:36 +00:00
Mikhail Naganov
71ef80eaf4
Add an item to "Legal information" screen for WebView license
...
Similar to how it is done for other legal information items --
if there is an activity that serves android.settings.WEBVIEW_LICENSE
intent, the item is shown with the title set to the activity's title,
otherwise the item is hidden.
Bug: 18729447
Change-Id: Ic5bad40c91e35fa3c8235128628413929ef111d3
2015-01-06 20:55:09 +00:00
Sanket Padawe
2c9d75a7c3
am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
...
* commit 'be3b0c4ec09b90bbcc7284f008599479ba52c240':
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
2015-01-06 20:51:17 +00:00
Sanket Padawe
be3b0c4ec0
Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
2015-01-06 20:46:17 +00:00
Sanket Padawe
4d902bcc8f
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
...
Bug: 18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
2015-01-06 10:54:55 -08:00
Andres Morales
64c7429ac8
Don't display Write NFC option if no NFC
...
Bug: 18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1
2015-01-06 09:38:53 -08:00
Amith Yamasani
0eda07657a
am 43bdc5cd: am 10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
...
* commit '43bdc5cdcf520fb0cae3b2fb2598d13957f1a770':
Fix theme for empty activity
2015-01-05 21:03:29 +00:00
Amith Yamasani
43bdc5cdcf
am 10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
...
* commit '10fb4f80ae31b27fb563d3139fa2cc90f0a9aad8':
Fix theme for empty activity
2015-01-05 20:57:57 +00:00
Amith Yamasani
10fb4f80ae
Merge "Fix theme for empty activity" into lmp-mr1-dev
2015-01-05 20:54:04 +00:00
Zoltan Szatmary-Ban
fb1bdf0ffc
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
...
Remove the enable/disable button in certificate setting dialog if restriction
has been put on the respective profile. Also catch security exception just in
case.
Bug: 18899182
Change-Id: Ia247ab264c1b2d08b58456519bf471ba8c727745
2015-01-05 16:49:53 +00:00
Geoff Mendal
08f6d92343
am a5aa9acc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'a5aa9accbf96f3295d086e8e226e30827f70519e':
Import translations. DO NOT MERGE
2015-01-05 14:31:06 +00:00
Geoff Mendal
cb84797d86
am 353c5b50: (-s ours) am 7e669a0a: (-s ours) Import translations. DO NOT MERGE
...
* commit '353c5b5010396152cdc8b9bb7f5717c0ac8a1296':
Import translations. DO NOT MERGE
2015-01-05 14:31:05 +00:00
Geoff Mendal
a5aa9accbf
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2015-01-05 14:29:58 +00:00
Geoff Mendal
353c5b5010
am 7e669a0a: (-s ours) Import translations. DO NOT MERGE
...
* commit '7e669a0ae5d9590c69aa59806fbce8b53052b46f':
Import translations. DO NOT MERGE
2015-01-05 14:27:37 +00:00
Geoff Mendal
e421be56cf
Import translations. DO NOT MERGE
...
Change-Id: Ia39277fe2bc9e2c171eec7349b5e829787311c84
Auto-generated-cl: translation import
2015-01-05 06:23:03 -08:00
Geoff Mendal
7e669a0ae5
Import translations. DO NOT MERGE
...
Change-Id: I657043d37bd3a3a13ef7b442c8ee6f86095bce15
Auto-generated-cl: translation import
2015-01-05 06:15:47 -08:00
Benjamin Franz
0fe3ed5ab5
Block BluetoothPermissionRequest notification on managed profiles.
...
This notification is triggered when a bluetooth device that supports
the PBAP protocol. On managed profiles this functionality is not yet
available and therefore the notification and resulting acvitivity
have no function.
Bug: 18782769
Change-Id: Iaea12eee8ec4727d9448f690861f8344e2296028
2015-01-02 12:54:01 +00:00
Baligh Uddin
c0b5d542b6
Import translations. DO NOT MERGE automerge: c3068f0 -s ours
...
automerge: 9602ba3
2014-12-30 03:15:42 +00:00
Baligh Uddin
617918d61b
Import translations. DO NOT MERGE
...
automerge: ad3b94f
2014-12-30 03:15:29 +00:00
Baligh Uddin
9602ba3762
Import translations. DO NOT MERGE
...
automerge: c3068f0
2014-12-30 00:53:43 +00:00
Baligh Uddin
ad3b94fbde
Import translations. DO NOT MERGE
...
Change-Id: I2a95cc3df31da8342436e918b02792d4624e5e88
Auto-generated-cl: translation import
2014-12-29 15:11:40 -08:00
Baligh Uddin
c3068f0788
Import translations. DO NOT MERGE
...
Change-Id: Iecde29c95e3c603740f4ff7875a594083bb6b40e
Auto-generated-cl: translation import
2014-12-29 14:59:54 -08:00
Prem Kumar
5aebac31e8
am 70c4a7b1: am 531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
...
* commit '70c4a7b145c4949761e0f13642c535d1bf3c810e':
SIM Status now shows data connection instead of voice.
2014-12-29 17:24:52 +00:00
