Fan Zhang
4c0cf18c4d
Merge "Correct the state when prevent ringing page is launched." into qt-dev am: 957da73a7d
...
am: 7f7b9e7736
Change-Id: I3eb05af8cb241aa079cdef46855ba4bef3feef6b
2019-04-16 08:45:18 -07:00
Fan Zhang
2be848029b
Merge "Update switchbar background color in disabled state." into qt-dev am: cae16fa07b
...
am: 60fd2efb96
Change-Id: Id0808d7abfc2923d6d95894ecd780022d691d76b
2019-04-16 08:43:59 -07:00
Amin Shaikh
f1cf5a684f
Merge "Create TintDrawable in Settings." into qt-dev am: c4e7cf594c
...
am: 900d8c9e12
Change-Id: Ia7d264a229cf2d0d8e65091e604bb24680676857
2019-04-16 08:38:38 -07:00
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
4ee2e00c18
Merge "Add remote volume slider conditionally." into qt-dev am: ee6825fd5b
...
am: 65628c28a9
Change-Id: Ie439c23772df2021089bbca3f9bb3c6914ed0ae1
2019-04-16 06:15:00 -07: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
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
Change-Id: I2b8e38c1e7d5fb291d432f83b3631f3cfaa534e5
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
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
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
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
Felipe Leme
8987213cfc
Merge "Change Content Capture strings." into qt-dev am: d51e020cc6
...
am: aba152b7ef
Change-Id: I88dc9a29f69ced429ff83396200e28c7c730fe4c
2019-04-15 22:51:45 -07:00
Alex Salo
27fe74d87b
Merge "Rename screen aware into screen attention" into qt-dev am: ad4483c2a2
...
am: 6f0624a025
Change-Id: I7fb0b4d01eb2f5d67ee4eabd47fe31d6ac10bd13
2019-04-15 22:38:40 -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
Felipe Leme
aba152b7ef
Merge "Change Content Capture strings." into qt-dev
...
am: d51e020cc6
Change-Id: I56610c79cc69f2064e231ffdbbe5d5fa50cc4ed8
2019-04-15 22:08:33 -07: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
Felipe Leme
d51e020cc6
Merge "Change Content Capture strings." into qt-dev
2019-04-16 04:51:24 +00: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
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
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
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
e45f90db03
[automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev am: 80584fe1f7
-s ours
...
am: 5ccb19e418
-s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 e431f6337f
is in history
Change-Id: Id556d7b4aec9cfe7578dec6884809429e05427f9
2019-04-15 15:59:01 -07: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
Jordan Liu
28d000b7b3
[automerger skipped] Merge "Do not reuse phonestatelistener" am: c99fddfe75
am: 1636344325
-s ours
...
am: f47e4cc536
-s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 728e186441
is in history
Change-Id: I46fc1a05e88a56db019af9cb4eb9d31a5b054a80
2019-04-15 13:16:17 -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