Commit Graph

223 Commits

Author SHA1 Message Date
Wink Saville
b91be0cfc7 am a908d819: am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
automerge: 1015f08

* commit '1015f08455da4c0823d98d5f74104e0fc3b7de33':
  Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 21:11:07 +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
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
4d902bcc8f Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Bug: 18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
2015-01-06 10:54:55 -08: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
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
Sanket Padawe
7131f1a99c Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev 2014-12-16 02:42:29 +00:00
Sanket Padawe
d059127659 Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev 2014-12-16 02:42:17 +00:00
PauloftheWest
c6f5c924d8 Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev 2014-12-15 22:46:58 +00:00
Sanket Padawe
9b566a0924 Prevent sim notify popup after upgrade from k to LMR1.
Bug: 18705619
Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
2014-12-15 13:26:27 -08:00
Stuart Scott
b62bfe7155 Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 2014-12-15 19:43:19 +00:00
PauloftheWest
a886d69f9d Fixed then icons of SIMs in the call dialog.
Bug: 18672758
Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24
2014-12-12 12:21:17 -08:00
Sanket Padawe
75e0082ae8 Exiting activity on clicking outside dialog acitivity.
Bug: 18705619
Change-Id: I50cb08884f1c97352f5ad3a3e7d218b42af1ada4
2014-12-11 14:36:26 -08:00
PauloftheWest
5b3da0cc30 Disabled SIM notifications while provisioning.
Bug: 18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
2014-12-10 15:00:27 -08:00
Stuart Scott
b3dd601286 Show toast when cellular data option is changing.
bug: 18594162
Change-Id: I19dc265af47c0a40a6ace6d4bf42e21e035daf0a
2014-12-10 13:31:36 -08:00
Prem Kumar
1e1251cc04 Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 2014-12-09 02:25:15 +00:00
PauloftheWest
c29c583536 Fixed a SIM Cards crash.
+ Added a check if getActiveSubscriptionInfoList returns null.

Bug: 18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
2014-12-08 12:24:28 -08:00
PauloftheWest
a2f699871e Merge "Fixed a SimSettings issue" into lmp-mr1-dev 2014-12-08 17:01:23 +00:00
Sanket Padawe
6d0059c3f9 Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 2014-12-05 20:55:29 +00:00
Shishir Agrawal
0b1f606c6e Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev 2014-12-05 19:25:59 +00:00
Sanket Padawe
3c72c817f8 Change default sim selection text in sim settings ui.
Bug: 18611090
Change-Id: Ifd2c26e02f1051536c4113b4351cefa51c2d5210
2014-12-04 23:08:00 +00:00
Sanket Padawe
91a4deb5e9 Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 2014-12-04 18:12:41 +00:00
Shishir Agrawal
dd4443a236 Settings app - read phone number from TelephonyManager.
The phone number needs to be always read from the TelephonyManager
since it can be overridden.

Bug: 18487514
Change-Id: If72094eb230c41b4f70146b0ccb012c9f9860626
2014-12-03 19:12:50 -08:00
PauloftheWest
e8a868f266 Merge "Add SIM notification pop-ups." into lmp-mr1-dev 2014-12-03 23:30:53 +00:00
Sanket Padawe
3b72ead136 Removed unnecessary heading in Sim settings
Bug: 17321738
Change-Id: If60d5539e67ca0f57b4d4fc62cb55118f8e0d3b2
2014-12-03 15:23:14 -08:00
PauloftheWest
e51465254d Fixed a SimSettings issue
+ SimSettings will not automatically select the first SIM for the user.

Bug: 18528013
Change-Id: I4c2024860231f6124a801feda821bc16bc2c4772
2014-12-03 10:16:52 -08:00
PauloftheWest
ffef98b3a0 Add SIM notification pop-ups.
+ Added a SimDialogActivity so any application can iniate a request to
se tthe default Data, Calls, and SMS.

Bug: 18293625
Change-Id: I60535125b40ece5ebc14542d732e4493bddefbae
2014-12-02 16:35:32 -08:00
Sanket Padawe
e06387ff5b Fixed crash in sim settings due to wrong toString() call.
Bug: 18589605
Change-Id: I2ae756f113904e1325ad3cc686cee0300cbd71e4
2014-12-02 18:54:11 +00:00
Wink Saville
0183fb5394 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:11:39 -08:00
Sanket Padawe
79e44da1ba Changing sim selection dialog in Settings to use phoneAccount
Changing sim selection dialog in Settings UI to select Call to display icons using
 phoneAccount.

Bug: 18435598
Change-Id: Ib89344be123c77a56e04a65dbb9e297f05e204eb
2014-11-19 18:45:27 +00:00
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00
PauloftheWest
79381a928b Merge "Created Multi-SIM notifications." into lmp-mr1-dev 2014-11-17 22:50:08 +00:00
Sanket Padawe
a8bd025d35 Adding icons to sim color selection in settings UI.
Adding icons to sim color selection of sim settings UI.

Bug: 18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
2014-11-17 10:43:37 -08:00
PauloftheWest
0ee68facad Fix Sim Setting OOB error.
+ Cleanup: deleted dead code.

Bug: 18380862
Change-Id: Ie5dc44c6c0fe50cd9243a19050b6d79732d2d014
2014-11-14 10:18:07 -08:00
PauloftheWest
63f7bc87d8 Created Multi-SIM notifications.
+ On Multi-SIM devices a notificaiton will pop up when a SIM card is
added, removed, or replaced.
+ The notification informs the user there has been a change in SIMs and
they can tap the notification to go SIM Card Settings.

Bug: 18293625

Change-Id: Iad1e5e0cf469e7bdfc43b2c18dd0586d042bb784
2014-11-13 15:05:02 -08:00
Sanket Padawe
0381f6c675 UI changes for icons in sim settings
+ UI changes relate to displaying sim icons in sim settings
+ Correcting way to display phone number inside sim settings dialog

Bug: 18356419
Change-Id: I1fe025fac52f20b607d4492b99cfef9588ec9416
2014-11-12 12:41:35 -08:00
Wink Saville
ca7566125e Update SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
2014-11-11 07:06:03 -08:00
Stuart Scott
4d1a0165b4 Update SubInfoRecord usage
bug: 17575308
Change-Id: Id854afd609d58bb63ed8d42bf5e641a15589f79d
2014-11-07 23:53:56 +00:00
PauloftheWest
5aafdda85c Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 2014-11-07 22:28:47 +00:00
PauloftheWest
0a0dacaf17 Migrated search for SubInfoRecord to Utils.
Bug: 18293625
Bug: 18293168
Bug: 18291246
Change-Id: Iad01a01d9b60ca010943447b00c1394471e93d5a
2014-11-07 14:26:22 -08:00
Sanket Padawe
d21b45e01c Set default sim name and carrier name from subinforecord object.
Changes for retrieving display name and carrier name from subinforecord
object.

Bug: 18247211
Bug: 17732079
Bug: 17321641
Change-Id: I718700648ddd5a2646c720591ce776bd30a03543

Conflicts:
	src/com/android/settings/sim/SimSettings.java
2014-11-07 18:06:49 +00:00
Stuart Scott
7928cd85dc Fix NPE when parceling SubInfoRecord
bug:18256375
Change-Id: I04ab5086e3f06abc6ce44ef69501022564a95b88
2014-11-05 15:08:16 -08:00
Sanket Padawe
815c61d729 Merge "Change for setting transparency of sim colors." into lmp-mr1-dev 2014-11-05 20:30:26 +00:00
Sanket Padawe
63530b56bb Merge "Sim name doesn't persist on reboot" into lmp-mr1-dev 2014-11-05 17:59:41 +00:00
Sanket Padawe
8942c62165 Change for setting transparency of sim colors.
Changes for setting transparency of sim colors in sim settings UI.

Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
2014-11-04 18:14:39 -08:00
Sanket Padawe
c9f823e22a Sim name doesn't persist on reboot
Sim name was not persisting on changed by user because of wrong api call.

Bug: 18024820
Change-Id: I7dee4a181f17f8cfabe48fefb92d7fc407efbe59
2014-11-04 17:34:47 -08:00
Stuart Scott
b153181c9c Use CharSequence for DisplayName
Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
2014-11-04 14:52:23 -08:00
Stuart Scott
3ada2ecbe0 Clean up public API of SubInfoRecord.
bug: 17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
2014-11-03 16:00:10 -08:00
PauloftheWest
a7b5d2b384 Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
+ Some import cleanup on SimSettings.

Change-Id: Ib18673f4eb0ce404bf13a58e0979401cca91385d
2014-10-30 14:16:18 -07:00
PauloftheWest
98523c8b8b Added Cellular Data for Multi-Sim Data Usage
+ Bug Fix: SimSettings would crash if a SIM was not in the first slot.

Change-Id: Iee75ea78dde72dc7d2d588caff1ddd451347a8f5
2014-10-29 12:48:39 -07:00