OSDN Git Service
Geoff Mendal [Wed, 21 Jan 2015 15:03:29 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE automerge:
75c5298 -s ours
automerge:
9f62273 -s ours
* commit '
9f622737ecdc7a6a1ffba1ff76b8f9688d6b4198':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:58:59 +0000 (14:58 +0000)]
Import translations. DO NOT MERGE
automerge:
75c5298 -s ours
* commit '
75c5298e06eb54dbc96ccc17696ba8e1c8316ee7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:44:20 +0000 (06:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec85d27eb1b30f9d04c74b75e35d86e3a9d3a4e8
Auto-generated-cl: translation import
Maurice Lam [Tue, 20 Jan 2015 21:44:58 +0000 (21:44 +0000)]
Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge:
ff649c6
automerge:
a1f6660
* commit '
a1f66604233cefd1d4a2b0eab45b76f94770b332':
[WifiSetup] Don't pan the window for IME
Maurice Lam [Tue, 20 Jan 2015 21:26:38 +0000 (21:26 +0000)]
Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev
automerge:
ff649c6
* commit '
ff649c601d0e2caa5d939f09c7183a8a4d8db60b':
[WifiSetup] Don't pan the window for IME
Maurice Lam [Tue, 20 Jan 2015 21:21:40 +0000 (21:21 +0000)]
Merge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev
Geoff Mendal [Mon, 19 Jan 2015 15:20:49 +0000 (15:20 +0000)]
am
e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
e7b79f16c1548ba2c40af4452167c64ba442566e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:20:48 +0000 (15:20 +0000)]
am
21df8221: (-s ours) am
69b87f79: (-s ours) Import translations. DO NOT MERGE
* commit '
21df822137b4750d1be2ccf7895876758255c8d0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:18:14 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 19 Jan 2015 15:14:52 +0000 (15:14 +0000)]
am
69b87f79: (-s ours) Import translations. DO NOT MERGE
* commit '
69b87f79256a5edacb90ab7ccce069737ca59b3d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:14:45 +0000 (07:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I33eb0003d296f51618451be42ed108d03e833fe7
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Jan 2015 15:07:29 +0000 (07:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5e8d466062fa0483aecaefdac20c34e219b43b3a
Auto-generated-cl: translation import
Andre Eisenbach [Fri, 16 Jan 2015 02:47:55 +0000 (02:47 +0000)]
am
edf618c1: am
906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
* commit '
edf618c1b7ceb283146de1e26b85a56ab04b206f':
Do not perform SDP during pairing
Andre Eisenbach [Fri, 16 Jan 2015 02:33:50 +0000 (02:33 +0000)]
am
906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
* commit '
906fc4172466e7ddd0886fa51b308ce4e69c266a':
Do not perform SDP during pairing
Andre Eisenbach [Fri, 16 Jan 2015 02:01:02 +0000 (02:01 +0000)]
Merge "Do not perform SDP during pairing" into lmp-mr1-dev
Maurice Lam [Thu, 15 Jan 2015 19:43:34 +0000 (11:43 -0800)]
[WifiSetup] Don't pan the window for IME
Suppress panning the activity window for the IME because that is
causing garbage to be drawn.
Bug:
18974000
Change-Id: I42429241425be0e520e9b36d1e134748ae583076
Andre Eisenbach [Fri, 9 Jan 2015 22:52:47 +0000 (14:52 -0800)]
Do not perform SDP during pairing
As a result of commit
7de119c (ag/591931), SDP is performed when the
pairing dialog pops up. There are multiple problems with this. On badly
behaved devices an SDP request might trigger pairing from the remote
side, other devices (like Logitech keyboards) will close the connection
once SDP disconnects, causing the pairing to fail.
Further more, fetchUuidsWithSdk() is an asynchronous call. The code that
was added does not wait for SDP to complete. Thus the check for the PBAP
UUID will always fail and cause the permission check to still be
displayed.
With this change, SDP is not performed when the dialog is popped up and
PBAP permission is granted after bonding and subsequent service
discovery in accordance with final consensus in bug
16964116.
Bug:
18948640
Change-Id: I149afa8ae59b63f59ba579c12f97c3ea3d70112c
Svetoslav [Thu, 15 Jan 2015 05:04:51 +0000 (05:04 +0000)]
am
21824675: am
6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
* commit '
21824675d5343f26fd0c4cda45d60be89d59c59b':
Settings not showing print jobs for a managed profile.
Svetoslav [Thu, 15 Jan 2015 04:53:20 +0000 (04:53 +0000)]
am
6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
* commit '
6491d51fdcc63a27c3e1f27c6ece5dc3af5877eb':
Settings not showing print jobs for a managed profile.
Svetoslav [Thu, 15 Jan 2015 04:47:53 +0000 (04:47 +0000)]
Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
Sanket Padawe [Thu, 15 Jan 2015 00:42:24 +0000 (00:42 +0000)]
am
872ed290: am
b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '
872ed290de26374bb1ce9a2e43b0f75c79125ee6':
Fixed missing sim card lock setup in Security Settings.
Sanket Padawe [Thu, 15 Jan 2015 00:42:23 +0000 (00:42 +0000)]
am
0f9db227: am
e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '
0f9db227ec110e9344f9d4f96ff983780531eb76':
Fixed data connection toggle UI issue due to local cache maintained.
Sanket Padawe [Wed, 14 Jan 2015 23:50:44 +0000 (23:50 +0000)]
am
b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '
b57e1f29643e7454192973db738c13583b5c91a5':
Fixed missing sim card lock setup in Security Settings.
Sanket Padawe [Wed, 14 Jan 2015 23:50:43 +0000 (23:50 +0000)]
am
e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '
e79b65d6c6f6df7d6fd84a6f5c540bd99d71f152':
Fixed data connection toggle UI issue due to local cache maintained.
Sanket Padawe [Wed, 14 Jan 2015 23:20:04 +0000 (23:20 +0000)]
Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 23:18:13 +0000 (23:18 +0000)]
Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 22:48:27 +0000 (14:48 -0800)]
Fixed missing sim card lock setup in Security Settings.
Bug:
19008335
Change-Id: I078169b5a0215a9219e24554e71df32753213ebe
Geoff Mendal [Wed, 14 Jan 2015 19:24:21 +0000 (19:24 +0000)]
am
9b07944c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
9b07944c5007460b8c6792321e5db1350ec3ff55':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Jan 2015 19:24:20 +0000 (19:24 +0000)]
am
3d600a06: (-s ours) am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
3d600a06119f2c11ba2394d64a84348aa94fd520':
Import translations. DO NOT MERGE
Sanket Padawe [Wed, 14 Jan 2015 19:03:33 +0000 (11:03 -0800)]
Fixed data connection toggle UI issue due to local cache maintained.
+ Fixed the scenario wherein more than 1 sim cannot be "On" at the same time.
Bug:
18916033
Change-Id: Ia95b54c9ee29d360a1b4542f00a9f698615912bb
Geoff Mendal [Wed, 14 Jan 2015 14:24:51 +0000 (14:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 14 Jan 2015 14:23:15 +0000 (14:23 +0000)]
am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
c51cfe3d8131084cebf674b06faa7360307b5425':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Jan 2015 14:23:07 +0000 (06:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifcd43881fe6a7f7cecd76278e10d99f1c01857c3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Jan 2015 14:16:00 +0000 (06:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic614419c04bbacc20f37c24902286fcaa11e79a9
Auto-generated-cl: translation import
Lucky Zhang [Wed, 14 Jan 2015 12:06:43 +0000 (12:06 +0000)]
am
585b53e6: am
0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
* commit '
585b53e6d2ddc0725ce69f6f7208ad791e8d256e':
[Settings] Wifi Setup responds to other connection state change
Lucky Zhang [Wed, 14 Jan 2015 11:59:54 +0000 (11:59 +0000)]
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
Svetoslav [Wed, 14 Jan 2015 02:48:29 +0000 (18:48 -0800)]
Settings not showing print jobs for a managed profile.
The settings app is shared among the personal and work profiles.
When fetching print jobs it was not getting the ones for the work
profile, rather the ones for the current user which is the personal
profile.
bug:
18867406
Change-Id: I99f8cf3a3e2b133a0a4d5a8915473d1190e205f4
Lucky Zhang [Wed, 14 Jan 2015 01:36:45 +0000 (01:36 +0000)]
Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
Lucky Zhang [Tue, 13 Jan 2015 18:22:28 +0000 (10:22 -0800)]
[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
Wink Saville [Tue, 13 Jan 2015 19:16:06 +0000 (19:16 +0000)]
am
cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
* commit '
cc26e1dc5c6f7437678dfe5c0b230bf59879d8f4':
Wink Saville [Tue, 13 Jan 2015 19:16:05 +0000 (19:16 +0000)]
am
a908d819: am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit '
a908d8191acf3e4786933d67a1a4211543323a7d':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:10:40 +0000 (19:10 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
Wink Saville [Tue, 13 Jan 2015 19:09:54 +0000 (19:09 +0000)]
Rename reg/unreg OnSubscriptionsChangedListener.
automerge:
718c4d9
* commit '
718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:09:51 +0000 (19:09 +0000)]
am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit '
718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 00:50:58 +0000 (16:50 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug:
18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
Geoff Mendal [Mon, 12 Jan 2015 16:40:27 +0000 (16:40 +0000)]
am
4fe6117c: (-s ours) am
26310772: (-s ours) Import translations. DO NOT MERGE
* commit '
4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 16:14:28 +0000 (16:14 +0000)]
am
26310772: (-s ours) Import translations. DO NOT MERGE
* commit '
26310772872b327029cad560fa7b3e797b7980e9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 16:14:25 +0000 (16:14 +0000)]
am
04250824: (-s ours) Import translations. DO NOT MERGE
* commit '
04250824ff4d5231ee17a060a7ce77fcc02a6657':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 15:03:11 +0000 (07:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3174bd9c344b8bf618340c4b21b0f739ba198095
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Jan 2015 14:55:33 +0000 (06:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58204e4d028fbdb98e1bb810de8d535974aeb130
Auto-generated-cl: translation import
Sanket Padawe [Fri, 9 Jan 2015 19:17:18 +0000 (19:17 +0000)]
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.
Sanket Padawe [Fri, 9 Jan 2015 19:11:35 +0000 (19:11 +0000)]
Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev
automerge:
270af42
* commit '
270af427cd509b002751d6e6243a02f6c199b1a0':
Display Voice nw type if Data nw is Unknown for Sprout.
Sanket Padawe [Fri, 9 Jan 2015 19:08:26 +0000 (19:08 +0000)]
Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev
Sanket Padawe [Thu, 8 Jan 2015 23:19:38 +0000 (23:19 +0000)]
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
Sanket Padawe [Thu, 8 Jan 2015 23:15:10 +0000 (23:15 +0000)]
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
Sanket Padawe [Thu, 8 Jan 2015 23:09:10 +0000 (23:09 +0000)]
Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
Sanket Padawe [Thu, 8 Jan 2015 20:37:34 +0000 (12:37 -0800)]
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
Sanket Padawe [Thu, 8 Jan 2015 19:23:11 +0000 (11:23 -0800)]
Fixed Cellular data toggling issue in settings for multisim
Bug:
18916033
Bug:
18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
Benjamin Franz [Thu, 8 Jan 2015 17:49:11 +0000 (17:49 +0000)]
am
d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge:
ceee535
* commit '
d8e53f271f1aa90f92d239f48120ffc6c5b87055':
Block BluetoothPermissionRequest notification on managed profiles.
Benjamin Franz [Thu, 8 Jan 2015 17:43:02 +0000 (17:43 +0000)]
Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev
automerge:
ceee535
* commit '
ceee535c6533cd5ba047ede780ca9c089b84fb9f':
Block BluetoothPermissionRequest notification on managed profiles.
Benjamin Franz [Thu, 8 Jan 2015 17:40:09 +0000 (17:40 +0000)]
Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev
Andres Morales [Wed, 7 Jan 2015 16:31:57 +0000 (16:31 +0000)]
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
Andres Morales [Wed, 7 Jan 2015 16:26:19 +0000 (16:26 +0000)]
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
Andres Morales [Wed, 7 Jan 2015 16:21:47 +0000 (16:21 +0000)]
Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev
Geoff Mendal [Wed, 7 Jan 2015 14:34:03 +0000 (14:34 +0000)]
am
0347196c: (-s ours) am
1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
* commit '
0347196c6992e490be74c2a4015bc6cd64504f15':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:29:23 +0000 (14:29 +0000)]
am
51aedf86: (-s ours) Import translations. DO NOT MERGE
* commit '
51aedf86037f027898ec279befe869c80ef9730c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:28:07 +0000 (14:28 +0000)]
am
1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
* commit '
1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:22:13 +0000 (06:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6ad655aeb29d245a44a42ccb3f8d43d84a47d422
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Jan 2015 14:14:40 +0000 (06:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3fc38eff7245760c96eac6222d4afd53f4169718
Auto-generated-cl: translation import
Mikhail Naganov [Wed, 7 Jan 2015 12:50:04 +0000 (12:50 +0000)]
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
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:50:02 +0000 (12:50 +0000)]
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
Mikhail Naganov [Wed, 7 Jan 2015 12:40:43 +0000 (12:40 +0000)]
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
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:40:42 +0000 (12:40 +0000)]
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
Mikhail Naganov [Wed, 7 Jan 2015 12:33:28 +0000 (12:33 +0000)]
Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:31:55 +0000 (12:31 +0000)]
Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
Sanket Padawe [Tue, 6 Jan 2015 20:56:36 +0000 (20:56 +0000)]
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.
Mikhail Naganov [Mon, 15 Dec 2014 17:09:50 +0000 (17:09 +0000)]
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
Sanket Padawe [Tue, 6 Jan 2015 20:51:17 +0000 (20:51 +0000)]
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.
Sanket Padawe [Tue, 6 Jan 2015 20:46:16 +0000 (20:46 +0000)]
Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
Sanket Padawe [Tue, 6 Jan 2015 18:54:55 +0000 (10:54 -0800)]
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Bug:
18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
Andres Morales [Tue, 6 Jan 2015 17:38:53 +0000 (09:38 -0800)]
Don't display Write NFC option if no NFC
Bug:
18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1
Amith Yamasani [Mon, 5 Jan 2015 21:03:29 +0000 (21:03 +0000)]
am
43bdc5cd: am
10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '
43bdc5cdcf520fb0cae3b2fb2598d13957f1a770':
Fix theme for empty activity
Amith Yamasani [Mon, 5 Jan 2015 20:57:57 +0000 (20:57 +0000)]
am
10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '
10fb4f80ae31b27fb563d3139fa2cc90f0a9aad8':
Fix theme for empty activity
Amith Yamasani [Mon, 5 Jan 2015 20:54:04 +0000 (20:54 +0000)]
Merge "Fix theme for empty activity" into lmp-mr1-dev
Zoltan Szatmary-Ban [Mon, 5 Jan 2015 16:41:35 +0000 (16:41 +0000)]
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
Geoff Mendal [Mon, 5 Jan 2015 14:31:06 +0000 (14:31 +0000)]
am
a5aa9acc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
a5aa9accbf96f3295d086e8e226e30827f70519e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Jan 2015 14:31:05 +0000 (14:31 +0000)]
am
353c5b50: (-s ours) am
7e669a0a: (-s ours) Import translations. DO NOT MERGE
* commit '
353c5b5010396152cdc8b9bb7f5717c0ac8a1296':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Jan 2015 14:29:56 +0000 (14:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 5 Jan 2015 14:27:37 +0000 (14:27 +0000)]
am
7e669a0a: (-s ours) Import translations. DO NOT MERGE
* commit '
7e669a0ae5d9590c69aa59806fbce8b53052b46f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Jan 2015 14:23:03 +0000 (06:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia39277fe2bc9e2c171eec7349b5e829787311c84
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Jan 2015 14:15:47 +0000 (06:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I657043d37bd3a3a13ef7b442c8ee6f86095bce15
Auto-generated-cl: translation import
Benjamin Franz [Fri, 2 Jan 2015 12:52:03 +0000 (12:52 +0000)]
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
Baligh Uddin [Tue, 30 Dec 2014 03:15:42 +0000 (03:15 +0000)]
Import translations. DO NOT MERGE automerge:
c3068f0 -s ours
automerge:
9602ba3 -s ours
* commit '
9602ba376289d130d0e86a454a6740456cec616e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 03:15:29 +0000 (03:15 +0000)]
Import translations. DO NOT MERGE
automerge:
ad3b94f -s ours
* commit '
ad3b94fbdea2364b3c89e5a8409acf623675a20a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 00:53:43 +0000 (00:53 +0000)]
Import translations. DO NOT MERGE
automerge:
c3068f0 -s ours
* commit '
c3068f078887f3357b498a0851591c324d3c55d5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Dec 2014 23:11:40 +0000 (15:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2a95cc3df31da8342436e918b02792d4624e5e88
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Dec 2014 22:59:54 +0000 (14:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iecde29c95e3c603740f4ff7875a594083bb6b40e
Auto-generated-cl: translation import
Prem Kumar [Mon, 29 Dec 2014 17:24:52 +0000 (17:24 +0000)]
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.
Prem Kumar [Mon, 29 Dec 2014 13:28:18 +0000 (13:28 +0000)]
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.
Prem Kumar [Mon, 29 Dec 2014 13:23:49 +0000 (13:23 +0000)]
Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev