OSDN Git Service
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 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
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: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: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 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: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: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: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: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: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: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
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 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: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 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 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
Sanket Padawe [Tue, 23 Dec 2014 03:39:18 +0000 (03:39 +0000)]
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.
Sanket Padawe [Tue, 23 Dec 2014 03:35:22 +0000 (03:35 +0000)]
Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
Sanket Padawe [Mon, 22 Dec 2014 18:33:49 +0000 (10:33 -0800)]
Fixed settings crash issue while recovering from phone crash.
Bug:
18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
Baligh Uddin [Mon, 22 Dec 2014 17:46:47 +0000 (17:46 +0000)]
am
e957cb47: (-s ours) Import translations. DO NOT MERGE
* commit '
e957cb47a4d2bca7f5d3e8e925efae6269754cb3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Dec 2014 17:01:37 +0000 (09:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3f4b4d374faee184252c651295a6298c621fbcfd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Dec 2014 16:50:56 +0000 (08:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I95c46e36bef66944280675891951c487f43c622f
Auto-generated-cl: translation import
Maurice Lam [Sat, 20 Dec 2014 01:23:53 +0000 (01:23 +0000)]
am
9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
* commit '
9ab9d1ec82047b74a6a4fc91ab5864086e715c35':
[WifiSetup] Fix text colors in dark theme
Maurice Lam [Sat, 20 Dec 2014 01:17:58 +0000 (01:17 +0000)]
Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
PauloftheWest [Fri, 19 Dec 2014 22:57:11 +0000 (22:57 +0000)]
am
3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
* commit '
3e864c0bdae3ff9801e04438b8347631b3153d6d':
Removed extraneous slot information on single SIM devices.
PauloftheWest [Fri, 19 Dec 2014 22:53:03 +0000 (22:53 +0000)]
Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
Maurice Lam [Fri, 19 Dec 2014 19:52:52 +0000 (11:52 -0800)]
[WifiSetup] Fix text colors in dark theme
Use the attribute version of the material colors to avoid dark-on-
dark text in dark theme setup wizard.
Bug:
18810611
Change-Id: I740487e97a48016551f00c6a04876b0d4c71e0ab
PauloftheWest [Thu, 18 Dec 2014 23:02:39 +0000 (15:02 -0800)]
Removed extraneous slot information on single SIM devices.
Bug:
18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
PauloftheWest [Thu, 18 Dec 2014 21:59:04 +0000 (13:59 -0800)]
SIM Status now shows data connection instead of voice.
Bug:
18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
Sanket Padawe [Thu, 18 Dec 2014 18:38:52 +0000 (18:38 +0000)]
am
19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
* commit '
19627ca215fa643a443722f183f3f781d4a2b041':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 18:29:16 +0000 (10:29 -0800)]
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug:
18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
Amith Yamasani [Wed, 17 Dec 2014 18:52:52 +0000 (10:52 -0800)]
Fix theme for empty activity
Avoids janky transition when confirmation of device credential
is requested.
Bug:
18637426
Change-Id: I3645e180e50f570d6d09d649978064fa5adf7755
Sanket Padawe [Thu, 18 Dec 2014 06:33:06 +0000 (06:33 +0000)]
am
c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
* commit '
c4cc07b2c7f91cdb3695c499f7dca17b8aa9cb6b':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
Sanket Padawe [Thu, 18 Dec 2014 06:28:08 +0000 (06:28 +0000)]
Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
Sanket Padawe [Thu, 18 Dec 2014 06:24:36 +0000 (06:24 +0000)]
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
This reverts commit
579b66f28da710b5a1e68e211f5bd54ea466ab8b.
Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
Sanket Padawe [Thu, 18 Dec 2014 04:58:46 +0000 (04:58 +0000)]
am
080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
* commit '
080674e6da8e3db392a2a9e96a00cfc8e4635d00':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 04:53:33 +0000 (04:53 +0000)]
Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
Sanket Padawe [Thu, 18 Dec 2014 03:31:30 +0000 (19:31 -0800)]
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug:
18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
Geoff Mendal [Wed, 17 Dec 2014 14:33:26 +0000 (14:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 17 Dec 2014 14:28:32 +0000 (06:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I37ca51108f533323a830a9fcb550af4b94a2b2a3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Dec 2014 14:26:09 +0000 (14:26 +0000)]
am
3b08bdec: (-s ours) Import translations. DO NOT MERGE
* commit '
3b08bdec9415a99190cf6f93837c41cea5e0c04a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 14:18:00 +0000 (06:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58cb836de181e6a7b4de701941e3a13bea7378cb
Auto-generated-cl: translation import
Jason Monk [Tue, 16 Dec 2014 16:59:47 +0000 (16:59 +0000)]
am
b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
* commit '
b0c8c3935d5842cfefbe96d958d537fb80d4a33e':
Add a periodic check of the tethering provisioning
Jason Monk [Tue, 16 Dec 2014 15:44:25 +0000 (15:44 +0000)]
Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
Sanket Padawe [Tue, 16 Dec 2014 02:49:36 +0000 (02:49 +0000)]
am
7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
* commit '
7131f1a99cd87d452a1ab915333d7b1dbdfb9114':
Prevent sim notify popup after upgrade from k to LMR1.
Sanket Padawe [Tue, 16 Dec 2014 02:49:35 +0000 (02:49 +0000)]
am
d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
* commit '
d059127659048d9f26a79e22728068c709e2d831':
Exiting activity on clicking outside dialog acitivity.
Sanket Padawe [Tue, 16 Dec 2014 02:42:28 +0000 (02:42 +0000)]
Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
Sanket Padawe [Tue, 16 Dec 2014 02:42:16 +0000 (02:42 +0000)]
Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
PauloftheWest [Tue, 16 Dec 2014 00:54:21 +0000 (00:54 +0000)]
am
4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev
* commit '
4fe583d4cf2e2f3ba86f80e8695b104234d714eb':
Made the WPS icon visisble.
PauloftheWest [Tue, 16 Dec 2014 00:54:20 +0000 (00:54 +0000)]
am
c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
* commit '
c6f5c924d8a796da1a3c2e6bd5e44c755a532771':
Fixed then icons of SIMs in the call dialog.
PauloftheWest [Mon, 15 Dec 2014 22:49:24 +0000 (22:49 +0000)]
Merge "Made the WPS icon visisble." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 22:46:57 +0000 (22:46 +0000)]
Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
Wink Saville [Mon, 15 Dec 2014 22:35:58 +0000 (22:35 +0000)]
am
e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
* commit '
e04fd76f1c1a345a47673d460a04372670bad6c0':
Use getLIn1NumberForSubscriber to get phone number.
Stuart Scott [Mon, 15 Dec 2014 22:35:57 +0000 (22:35 +0000)]
am
b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
* commit '
b62bfe715552fb86330958755f0e12ab0ffe7cad':
Show toast when cellular data option is changing.
Sanket Padawe [Mon, 15 Dec 2014 20:06:17 +0000 (12:06 -0800)]
Prevent sim notify popup after upgrade from k to LMR1.
Bug:
18705619
Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
Wink Saville [Mon, 15 Dec 2014 20:45:00 +0000 (20:45 +0000)]
Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
Wink Saville [Mon, 15 Dec 2014 20:04:29 +0000 (12:04 -0800)]
Use getLIn1NumberForSubscriber to get phone number.
Bug:
18721557
Change-Id: I255627638efe21362315286a659ac59b46e1fa30
Signed-off-by: Wink Saville <wink@google.com>
Stuart Scott [Mon, 15 Dec 2014 19:43:19 +0000 (19:43 +0000)]
Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 19:34:31 +0000 (19:34 +0000)]
am
682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev
* commit '
682b7ed34c01ea65edfe034afe52180052b9e2fc':
IMEI information will show without a SIM.
PauloftheWest [Mon, 15 Dec 2014 19:28:43 +0000 (19:28 +0000)]
Merge "IMEI information will show without a SIM." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 18:54:56 +0000 (10:54 -0800)]
Made the WPS icon visisble.
Bug:
18335660
Change-Id: I62fd0be70680f74d7898dcf806ebbe41e5eb7342
PauloftheWest [Mon, 15 Dec 2014 18:29:54 +0000 (10:29 -0800)]
IMEI information will show without a SIM.
Bug:
18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
Maurice Lam [Mon, 15 Dec 2014 17:49:49 +0000 (17:49 +0000)]
am
8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
* commit '
8e0929a32ed60b95a34416a5362df93f5a329b5f':
[FRP] Open the lock setup screens in same task
Maurice Lam [Mon, 15 Dec 2014 17:44:52 +0000 (17:44 +0000)]
Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
Geoff Mendal [Mon, 15 Dec 2014 15:04:31 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 15 Dec 2014 14:42:32 +0000 (06:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1cd9781471c0c3c1c74fc429e9013e9e8dfeef41
Auto-generated-cl: translation import
Geoff Mendal [Mon, 15 Dec 2014 14:36:51 +0000 (14:36 +0000)]
am
d3affe47: (-s ours) Import translations. DO NOT MERGE
* commit '
d3affe47eedcdc6aa2bfd829f55fce8ed2be7e72':
Import translations. DO NOT MERGE