Commit Graph

51355 Commits

Author SHA1 Message Date
Fan Zhang
7f7b9e7736 Merge "Correct the state when prevent ringing page is launched." into qt-dev
am: 957da73a7d

Change-Id: I541d0c22788678fc0e9249e35f6aeae1f1ea0e0b
2019-04-16 08:33:30 -07:00
Fan Zhang
60fd2efb96 Merge "Update switchbar background color in disabled state." into qt-dev
am: cae16fa07b

Change-Id: I36d4bbb7b4538271f25d374572094c877a200174
2019-04-16 08:32:38 -07:00
Amin Shaikh
900d8c9e12 Merge "Create TintDrawable in Settings." into qt-dev
am: c4e7cf594c

Change-Id: I8a04a3924d17712b17798109b418c0d4748cf737
2019-04-16 08:28:24 -07:00
Fan Zhang
957da73a7d Merge "Correct the state when prevent ringing page is launched." into qt-dev 2019-04-16 15:22:26 +00:00
Fan Zhang
cae16fa07b Merge "Update switchbar background color in disabled state." into qt-dev 2019-04-16 15:19:25 +00:00
TreeHugger Robot
c4e7cf594c Merge "Create TintDrawable in Settings." into qt-dev 2019-04-16 15:16:26 +00:00
Lei Yu
65628c28a9 Merge "Add remote volume slider conditionally." into qt-dev
am: ee6825fd5b

Change-Id: I030b19ae8d2d843cdb2db93b8900de785bb28a40
2019-04-16 05:58:13 -07:00
TreeHugger Robot
ee6825fd5b Merge "Add remote volume slider conditionally." into qt-dev 2019-04-16 12:46:55 +00: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

Change-Id: Ie6744ff497919670f69833cfaa838a526ab3c904
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
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
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
Felipe Leme
aba152b7ef Merge "Change Content Capture strings." into qt-dev
am: d51e020cc6

Change-Id: I56610c79cc69f2064e231ffdbbe5d5fa50cc4ed8
2019-04-15 22:08:33 -07:00
Felipe Leme
d51e020cc6 Merge "Change Content Capture strings." into qt-dev 2019-04-16 04:51:24 +00:00
Alex Salo
6f0624a025 Merge "Rename screen aware into screen attention" into qt-dev
am: ad4483c2a2

Change-Id: I2f20adc1ecfec076a82c5d3f110986a9812ccc7d
2019-04-15 20:56:13 -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
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
ad4483c2a2 Merge "Rename screen aware into screen attention" into qt-dev 2019-04-16 03:17:50 +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
Jordan Liu
5ccb19e418 [automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev
am: 80584fe1f7 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 e431f6337f is in history

Change-Id: I5101430419c3f026c00e52d09ae2b426febbd12d
2019-04-15 15:35:37 -07:00
Jordan Liu
80584fe1f7 Merge "Make RadioInfo settings menu work for mSIM" into qt-dev 2019-04-15 21:55:43 +00:00
Fan Zhang
dd2efc0073 Update switchbar background color in disabled state.
Fixes: 129991749
Test: visual
Change-Id: Ief3a6a09d2ca905e30e74b7cbd6b4c1500311053
2019-04-15 14:25:51 -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
Felipe Leme
6beb5e4581 Change Content Capture strings.
Test: manual verification
Bug: 129403630

Change-Id: Idfc560c78e29a0557cb009dddf98f4e1ce879f25
2019-04-15 13:08:50 -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
f47e4cc536 [automerger skipped] Merge "Do not reuse phonestatelistener" am: c99fddfe75
am: 1636344325 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 85f1d2a704 is in history

Change-Id: I3879f0514ab892b4c2826eb880374f634ba80822
2019-04-15 12:42:46 -07:00
Jordan Liu
1636344325 Merge "Do not reuse phonestatelistener"
am: c99fddfe75

Change-Id: I52e311da7ae9a9477b74fc25f6bb122935e14582
2019-04-15 12:37:48 -07:00
Jordan Liu
c99fddfe75 Merge "Do not reuse phonestatelistener" 2019-04-15 19:27:06 +00: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
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
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
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
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
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
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
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