Commit Graph

27127 Commits

Author SHA1 Message Date
Antony Sargent
70c15513d0 Merge "Fix problem of multiple stacked copies of "Select SIM" dialog" into qt-dev am: 01b633275a
am: eb16066b90

Change-Id: I9b459f89192765b8862d8532a0606c8a4a620534
2019-04-16 01:44:44 -07:00
Antony Sargent
eb16066b90 Merge "Fix problem of multiple stacked copies of "Select SIM" dialog" into qt-dev
am: 01b633275a

Change-Id: Ica76aedb924014e2ed79159ad2e9616a9b93b2a3
2019-04-16 01:40:47 -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
TreeHugger Robot
164bad59e5 Merge "[Network Connection] Show full SSID on list item" 2019-04-16 07:48:02 +00:00
cosmohsieh
faede7ceb9 Implement context menu for ConnectedAccessPointPreference
1) User wants to long press ConnectedAccessPointPreference to forget network if this
is a captive portal network.
2) Change context menu string

Bug: 113756562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: If5c45c45fe126f627eeb53a6c1873a070ad23ae8
(cherry picked from commit 9f8522565a)
2019-04-16 07:35:36 +00:00
Raff Tsai
1bb6c9bfd7 Merge "Remove error slice from Settings in rendering time" into qt-dev am: e128d27a7a
am: 22606bcfdd

Change-Id: I27a1209cd33aadb5b7e45b9e10645746a5f758f5
2019-04-15 23:01:32 -07:00
Edgar Wang
fd42fe1c8f Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev am: 83fcc3582e
am: 515d30f819

Change-Id: I514f789d2f96cdbf8806df1d185cf2430b702aa3
2019-04-15 22:37:48 -07:00
Pasty Chang
88569d3469 Merge "Set WifiDialog to light theme in setup flow" into qt-dev am: 997128ee91
am: 686fe46e78

Change-Id: If4070e54092b8e122f937676af39d8dc4dcf4aa6
2019-04-15 22:36:41 -07:00
Raff Tsai
22606bcfdd Merge "Remove error slice from Settings in rendering time" into qt-dev
am: e128d27a7a

Change-Id: I41eb5123dec7ffd7b6b085b2d67ad89033cda742
2019-04-15 22:26:48 -07:00
TreeHugger Robot
e128d27a7a Merge "Remove error slice from Settings in rendering time" into qt-dev 2019-04-16 05:20:58 +00:00
Fan Zhang
5a9173f5ca Merge "Clean up DND slice in search." into qt-dev am: 12ee53f122
am: e2a3670672

Change-Id: I15691e0657ef0e7f54f7b3bce35aeff3dd8f4a9e
2019-04-15 21:56:52 -07:00
Colin Cross
0ff1b6cb01 Merge "Update Settings for guava 27.1" into qt-dev-plus-aosp
am: 2e7a226e65

Change-Id: I94a0ac1545fc0084e895567831ca52217fe53598
2019-04-15 21:33:49 -07:00
Edgar Wang
515d30f819 Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev
am: 83fcc3582e

Change-Id: I1a1bb7aa2243b4440bd66b00484bcbddae23ade2
2019-04-15 20:46:16 -07:00
Pasty Chang
686fe46e78 Merge "Set WifiDialog to light theme in setup flow" into qt-dev
am: 997128ee91

Change-Id: Idef21e3f81305fc79de860836d617f041e6353e0
2019-04-15 20:45:25 -07:00
Fan Zhang
e2a3670672 Merge "Clean up DND slice in search." into qt-dev
am: 12ee53f122

Change-Id: Idfa60999ed1202bab9f6f9a737f461f0bbb2e39f
2019-04-15 20:43:50 -07:00
cosmohsieh
151d5a3c83 [Network Connection] Show full SSID on list item
Long SSID will be cut off, because ellipsized. Show full SSID to gain
better UX.

Bug: 130198869
Test: manual
Change-Id: I14376ff7fb922439a2d664433a94740cc06cd99a
2019-04-16 11:38:25 +08:00
Colin Cross
2e7a226e65 Merge "Update Settings for guava 27.1" into qt-dev-plus-aosp 2019-04-16 03:35:51 +00:00
TreeHugger Robot
83fcc3582e Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev 2019-04-16 03:12:41 +00:00
Pasty Chang
997128ee91 Merge "Set WifiDialog to light theme in setup flow" into qt-dev 2019-04-16 02:53:29 +00:00
Salvador Martinez
ef7ce46657 Change dark theme screen to toggle
The dark theme screen has been removed in favor of a simple
toggle with a dialog that shows up the first time a user
tries to enable dark theme when in light theme.

Test: robotests pass
Bug: 130251804
Change-Id: I48f8e24a2b2a117e5a8054c5bc0b240ba68fe1ad
2019-04-15 19:52:49 -07:00
Fan Zhang
12ee53f122 Merge "Clean up DND slice in search." into qt-dev 2019-04-16 02:50:10 +00:00
Edgar Wang
73454f2607 "Disallow adjust volume" restricted dialog didn't show
root casue: VolumeSeekBarPreference & SeekBarPreference will return
false when call isSelectable() then this preference won't perform Click

Fixes: 123745455
Test: Manual & robotest
Change-Id: Iba27b503e8a272260c80bd41aecdd5cdbc39f962
2019-04-16 09:41:07 +08:00
Raff Tsai
000ba3fabe Remove error slice from Settings in rendering time
We filter error slice in EligibleCardChecker but not filter it in
SliceContextualCardRenderer, these two part should use the same
logic.

Fixes:128687331
Test: manual
Change-Id: I217bc6b578ceb36b0a67b44dc8a08ecd02771d82
2019-04-16 07:41:31 +08:00
Lei Yu
3000943432 Hide Mobile preference for secondary user
Fixes: 128917967
Test: RunSettingsRoboTests
Change-Id: Ibb95e3f0f42a8c484807a286bc77e8764eb31fcf
2019-04-15 15:17:58 -07:00
Lei Yu
c1dbd34b9d Add remote volume slider conditionally.
Issue before this CL:
RemoteVolumePreferenceController only return available when
it is casting, otherwise return CONDITIONALLY_UNAVAILABLE.
However slice database only index available controllers and keep
this cache. So remote slider won't be indexed if it is not casting
at that time.

As a tmp fix, this CL make controller always return available
unsearchable to make it indexed by database. However only add
that slice if it is casting.

Bug: 130124950
Test: RunSettingsRoboTests
Change-Id: I191144844d6ba7ccbe3dc1c9d19801adb978abc6
2019-04-15 13:49:46 -07:00
Chandan Nath
826a91c56e If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by
admin" from search results.

"Backup -> Backup" still appears due to the PrivacySettingsActivity. On clicking that,
we get "Backup is disabled by admin" which is OK

Bug: 129743816

Test: 1. atest -v UserBackupSettingsActivityTest
2. atest -v BackupInactivePreferenceControllerTest
3. Create and switch to secondary user. Type "backup" in settings search. Note that only
"Backup->Backup" is shown and on clicking it, we get "Backup is disabled by admin"

Change-Id: Ic13e2d745c9511cbebe27aa4c6f5cd89b277fc37
2019-04-15 20:47:34 +01:00
Jordan Liu
1636344325 Merge "Do not reuse phonestatelistener"
am: c99fddfe75

Change-Id: I52e311da7ae9a9477b74fc25f6bb122935e14582
2019-04-15 12:37:48 -07:00
Lei Yu
8164361792 Disable Mobile settings in one condition.
If there is no active subscription and esim is unsupported, disable
this preference.

Bug: 129143739
Test: RunSettingsRoboTests
Change-Id: I5f8b0d95df8764a3a505aae5e26df42e9412c021
2019-04-15 12:28:53 -07:00
Jordan Liu
c99fddfe75 Merge "Do not reuse phonestatelistener" 2019-04-15 19:27:06 +00:00
Mill Chen
7d0150d160 Remove On/Off string from Night light slice
We only deleted On/Off string from the subtitle of night light slice in
the settings search result, and still keep On/Off string for Night Light
preference.

Fixes: 130364160
Test: visual
Change-Id: Ibe7f2752f099a4ab0d4a01a205e4e8ce0a226f55
2019-04-15 11:40:19 -07:00
Lei Yu
fe26fdfb80 Merge "Hide app usage time in high usage dialog" into qt-dev am: 9515a685e3
am: c562fdcebf

Change-Id: I79c3b165eff60633668fe228ebdb7318fa0bd84f
2019-04-15 11:24:41 -07:00
Lei Yu
c562fdcebf Merge "Hide app usage time in high usage dialog" into qt-dev
am: 9515a685e3

Change-Id: Ibe5266fd010ab54350d679f0b1710b08ff05aa4a
2019-04-15 11:12:22 -07:00
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
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