Chandan Nath
1e89e94ad8
Merge "If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by admin" from search results." into qt-dev am: 2ec2c6330e
...
am: 552c951808
2019-04-16 04:51:48 -07:00
Chandan Nath
552c951808
Merge "If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by admin" from search results." into qt-dev
...
am: 2ec2c6330e
2019-04-16 04:41:54 -07:00
Chandan Nath
2ec2c6330e
Merge "If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by admin" from search results." into qt-dev
2019-04-16 11:21:10 +00:00
Antony Sargent
70c15513d0
Merge "Fix problem of multiple stacked copies of "Select SIM" dialog" into qt-dev am: 01b633275a
...
am: eb16066b90
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
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
Raff Tsai
1bb6c9bfd7
Merge "Remove error slice from Settings in rendering time" into qt-dev am: e128d27a7a
...
am: 22606bcfdd
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
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
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
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
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
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
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
2019-04-15 20:45:25 -07:00
Fan Zhang
e2a3670672
Merge "Clean up DND slice in search." into qt-dev
...
am: 12ee53f122
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
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
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
Lei Yu
fe26fdfb80
Merge "Hide app usage time in high usage dialog" into qt-dev am: 9515a685e3
...
am: c562fdcebf
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
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
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
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
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
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
2019-04-13 22:26:53 -07:00
Antony Sargent
265971cc1e
Merge "Update intent in SimNotification" into qt-dev
...
am: ead402c329
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
2019-04-13 21:16:31 -07:00
Kevin Chyn
9433c38eb6
Merge "Launch correct enrollment activity from ChooseLock" into qt-dev
...
am: 79f49b4626
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
2019-04-13 21:11:31 -07:00
Pasty Chang
247c77e6ec
Merge "Set suw description textview to fixed id" into qt-dev
...
am: ee35c1bddf
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
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
56744e1308
Merge changes from topic "Hide notification channel slice" into qt-dev am: 4ce0bf7336
...
am: 15cadab3b0
2019-04-12 20:22:34 -07:00
Fan Zhang
54b24d6929
Merge "Misc bug fixes around search bar in app list UI." into qt-dev am: 24c02bb50f
...
am: 5f27727f42
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
2019-04-12 18:38:22 -07:00
Fan Zhang
15cadab3b0
Merge changes from topic "Hide notification channel slice" into qt-dev
...
am: 4ce0bf7336
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
2019-04-12 17:31:13 -07: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
