Commit Graph

51975 Commits

Author SHA1 Message Date
Lei Yu
9515a685e3 Merge "Hide app usage time in high usage dialog" into qt-dev 2019-04-15 17:54:39 +00:00
Mill Chen
ce6137e247 Add subtitle for Do not disturb
Bug: 130364160
Test: visual
Change-Id: I85507b6b269d427501f144f56ca7dc871269e6d4
2019-04-15 10:26:20 -07:00
Alex Salo
c6cfd5e3bf Rename screen aware into screen attention
Bug: 111939367
Test: make RunSettingsRoboTests, manual
Change-Id: I4f65bd11a71db6601cea418a5d89b14d91858ab4
2019-04-15 17:11:35 +00:00
Beverly
47047d4df8 Show correct text for old zen modes
When the device is in total silence or alarms only
dnd modes, DND settings for messages and calls should
say that no callers and no messages are allowed through.

Test: atest
Fixes: 130152926
Change-Id: I980dea46ef29e736ada41755bf0ea395c198f851
2019-04-15 10:55:56 -04: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
markchien
f9f0d11782 Ignore the outdated entitlement check
Don't run entitlement if the request is base on outdated subId.

Bug: 129751453
Test: -build, flash, boot
      -atest TetherServiceTest
      -manual test with carrier SIM

Change-Id: Id3157df1a5758f8c72acbc45c9fefd2215c87395
2019-04-15 15:54:52 +08:00
pastychang
1d2b51aeb0 Set WifiDialog to light theme in setup flow
Screenshot: https://screenshot.googleplex.com/X6tkxihEWFY

Test: Manual
Bug: 130507879
Change-Id: Icca6b827cdb62387fde4c91435d4df10e2ff4d04
2019-04-15 05:49:51 +00:00
Cosmo Hsieh
c7ae0a3d11 Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev am: 96b534951c
am: bd8c87097d

Change-Id: I5a17e96800fee3f10b1b5a30a7ff3cd8131036af
2019-04-13 23:01:55 -07:00
Cosmo Hsieh
bd8c87097d Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev
am: 96b534951c

Change-Id: I5fd338e5bcabe349740e586406aac7ceba1f2102
2019-04-13 22:56:56 -07:00
Cosmo Hsieh
96b534951c Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev 2019-04-14 05:51:02 +00:00
Antony Sargent
3d42893600 Merge "Update intent in SimNotification" into qt-dev am: ead402c329
am: 265971cc1e

Change-Id: I91c4566af7b6b3c7fe7163c09fb9faf6c529874c
2019-04-13 22:26:53 -07:00
Antony Sargent
265971cc1e Merge "Update intent in SimNotification" into qt-dev
am: ead402c329

Change-Id: I56ca38510190315b6cf74cd81d3b4f0321adb062
2019-04-13 22:22:53 -07:00
TreeHugger Robot
ead402c329 Merge "Update intent in SimNotification" into qt-dev 2019-04-14 05:11:58 +00:00
Kevin Chyn
a9a2578768 Merge "Launch correct enrollment activity from ChooseLock" into qt-dev am: 79f49b4626
am: 9433c38eb6

Change-Id: Ib4e72b79dfd4b987067405bb1be2bf936a4d8fb1
2019-04-13 21:16:31 -07:00
Kevin Chyn
9433c38eb6 Merge "Launch correct enrollment activity from ChooseLock" into qt-dev
am: 79f49b4626

Change-Id: I605486afb4126619bcdfa1261ad8a3bb33647235
2019-04-13 21:11:32 -07:00
Pasty Chang
cb665368d4 Merge "Set suw description textview to fixed id" into qt-dev am: ee35c1bddf
am: 247c77e6ec

Change-Id: Ia5dcbb06ff2cc409341d33b905d1ce73b0e5c541
2019-04-13 21:11:31 -07:00
Pasty Chang
247c77e6ec Merge "Set suw description textview to fixed id" into qt-dev
am: ee35c1bddf

Change-Id: I306cedd59e191de716616e1815c81230046b314b
2019-04-13 21:06:37 -07:00
Kevin Chyn
79f49b4626 Merge "Launch correct enrollment activity from ChooseLock" into qt-dev 2019-04-14 04:03:54 +00:00
Pasty Chang
ee35c1bddf Merge "Set suw description textview to fixed id" into qt-dev 2019-04-14 03:53:16 +00:00
Bill Yi
8ef8c389f5 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: bea1ed8666 -s ours am: ad53ebb2da -s ours
am: 3460820b57 -s ours
am skip reason: subject contains skip directive

Change-Id: I867f9551565141b88006ecadb17393f57f0b4e73
2019-04-13 05:11:36 -07:00
Bill Yi
3460820b57 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: bea1ed8666 -s ours
am: ad53ebb2da -s ours
am skip reason: subject contains skip directive

Change-Id: Iadd8fa72e16ff5385af2d419badc0825ee3d3d9e
2019-04-13 05:06:34 -07:00
Bill Yi
ad53ebb2da [automerger skipped] Merge "Import translations. DO NOT MERGE"
am: bea1ed8666 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec39c3c20fdb63b908c40ca9273a17e1baef8612
2019-04-13 04:57:24 -07:00
Treehugger Robot
bea1ed8666 Merge "Import translations. DO NOT MERGE" 2019-04-13 11:45:22 +00:00
Bill Yi
691efb9036 Import translations. DO NOT MERGE
Change-Id: I3445f31f0d5fb57f93a26c58cc8686a453bb8c46
Auto-generated-cl: translation import
2019-04-13 03:41:31 -07:00
Kevin Chyn
5ab064f343 Launch correct enrollment activity from ChooseLock
Test: no noticable difference when setting up fingeprint work profile

Fixes: 130397083
Change-Id: I34be5262cc52052ce25a188f19bbcc13f938ac92
2019-04-13 08:17:38 +00:00
Fan Zhang
79e93d87c9 Merge "Update search bar background drawable for dark mode" into qt-dev am: c4083cecd7
am: a3c86b45ee

Change-Id: I187660c76620aa73f882b1d4ed363acefcae7f90
2019-04-12 20:23:26 -07:00
Fan Zhang
56744e1308 Merge changes from topic "Hide notification channel slice" into qt-dev am: 4ce0bf7336
am: 15cadab3b0

Change-Id: If185c07b51c982503f22e6d9b92843dad5cc490e
2019-04-12 20:22:34 -07:00
Jordan Liu
cdf7114691 [automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev am: ac4e5dfa53 -s ours
am: 9bdef81f0d -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 728e186441 is in history

Change-Id: Ib07fa5dc5a6500a8d19b9a6f77361fdcc7ba6827
2019-04-12 20:17:35 -07:00
Fan Zhang
a3c86b45ee Merge "Update search bar background drawable for dark mode" into qt-dev
am: c4083cecd7

Change-Id: Ibbcbbea8620d89e94669846faeb34856952845e8
2019-04-12 18:51:40 -07:00
Fan Zhang
54b24d6929 Merge "Misc bug fixes around search bar in app list UI." into qt-dev am: 24c02bb50f
am: 5f27727f42

Change-Id: I9ca42281786f7b6110ca9c8595331e72be0b52d6
2019-04-12 18:39:41 -07:00
lindatseng
b58460bd7d Merge "Update panel logging to include all hide page cases" into qt-dev am: 878236f318
am: 1d7db47f2f

Change-Id: Icf61209eaccbdf118cac05449bb28fffcc224344
2019-04-12 18:38:22 -07:00
Fan Zhang
15cadab3b0 Merge changes from topic "Hide notification channel slice" into qt-dev
am: 4ce0bf7336

Change-Id: I2f409463837ddb5bb5b5ce58ef5851999a176f0b
2019-04-12 17:43:47 -07:00
cosmohsieh
ad92bf67e4 Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev am: ab3fed9b69
am: 1a5bd24d58

Change-Id: I8f9bd81444f663470b1f7514d51d75d90a1038d6
2019-04-12 17:31:13 -07:00
Jordan Liu
9bdef81f0d [automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev
am: ac4e5dfa53 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 728e186441 is in history

Change-Id: I2e205b64a8dbb3a2d5388510906f7f7073c7b19a
2019-04-12 17:20:20 -07:00
Fan Zhang
c4083cecd7 Merge "Update search bar background drawable for dark mode" into qt-dev 2019-04-13 00:01:12 +00:00
Fan Zhang
4ce0bf7336 Merge changes from topic "Hide notification channel slice" into qt-dev
* changes:
  Log interacted package from ContextualNotificationChannelSlice
  Hide notification channel slice that is interacted
2019-04-12 23:38:27 +00:00
Jordan Liu
ac4e5dfa53 Merge "Make RadioInfo settings menu work for mSIM" into qt-dev 2019-04-12 23:27:45 +00:00
Fan Zhang
5f27727f42 Merge "Misc bug fixes around search bar in app list UI." into qt-dev
am: 24c02bb50f

Change-Id: Ia2dc1569c15c824a7aa9b964001cf1ed151d841f
2019-04-12 16:25:19 -07:00
lindatseng
1d7db47f2f Merge "Update panel logging to include all hide page cases" into qt-dev
am: 878236f318

Change-Id: I02a6d2f7d3508c4544856af469a96923da203d47
2019-04-12 16:23:11 -07:00
Fan Zhang
7df6445c3e Clean up DND slice in search.
- Remove the controller in SoundSettings, just use the common one.
- Update a bunch of IDs so ZenModeSliceBuilder maps to the toggle
  button in zen_mode_settings.xml

This is needed so the slice intent (left target when shown in search)
is the same as what we index from search side. Previously the search
indexer is finding zen_mode from sound page but the slice itself is
reporting a deep link into zenModeSettings page.

Fixes: 130437726
Test: robotest

Change-Id: Ic41d2d93afa1f748e3282e23010199a0fa078645
2019-04-12 16:11:31 -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
Lei Yu
2f90dd784f Hide app usage time in high usage dialog
Also update strings a little bit

Bug: 112285389
Test: Manual
Change-Id: I5c4f3e2de635eb0b880d2d3d5a1550e1af41d931
2019-04-12 22:39:44 +00:00
TreeHugger Robot
24c02bb50f Merge "Misc bug fixes around search bar in app list UI." into qt-dev 2019-04-12 22:33:33 +00:00
TreeHugger Robot
878236f318 Merge "Update panel logging to include all hide page cases" into qt-dev 2019-04-12 22:33:24 +00:00
Maurice Lam
ea28576e7a Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev am: 76ffb2df02
am: e1e52f7940

Change-Id: Ic428560fa9ddd4d748d1269987bd076c67b37077
2019-04-12 15:01:29 -07:00
Jordan Liu
85f1d2a704 Make RadioInfo settings menu work for mSIM
Just add a spinner to the top of the screen which lets you select the
phoneIndex. Upating this value updates the mTelephonyManager
mImsManager, and mPhoneStateListener to use the selected phoneIndex and
the subscription associated with it.

Also adds fields for current subId and default data sim subId.

Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Test: manual test (on single sim)
Fixes: 128033739
Change-Id: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
2019-04-12 15:00:05 -07:00
cosmohsieh
1a5bd24d58 Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev
am: ab3fed9b69

Change-Id: Ifb497131b4bab035840e23b14987eb40f7088810
2019-04-12 14:55:23 -07:00
Jordan Liu
24ed72f830 Make RadioInfo settings menu work for mSIM
Just add a spinner to the top of the screen which lets you select the
phoneIndex. Upating this value updates the mTelephonyManager
mImsManager, and mPhoneStateListener to use the selected phoneIndex and
the subscription associated with it.

Also adds fields for current subId and default data sim subId.

Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Test: manual test (on single sim)
Fixes: 128033739
Change-Id: Id075e3bffe20523d8ceeb8f2e4320f995abdab55
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
2019-04-12 14:54:41 -07:00
Lei Yu
0bc39338c1 Merge "Disable icon for NetworkOperatorPreference" into qt-dev am: a55af7ea34
am: bb94324293

Change-Id: Ia79f4a84ea5acb527339c4fdb182290a452ffbba
2019-04-12 14:30:25 -07:00
TreeHugger Robot
ab3fed9b69 Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev 2019-04-12 21:27:37 +00:00