Geoff Mendal
23fd634e2d
Import translations. DO NOT MERGE
...
Change-Id: Ifcd43881fe6a7f7cecd76278e10d99f1c01857c3
Auto-generated-cl: translation import
2015-01-14 06:23:07 -08:00
Lucky Zhang
585b53e6d2
am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
...
* commit '0325a85849ab7d08555e8ce1d95d6d239d41ef27':
[Settings] Wifi Setup responds to other connection state change
2015-01-14 11:59:54 +00:00
Lucky Zhang
0325a85849
Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
2015-01-14 01:36:45 +00:00
Lucky Zhang
9fe89bbb2e
[Settings] Wifi Setup responds to other connection state change
...
Made use of the two new extras isNetworkRequired and ifWifiRequired in
deciding the ui state of the wifi setting. The CL that adds these
extras in setup wizard is here (http://ag/612291 ).
Added logic to update the next ("skip") button state accordingly:
(1) "Skip" button should be enabled if
- wifi is not required and network is not required
- or wifi is not required, but network is required, and we have a
valid network connection
(2) "Skip" button should be disabled if
- wifi is required
- or wifi is not required, but network is required, and we have
no valid network connection
Note that the newly added logic is only run if wifi is not connected. If
wifi is already connected, the next button will show "next" and be
enabled.
This fixes the bug where wifi settings in setup wizard does not respond
to mobile data connection change.
Bug: 18783746
Change-Id: I155dcb158f790dd96a71099339f64b64cc647da0
2015-01-13 17:20:42 -08:00
Wink Saville
cc26e1dc5c
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
2015-01-13 19:10:40 +00:00
Wink Saville
28bb4cda83
Rename reg/unreg OnSubscriptionsChangedListener.
...
automerge: 718c4d9
2015-01-13 19:09:54 +00:00
Wink Saville
a908d8191a
am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
...
* commit '718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 19:09:51 +00:00
Wink Saville
718c4d9b19
Rename reg/unreg OnSubscriptionsChangedListener.
...
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
2015-01-13 08:36:25 -08:00
Geoff Mendal
4fe6117cc1
am 26310772: (-s ours) Import translations. DO NOT MERGE
...
* commit '26310772872b327029cad560fa7b3e797b7980e9':
Import translations. DO NOT MERGE
2015-01-12 16:14:28 +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
Geoff Mendal
2631077287
Import translations. DO NOT MERGE
...
Change-Id: I58204e4d028fbdb98e1bb810de8d535974aeb130
Auto-generated-cl: translation import
2015-01-12 06:55:33 -08: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
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
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
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
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
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
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
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
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
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
70c4a7b145
am 531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
...
* commit '531127a5c2293e46e16fb9bc013078506c15122e':
SIM Status now shows data connection instead of voice.
2014-12-29 13:28:18 +00:00
Prem Kumar
531127a5c2
Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
2014-12-29 13:23:51 +00:00
Sanket Padawe
f128cff21e
am 9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
...
* commit '9b1383a46dadd60ed89561083b01666242d457dd':
Fixed settings crash issue while recovering from phone crash.
2014-12-23 03:39:18 +00:00
Sanket Padawe
9b1383a46d
Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
2014-12-23 03:35:23 +00:00
Sanket Padawe
79d5da7bf6
Fixed settings crash issue while recovering from phone crash.
...
Bug: 18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
2014-12-22 10:33:49 -08:00
Baligh Uddin
8ac88edc03
am e957cb47: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e957cb47a4d2bca7f5d3e8e925efae6269754cb3':
Import translations. DO NOT MERGE
2014-12-22 17:46:47 +00:00
