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
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
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
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
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
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
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
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
Bill Yi
8ef8c389f5
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: bea1ed8666
-s ours am: ad53ebb2da
-s ours
...
am: 3460820b57
-s ours
am skip reason: subject contains skip directive
Change-Id: I867f9551565141b88006ecadb17393f57f0b4e73
2019-04-13 05:11:36 -07: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
79e93d87c9
Merge "Update search bar background drawable for dark mode" into qt-dev am: c4083cecd7
...
am: a3c86b45ee
Change-Id: I187660c76620aa73f882b1d4ed363acefcae7f90
2019-04-12 20:23:26 -07:00
Fan Zhang
56744e1308
Merge changes from topic "Hide notification channel slice" into qt-dev am: 4ce0bf7336
...
am: 15cadab3b0
Change-Id: If185c07b51c982503f22e6d9b92843dad5cc490e
2019-04-12 20:22:34 -07:00
Jordan Liu
cdf7114691
[automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev am: ac4e5dfa53
-s ours
...
am: 9bdef81f0d
-s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 728e186441
is in history
Change-Id: Ib07fa5dc5a6500a8d19b9a6f77361fdcc7ba6827
2019-04-12 20:17:35 -07: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
54b24d6929
Merge "Misc bug fixes around search bar in app list UI." into qt-dev am: 24c02bb50f
...
am: 5f27727f42
Change-Id: I9ca42281786f7b6110ca9c8595331e72be0b52d6
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
Change-Id: Icf61209eaccbdf118cac05449bb28fffcc224344
2019-04-12 18:38:22 -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
cosmohsieh
ad92bf67e4
Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev am: ab3fed9b69
...
am: 1a5bd24d58
Change-Id: I8f9bd81444f663470b1f7514d51d75d90a1038d6
2019-04-12 17:31:13 -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