Vinit Deshpande
279cb4a590
Merge "Fix settings UI for passpoint networks" into m-wireless-dev
2015-03-25 22:42:00 +00:00
Vinit Deshpande
15b4c84c31
Fix settings UI for passpoint networks
...
This change includes showing the friendly name in saved
networks list and 'Connected via provider' addition for
passpoint connections.
Change-Id: I613770e0468f888c280e82a89b8a012a841d5bbd
2015-03-25 15:41:03 -07:00
Stuart Scott
898e48645c
am 53eec9fa
: Fix sim notifications.
...
automerge: a76d35d
* commit 'a76d35dece5fe50db4712cd47c147ba7759955b3':
Fix sim notifications.
2015-03-25 19:02:51 +00:00
Stuart Scott
a76d35dece
am 53eec9fa
: Fix sim notifications.
...
* commit '53eec9faad4f96497ab5cccaadb05963c3694363':
Fix sim notifications.
2015-03-25 18:51:18 +00:00
Stuart Scott
53eec9faad
Fix sim notifications.
...
bug:19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242
2015-03-25 18:07:45 +00:00
Nitin Arora
fc75374b0a
Increase allowed duration to connect to HOGP profile
...
This patch increases the duration allowed between the first device
connection attempt (immidiately after bonding) and profile connection
after service discovery from 5 seconds to 30 seconds to allow
HOGP connections for slow connection conditions.
Change-Id: Ia8a33a6ef8951d6e08b4a22837fcfdb70910112c
2015-03-24 23:56:19 +00:00
Pavel Zhamaitsiak
2241607570
Update Wi-Fi Calling settings
...
automerge: ee5f27d
* commit 'ee5f27dbeeef90381de905d05b3b67bc1837df20':
Update Wi-Fi Calling settings
2015-03-23 22:11:57 +00:00
Pavel Zhamaitsiak
ee5f27dbee
Update Wi-Fi Calling settings
...
- Update strings
- Move WFC mode summary strings to framework/base
- Update screens to reflect latest UX requirements
Change-Id: Ibcb1a0b6eec2342dfbaa30f90fe728976ad80a0d
2015-03-23 14:43:24 -07:00
Sanket Padawe
fe475227ef
Fix "Rename device" BT settings to avoid accepting blank spaces.
...
Bug: 16157293
Change-Id: I0eddafd9fad89b76ab1d00005ca4a4f2725eb83e
2015-03-23 12:01:19 -07:00
Sanket Padawe
c9d68e97e4
Merge "Restore password visibility on screen rotation in Hotspot/Wifi setup." into m-wireless-dev
2015-03-20 20:35:07 +00:00
Sanket Padawe
3eb3b104d7
Restore password visibility on screen rotation in Hotspot/Wifi setup.
...
Bug: 16237425
Change-Id: I2bf0aaaa657d60f007858c6635d2a17326562c66
2015-03-20 10:07:50 -07:00
Pavel Zhamaitsiak
e8d640f178
Remove WFC roaming from search keywords
...
automerge: 71a6922
* commit '71a692225efed6ac3b318441bc31e637204561f6':
Remove WFC roaming from search keywords
2015-03-19 02:58:55 +00:00
Pavel Zhamaitsiak
71a692225e
Remove WFC roaming from search keywords
...
Bug: 19682545
Change-Id: I8606d75a70d2ad3fb646472f8baddbe12e5bac21
2015-03-18 12:49:59 -07:00
Pavel Zhamaitsiak
035619826b
Disable Wi-Fi Calling when getting "registration error" intent.
...
automerge: e861691
* commit 'e8616913b43d9356b5556dd0f2cab72d8ab4e875':
Disable Wi-Fi Calling when getting "registration error" intent.
2015-03-18 18:45:15 +00:00
Pavel Zhamaitsiak
ad68507072
Remove WFC Roaming setting
...
automerge: 1e034fe
* commit '1e034fe79a164a12385b077e2aad9ebfaab5e389':
Remove WFC Roaming setting
2015-03-18 18:44:48 +00:00
Lorenzo Colitti
8fc9341b38
Add a developer settings checkbox to use the legacy DHCP client.
...
Change-Id: I18471bdf137fbb128d7e4ae6b9b1a4675f5e7fbc
2015-03-17 19:47:41 +09:00
Pavel Zhamaitsiak
e8616913b4
Disable Wi-Fi Calling when getting "registration error" intent.
...
Bug: 19698057
Change-Id: I403417e08f84014fb9bd9f213fd2b8644e2a6541
2015-03-12 16:44:14 -07:00
Pavel Zhamaitsiak
1e034fe79a
Remove WFC Roaming setting
...
Bug 19682545
Change-Id: I0adc7a20c411dd1fea3e2b79bcd5e159537a65c0
2015-03-12 12:36:17 -07:00
Pavel Zhamaitsiak
736d29b87c
Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
...
automerge: 4c7a410
* commit '4c7a4101ca87668341a998d17e929f66973c53f5':
Show alerts in case of some IMS registration errors.
2015-03-10 19:34:18 +00:00
Pavel Zhamaitsiak
4c7a4101ca
Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
2015-03-10 19:27:32 +00:00
Pavel Zhamaitsiak
a58527d552
Update Wi-Fi Calling mode when WFC is enabled/disabled
...
automerge: 248b8fd
* commit '248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce':
Update Wi-Fi Calling mode when WFC is enabled/disabled
2015-03-10 16:57:44 +00:00
Pavel Zhamaitsiak
897b492d69
Show alerts in case of some IMS registration errors.
...
Change-Id: I7019c6f0bae66190d190babd83ebcdd780e5b8a0
2015-03-09 17:23:26 -07:00
Pavel Zhamaitsiak
248b8fd7bf
Update Wi-Fi Calling mode when WFC is enabled/disabled
...
Bug: 19644042
Change-Id: Ie9cfe8c7f416985e4f78d48159d83191a19ac599
2015-03-09 16:58:39 -07:00
Vinit Deshpande
128e25cec0
am "Do not provide 5GHz option for softap if there is no country code available"
...
merged from partner/m-wireless-wifi-dev
d51b952
Do not provide 5GHz option for softap if there is no country code available
2015-03-06 13:56:02 -08:00
Vinit Deshpande
2797429bd8
am "set softAP on a specified band, including both 2.4 and 5 GHz band"
...
merged from partner/m-wireless-wifi-dev
82ff3d5
set softAP on a specified band, including both 2.4 and 5 GHz band
2015-03-06 13:56:02 -08:00
Pavel Zhamaitsiak
9a4b136ffb
Wi-Fi calling settings cleanup
...
automerge: 7109932
* commit '71099329cc0443ce4517480c86f81ed6b4e33ff2':
Wi-Fi calling settings cleanup
2015-03-03 23:41:33 +00:00
Pavel Zhamaitsiak
71099329cc
Wi-Fi calling settings cleanup
...
Bug: 19573771
Change-Id: Idcbbdc962238f0a32fd7adf4d6b8409d6e6ffd37
2015-03-02 17:26:04 -08:00
Santos Cordon
171d147905
Update Multi-SIM setting to use getSubIdForPhoneAccount API.
...
Settings app should not be parsing the subId direction from the phone
account. Instead this CL updates the settings app to use a new API to
grab the sub ID.
Change-Id: Iefd1831b04c061168fa2b135a2d296a27e3d4e92
2015-03-02 11:47:19 -08:00
Sanket Padawe
bd54ef0919
am 4e838ca9
: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
...
* commit '4e838ca96ec1ebf1df3d75e729facf1fc012b431':
Use TelephonyManager api to get SPN of sim to display in UI.
2015-02-26 22:04:10 +00:00
Sanket Padawe
4e838ca96e
Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
2015-02-26 21:57:50 +00:00
Pavel Zhamaitsiak
4ab32563f1
Add Wi-Fi Calling preference screen
...
Change-Id: Ie89902b55c5c4184236636f5039b3246a9c0bda5
2015-02-25 18:29:29 -08:00
Lifu Tang
2e2582c756
am 1bbd8814
: Removed extra "your" from device only subtext
...
* commit '1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
Removed extra "your" from device only subtext
2015-02-25 19:43:39 +00:00
Lifu Tang
1bbd8814c6
Removed extra "your" from device only subtext
...
Bug: 19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2
2015-02-24 15:25:27 -08:00
Sanket Padawe
8f77f435d8
Use TelephonyManager api to get SPN of sim to display in UI.
...
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
2015-02-24 13:30:33 -08:00
xinhe
d51b9525c9
Do not provide 5GHz option for softap if there is no country code available
...
Bug:19414134
Change-Id: I3899d9daa33eca5d2c5528c2e4da97b02d019160
2015-02-24 10:09:56 -08:00
Sanket Padawe
24401dfea0
am 7e21fa5a
: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
...
* commit '7e21fa5ab4f867263088a38ed279d889b902a05b':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-12 23:50:02 +00:00
Sanket Padawe
7e21fa5ab4
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
...
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
2015-02-12 12:39:34 -08:00
Sanket Padawe
6d1193e2da
am 4decadbc
: Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
...
* commit '4decadbc44b12cca8790b4d27ab9c29e34cb9909':
Remove SimDialogActivity from recents app list.
2015-02-03 18:15:48 +00:00
Sanket Padawe
4decadbc44
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
2015-02-03 18:10:47 +00:00
Andres Morales
ae363a3fcf
am 2e75203a
: Use getDefaultAdapter instead of getNfcAdapter
...
* commit '2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 15:53:36 +00:00
Sanket Padawe
ffd96559e7
Remove SimDialogActivity from recents app list.
...
Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
2015-02-02 16:46:55 -08:00
Andres Morales
2e75203a6e
Use getDefaultAdapter instead of getNfcAdapter
...
getNfcAdapter can throw an exception if NFC is not
available
Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
2015-02-02 13:39:57 -08:00
Robin Lee
56be3cd00a
am 528c64e2
: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
...
* commit '528c64e205bf1d8f8237fb4e582d152958345b92':
Repair broken keychain wifi_uid logic
2015-02-02 11:33:23 +00:00
Robin Lee
528c64e205
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
2015-02-02 11:22:02 +00:00
Sanket Padawe
f3b7e5fc91
am a46c7236
: Change to fit color name text on color selection spinner in settings.
...
* commit 'a46c7236b6d71c861b49d20dd7515a9031764909':
Change to fit color name text on color selection spinner in settings.
2015-01-30 21:19:55 +00:00
Sanket Padawe
a46c7236b6
Change to fit color name text on color selection spinner in settings.
...
Bug: 19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
2015-01-30 11:23:22 -08:00
Robin Lee
635426b0a7
Repair broken keychain wifi_uid logic
...
Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.
Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
2015-01-30 19:00:45 +00:00
Sanket Padawe
7720677ffc
am ab845180
: Remove sim status and imei for secondary user.
...
* commit 'ab84518009c53e28e021f27696cd4e51360fccbc':
Remove sim status and imei for secondary user.
2015-01-30 02:39:23 +00:00
Sanket Padawe
ab84518009
Remove sim status and imei for secondary user.
...
Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
2015-01-29 17:19:26 -08:00
Fyodor Kupolov
1e978b7691
am c4dba451
: am b26bec1a
: am 83930bc3
: am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started automerge: 3a3ff59
automerge: 5b2b7e1
...
* commit 'c4dba4513b22a59911bfee358c6537f53bbb89a7':
2015-01-29 20:51:11 +00:00