Commit Graph

182 Commits

Author SHA1 Message Date
Raff Tsai
cf1489891a Remove useless png and add vector drawable
Bug: 139336138
Test: visual
Change-Id: I5ccf4855b63f47b138a1662317d0c4ba8ce8984c
2019-08-15 18:04:49 +08:00
Antony Sargent
6a1d7e60ac Add a listener for subscription changes to SimDialogFragment
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.

But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.

Fixes: 135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
2019-06-19 12:20:59 -07:00
Antony Sargent
37008824e6 Use displayName instead of operator name in MMS data notification
When the phone is in DSDS mode and the user tries to send an MMS message
from the SIM that isn't the default for data, we need to pop up a
notification letting them know that the action can't succeed unless they
turn on the advanced option to allow data use for MMS messages. This
notification was using the operator name instead of the subscription
display name, so it didn't reflect any renaming the user might have done
to keep track of their SIMs, which is obviously confusing especially if
they have two different SIMs for the same carrier. This CL switches to
using the subscription display name in this notification.

Fixes: 134771858
Test: make RunSettingsRoboTests
Change-Id: I6995bf9dd6d5e9544e26f0d8e30e97c4e73ab783
2019-06-18 21:54:22 +00:00
Malcolm Chen
57badc2a82 Triggering notifications when dual CDMA SIM combinations are detected
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
2019-06-04 17:11:09 -07:00
sqian
36e11d2249 Add AutoCancel Notification UI for sim change
Bug: 131380487
Test: manual
Change-Id: Iaf1b1216e358683906b683c688828236f3282cf9
2019-05-21 18:45:14 +00:00
Brad Ebinger
d206835fe3 Allow SimDialogActivity to be started for result
In Telephony, we sometimes need to be able to launch
the SIM pick dialog activity for SMS without setting
a new default (i.e. user chose "ask every time") for
default SMS subscription.

Adds the ability for the SimDialogActivity to be
called using startActivityForResult and not set the
user's choice as the default.

Bug: 130853716
Bug: 130567323
Test: run Telephony SmsManagerTestApp
Change-Id: If9f9ebbfe9b7b6718ed759937abbcfa6d22c6295
2019-05-10 18:29:54 +00:00
Malcolm Chen
7dd82f966c Create enable MMS notification.
Adding a notification in SimSelectNotification that will be triggered
when receiving a enable MMS request. Tapping on the notificaiton will
lead to the subscription setting page.

Bug: 130222866
Test: manual -- have a test app that sends the intent when mobile
data is turned off. And verify that the heads-up notificaiton is shown
and that it will lead to subscription setting page.

Change-Id: Ia80e8e5ab20adf78a31647a23cb2ba8dac690e41
2019-04-29 18:49:27 +00:00
TreeHugger Robot
d414c64dc3 Merge "Include always ask button in SIM picker dialog" into qt-dev 2019-04-25 21:02:13 +00:00
Fan Zhang
e83d718ff9 Include always ask button in SIM picker dialog
Fixes: 129433330
Test: manual
Change-Id: Ia7e5af56541aaf66df9e1749c1cc6e7f97d55a0b
2019-04-24 14:11:50 -07:00
Andrew Sapperstein
181a8fccbd Update "ask every time" asset.
Fixes: 130550869
Test: visually inspected
Change-Id: I75356f1a05411ab9d4c396d283fd555ce7c1cd07
2019-04-24 12:56:17 -07:00
Fan Zhang
5c9db0cb5e Fix CodeInspectionTest
Fixes: 130897640
Test: robo
Change-Id: Ic2d952e4d76bb0a2be6eab7ddc999b56656132a6
2019-04-19 14:14:51 -07:00
TreeHugger Robot
01b633275a Merge "Fix problem of multiple stacked copies of "Select SIM" dialog" into qt-dev 2019-04-16 08:30:30 +00:00
Antony Sargent
a7dc277459 Fix problem of multiple stacked copies of "Select SIM" dialog
The SimDialogActivity is used to ask the user questions about which SIM
card to use for various services like calls, SMS, and data. In some
cases of SIM changes (eg when a SIM is added or removed), the telephony
stack sends a broadcast that SimSelectNotification listens for so it can
pop up a general "SIM cards changed" notification, and we additionally
want to bring up an interruptive dialog to ask the user a specific
question. This might happen for instance when we want to ask the user's
permission to turn on data on a SIM.

Recent DSDS changes in the telephony stack have meant that we
accidentally create several stacked copies of this dialog, because they
send several broadcast updates as information about SIMs asynchronously
changes. For instance, we might initially detect a SIM with a generic
name of "CARD 1", and shortly after discover the actual carrier name. So
what we really want is to put up the dialog, and update it as
information changes.

This CL makes SimDialogActivity use launchMode="singleTop" so that
additional copies of the activity won't be launched. Then it internally
enforces only showing one dialog per type of request (calls, SMS, data,
or preferred sim). If we get a request for a dialog that already exists,
we just update it instead of creating a new one for that type. So there
can still be a stack of more than one dialog, but each one will be
asking a different question.

This also refactors the monolithic, somewhat confusing code for showing
the various types of dialogs into a more clearly separated class
hierarchy, and switches to using DialogFragment for the dialog.

Fixes: 126596081
Test: manual (start with device in DSDS mode with 2 subs, remove SIM
card and re-insert it)

Change-Id: I0dbc41dc3b15015389823a24df10bbff08ec6615
2019-04-15 06:16:52 -07:00
Antony Sargent
8eb1660da7 Update intent in SimNotification
When you add/remove a SIM, telephony notifies settings and we pop up a
notification. Tapping on that notification was still leading to our old
SIM cards page, but should instead lead to the Network & internet page
where we've added a bunch of new UI for doing the same sorts of
operations.

Bug: 128859223
Test: manual (remove a SIM or add a SIM in DSDS mode; a notification
telling you that sim cards have changed should pop up, clicking that
should lead to Network & internet page in settings)

Change-Id: I9c1e656dcc3e8fc9147bb99861d8fdc15ed09be9
2019-04-12 16:10:52 -07:00
Xiangyu/Malcolm Chen
84c5751ceb Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED." 2019-03-28 22:39:54 +00:00
Antony Sargent
85717d9f8d Use better string in dialog asking which SIM to use for SMS
Right now when you have a dual-SIM device but no default set for which
one to use for SMS, when you go to try and send an SMS you'll get a
dialog asking which SIM to use with the generic string of "Select a SIM
card". We recently added a more specific string for this in a separate
CL, which reads "Select a SIM card for SMS". This CL switches the code
to use that more specific string.

Bug: 129021763
Test: compile / manual
Change-Id: I7d12a7191de23366b0a6b6888021e57ff9ddced9
2019-03-28 10:31:36 -07:00
Malcolm Chen
a05e6f8182 Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED.
Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED in manifest.
Also, make sure SimSelectNotification only listens to that intent.

Bug: 128645056
Test: manual
Change-Id: I008e5346ff1e015d1aa57ca31844426e33bd99b8
2019-03-27 17:53:22 -07:00
Malcolm Chen
f2fca31c51 Clean up a few names of Telephony intent extra.
Bug: 128645056
Test: build
Change-Id: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
2019-03-22 18:03:42 -07:00
Xiangyu/Malcolm Chen
c7b392959e Merge "Move SIM select logic from SimSelectNotification to Telephony." 2019-03-22 06:48:23 +00:00
chen xu
96d0c484f3 Create TM for each subId to register phonestatelistner
To register phonestatelistner for different subscription, do not
create phonestatelistener(subId) this contructor is going to be removed.
instead, create TelephonyManager instance for each subId and pass
separate phonestateListener object.

Bug: 117555407
Test: Maunal test
Change-Id: Ia2a1be6e559c3a5b98e178a02d0eee14cc14eb47
2019-03-20 17:28:26 -07:00
Malcolm Chen
41855ec8b9 Move SIM select logic from SimSelectNotification to Telephony.
SimSelectNotification used to listen to SIM_STATE_CHANGED from Telephony
and do checkings to decide whether to pop up notification and
SimDialogActivity. The logic needs updated and only Telephony knows it
well. So this change moves the logic into Telephony. SimSelectNotification
only listens to Telephony's decision, brings up notification and trigger
SimDialogActivity.

Bug: 128645056
Test: sanity and manual
Change-Id: I6153e27dd00dd9cdf8682f135eb39f8af3a75608
2019-03-19 13:57:19 -07:00
Malcolm Chen
e8fabb522a Enable data when user selects default data through popped up dialog.
In DSDS device, when user explicitly selects a SIM as data SIM, we
should not only set it as default data SIM in Telephony, but also
enable its data.

Bug: 120712558
Test: manual
Change-Id: I429efa090ebf5bb71ee491ae66525abee00f62c6
2019-02-06 15:23:23 -08:00
Fan Zhang
31b210017b Migrate all MetricsProto enums to SettingsEnums
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
2019-01-17 14:55:42 -08:00
Malcolm Chen
14dde50c3a Don't show hidden Cellular subscription in Settings.
Replace getActiveSubscriptionInfoList() with
getActiveSubscriptionInfoList(true) so that settings will not show
hidden subscriptions to the user in various pages.

Bug: 121396526
Test: manual
Change-Id: I717999fed7d3a5a037914239694bef52df7c6207
2019-01-16 00:21:30 -08:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
tmfang
41ab6b4bf8 Migrate all AlertDialogs to AndroidX version
This CL only changed AlertDialog imports.
So, reviewer can review it easily.

Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
2018-07-20 11:32:13 +08:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
Tony Mantler
0fcd6cbaa8 Autogenerate SearchIndexableResources subclass
Bug: 77148954
Test: RunSettingsLibRoboTests RunSettingsRoboTests RunSettingsGoogleRoboTests RunArcSettingsRoboTests
Change-Id: I842c42c55014c3310070ef22bd4f0d9a70dfd804
2018-04-03 10:26:55 -07:00
Bruno Martins
b011e2a55b Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26 am: 7431ad3a80
am: 440373dbde

Change-Id: I605e13adb0e050ee73e646fa13c62f88271271b6
2017-11-15 21:59:25 +00:00
Bruno Martins
4c7070241a Settings: Add notification channel for SIM selection
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
2017-11-14 22:28:59 +00:00
PMS22
63a0560a6c Settings: Correctly align cursor in Settings
Steps to Reproduce:
- Click on Density Settings (DPI Settings) / Renaming BT Device / Renaming SIM Settings
- EditText Dialog pops up
- The cursor is at the leftmost side of the text
- Logically Cursor should be at rightmost side which can be aligned grabbing text length

Screenshots:
Before:
http://imgur.com/a/o4vkr
http://imgur.com/a/6Qext

After:
http://imgur.com/a/fuxqT
http://imgur.com/a/vm2WX

Bug: 65185652
Test: RunSettingsRoboTests: OK (47 tests)

Change-Id: Id00308e7e019434edad4afab56cf4719be0d0d54
Signed-off-by: PMS22 <prathams99@rediff.com>
2017-09-27 14:12:32 -07:00
xiaocheng.x.wang
8ef6f6c839 Merge "Black screen appears after tapping the back key"
am: abcd256842

Change-Id: I2deeaed21b9452933e25a324e420c1cacfcfb395
2017-07-17 21:46:47 +00:00
Treehugger Robot
abcd256842 Merge "Black screen appears after tapping the back key" 2017-07-17 21:39:29 +00:00
liurong
36bf4178d0 Merge "Optimized Code: call direct method to get integer extra" am: b7fa46453a am: 7e51242c05
am: e821a7af23

Change-Id: I9f042c269caa25c2824e62e06e4fb775124310b7
2017-03-16 17:33:53 +00:00
liurong
c2daeaf7e7 Optimized Code: call direct method to get integer extra
Description: Make the default preferred sim slot as the first one(0) when get PREFERRED_SIM.

Test: NA
Change-Id: Id54bdbefd413c58ecd637cb8ff522861ead79331
Signed-off-by: liurong <liurong@xiaomi.com>
2017-03-16 22:02:32 +08:00
xiaocheng.x.wang
2cea7f814b Black screen appears after tapping the back key
Black screen is displayed after tapping the back key when editing SIM name.

To reproduce:
Settings->Dual SIM->tap the SIM name->tap back key.

[Expected Result]
Screen should be displayed normally.

[Actual Result]:
Black screen is displayed.

The cause is the dialog is not finished when it's dismissed.

Bug: 32934740
Change-Id: Ieddb65247cfe7b9434c8cfa7aeec2396616d9b81
2016-11-16 15:18:08 +00:00
Tamas Berghammer
265d3c2a0c Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
2016-11-08 14:06:17 +00:00
Fan Zhang
6507613ebc Log visibility change for all fragments.
Bug: 30681771
Test: SettingsUnitTests

Refactor visibility logging from InstrumentedFragment into a mixin. And
apply mixin in remaining fragments.

Change-Id: Ibbb59904336254a3e4bb9e8c7d0b36e5a6bc2622
2016-08-18 14:04:13 -07:00
Sanket Padawe
e0e651f2e0 Fix UI issue in Sim Settings screen.
+ Preference screen for Sim card selection should be enabled when 1)sim
 count > 1. 2) no default is set for Sms & Data & sim count >= 1

Bug: 27637607
Change-Id: Idb7207316a7bf9aab119ec6568038990623ba514
2016-04-07 09:43:03 -07:00
Udam Saini
e20deea711 Merge "Prevents users from being added if device is not provisioned" into nyc-dev 2016-03-31 20:13:40 +00:00
Sandeep Gutta
c4d7823c85 Telephony(MSIM): Fix Cellular Data Preference
While voice call is active, if cellular data preference
updated via updateCellularDataValues(), the cellular data
preference option getting enabled.
To fix this consider the call state while updating
cellular data preference in updateCellularDataValues().

bug:27635796

Change-Id: I5306f021e8bdeecc845d50a3b55b9c07d1b2c837
2016-03-28 14:05:46 -07:00
Udam Saini
679f7ad07e Prevents users from being added if device is not provisioned
Also added a utility function for checking provisioning, instead of
repeating code for this check in several places.

bug:26156445
Change-Id: I9f4a280dd0cdf889f892e386dbf6a3fdb2a052ef
2016-03-25 13:33:57 -07:00
Chris Wren
9d1bfd1e8d port settings over to new metrics enum
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
2016-01-27 10:58:58 -05:00
Shishir Agrawal
d2b0fc066c Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0
2016-01-26 13:48:21 -08:00
Sanket Padawe
e595ab1a01 Make phone number in Sim Settings read properly in Talk back mode.
Bug: 24308980
Change-Id: I384ec4ed8863cf6bdfa6e84ed2d88d9eda4ff42e
2015-11-12 15:59:54 -08:00
Jason Monk
39b467482d Depend on support lib preferences
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
2015-10-13 10:12:20 -04:00
Sanket Padawe
f6f43e4c45 Fix SimPreference dialog from closing on orientation change.
Bug: 19041463
Change-Id: I8c91fd6f01bbeb7561365dbb76ba3d4c05b76efc
2015-06-10 17:46:31 -07:00
Sanket Padawe
9d7eb49e7b Send sim change notification based on sim state change.
+ Send sim change notifications based on Sim state change rather then based
on subscription change.
+ Make SimSettings dynamically update based on subscriptions changed. Would
support hotswap which was not supported before this.

Bug: 20739298
Bug: 18385348
Change-Id: I5bb4b05f55b94eb0ed2a1a83fe2f168192b2b684
2015-06-01 10:25:46 -07:00
Sanket Padawe
55d4d75f4a Disable data sim selection when phone call active.
Bug: 19301456
Bug: 19150497
Change-Id: I396641b24e78616c93510bf367b61fa7c47ec068
2015-04-22 16:21:56 -07:00