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
Fyodor Kupolov
dbbd4fca44
Show confirmation when turning on "Phone calls/sms"
...
Added confirmation dialog, when turning on "Phone calls and sms" setting for
secondary users and guests.
Bug:15761405
Change-Id: I39b2181f0b5460db9a964c6883f053a6c6336622
2015-01-08 11:21:26 -08:00
Marco Nelissen
2c47e6f823
Register USB receiver
...
This makes USB mode selection work properly, and prevents developer
options from crashing on exit.
Change-Id: I4c822f2694b0d87438827ff0da0d974c93ddbcab
2015-01-08 10:49:46 -08:00
Benjamin Franz
6a0cd973d8
am d8e53f27
: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge: ceee535
...
automerge: cc18d73
* commit 'cc18d7393bfcd11a668623f6a322243dc733fdc8':
Block BluetoothPermissionRequest notification on managed profiles.
2015-01-08 17:54:29 +00: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
ceee535c65
Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev
2015-01-08 17:40:09 +00:00
Alexandra Gherghina
fa7dacb157
Fix width of app notifications detail screen
...
Bug: 17137945
Change-Id: I52056f6ff217b695a21b096145b13b6b687e124c
2015-01-08 10:36:17 +00:00
Adrian Roos
f788718f21
Purge biometric weak from internal code
...
Bug: 18931518
Change-Id: I5da41908b1d6895a69f981e139f2d268327fafcd
2015-01-07 20:52:09 +01:00
Andres Morales
c2fb78627f
am dfb448d2
: am f58a646b
: am f11feccf
: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
...
* commit 'dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c':
Don't display Write NFC option if no NFC
2015-01-07 16:37:55 +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
f11feccf99
Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev
2015-01-07 16:21:48 +00:00
Mikhail Naganov
6a3ccd176f
am 8ada2c53
: am 2399c450
: am 59f4d20b
: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
...
* commit '8ada2c53b9322b7c95aff818e251cb31850ed124':
Add an item to "Legal information" screen for WebView license
2015-01-07 12:56:04 +00:00
Zoltan Szatmary-Ban
9de861247f
am c374175f
: am d4e7dcb9
: am 15e2c54a
: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
...
* commit 'c374175f61aff876f895cf15664ea66f54978aaf':
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
2015-01-07 12:56:03 +00: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
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
Alexandra Gherghina
2abb36aaa6
Merge "Remove call to deprecated getBackgroundDataSetting()"
2015-01-07 08:59:14 +00:00
Sanket Padawe
f04bf1c322
am 310b5336
: am 2c9d75a7
: am be3b0c4e
: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
...
* commit '310b533689ac9ecd6ee3e9abbd4029882522358f':
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
2015-01-06 21:02:23 +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
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
Alexandra Gherghina
7e50b12fde
Remove call to deprecated getBackgroundDataSetting()
...
It seems that the setting is now enforced at the network level (see
NetworkPolicyManagerService).
Bug: 15848128
Change-Id: Ie7d178bab8ebb133f78cb5356ee1c27fbe61ba05
2015-01-06 11:01:50 +00:00
Sanket Padawe
c8c82f002d
Grey out sim select dialog for Calls when only 1 phoneAccount exists
...
Bug: 18685720
Change-Id: Id7c8f756fd958fc81086a0166f1b0423c62e2569
2015-01-05 23:00:42 +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
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
Prem Kumar
78107661a4
am 5aebac31
: am 70c4a7b1
: am 531127a5
: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
...
* commit '5aebac31e8b0eb5bf914a822782515969949d507':
SIM Status now shows data connection instead of voice.
2014-12-29 17:33:22 +00:00
Sanket Padawe
cd6ae3cc3f
am d1724df6
: am 9b1383a4
: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev automerge: f128cff
...
* commit 'd1724df60235b33534a02dd3cc445e6b761f43e3':
Fixed settings crash issue while recovering from phone crash.
2014-12-29 17:25:33 +00: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
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
d1724df602
am 9b1383a4
: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
...
automerge: f128cff
* commit 'f128cff21ef7b8e2fa7721b481477ffecd9244ab':
Fixed settings crash issue while recovering from phone crash.
2014-12-28 05:31:57 +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
PauloftheWest
876f6bbae8
am 68b93e68
: am 1a5d132f
: am 3e864c0b
: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
...
* commit '68b93e68e2cb1f3d45391da8bbc3a6d46115a28c':
Removed extraneous slot information on single SIM devices.
2014-12-19 23:08:39 +00:00
PauloftheWest
68b93e68e2
am 1a5d132f
: am 3e864c0b
: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
...
* commit '1a5d132fcbf6a00c500fb7031a1f15e0328e7dcb':
Removed extraneous slot information on single SIM devices.
2014-12-19 23:03:11 +00:00
PauloftheWest
3e864c0bda
Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
2014-12-19 22:53:03 +00:00
Zoltan Szatmary-Ban
d7cadf3de2
Eliminate duplicated code for creating circled user icons in Settings.
...
Use Utils.getUserIcon instead.
Change-Id: Id653f8c89ac041e925464c88bbc0c7c43d3ce632
2014-12-19 15:23:16 +00:00
Zoltan Szatmary-Ban
53b4387719
Merge "Badge items in Settings > Apps > Running correctly"
2014-12-19 10:24:01 +00:00
Fyodor Kupolov
2c875e4537
Merge "Remove Users & profiles header for phones"
2014-12-19 01:47:13 +00:00
Sanket Padawe
cd5863c388
am ec3f7998
: am eec0c11a
: am 19627ca2
: Getting mcc/mnc from system prop instead of subInfoRecord.
...
* commit 'ec3f7998dbf2d700fde9c86bc9957ee1fb6204f6':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 23:20:44 +00:00
Sanket Padawe
6d99a14a87
am 25f2cfe9
: am 72cedc7a
: am c4cc07b2
: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
...
* commit '25f2cfe94ecc7d05c3c1a74c2e210fffcfc137e1':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
2014-12-18 23:20:18 +00:00
Sanket Padawe
87be2a6dd5
am 2497b44a
: am cff282f3
: am 080674e6
: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
...
* commit '2497b44ab0dac4d16145f6e0cae5708354506955':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 23:20:16 +00:00
PauloftheWest
a68bdb6dbe
Removed extraneous slot information on single SIM devices.
...
Bug: 18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
2014-12-18 15:02:39 -08:00
PauloftheWest
58f7eaf3d2
SIM Status now shows data connection instead of voice.
...
Bug: 18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
2014-12-18 13:59:04 -08:00
Sanket Padawe
ec3f7998db
am eec0c11a
: am 19627ca2
: Getting mcc/mnc from system prop instead of subInfoRecord.
...
* commit 'eec0c11ae3386284dd6797076764572efeca52c3':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 18:43:55 +00:00
Sanket Padawe
19627ca215
Getting mcc/mnc from system prop instead of subInfoRecord.
...
Bug: 18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
2014-12-18 10:29:16 -08:00
Zoltan Szatmary-Ban
ae6ea36822
Remove frame and shadow from CircleFramedDrawable
...
Also change the size the circled icon is drawn into to a 40dp by 40dp rect.
Bug: 18198624
Change-Id: I66d919a2f35ede614a90a423d2967a4c3bc18169
2014-12-18 12:10:16 +00:00