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
Felipe Leme
6beb5e4581
Change Content Capture strings.
...
Test: manual verification
Bug: 129403630
Change-Id: Idfc560c78e29a0557cb009dddf98f4e1ce879f25
2019-04-15 13:08:50 -07: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
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
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
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
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
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