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
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
TreeHugger Robot
878236f318
Merge "Update panel logging to include all hide page cases" into qt-dev
2019-04-12 22:33:24 +00:00
Jordan Liu
85f1d2a704
Make RadioInfo settings menu work for mSIM
...
Just add a spinner to the top of the screen which lets you select the
phoneIndex. Upating this value updates the mTelephonyManager
mImsManager, and mPhoneStateListener to use the selected phoneIndex and
the subscription associated with it.
Also adds fields for current subId and default data sim subId.
Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.
Test: manual test (on single sim)
Fixes: 128033739
Change-Id: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
2019-04-12 15:00:05 -07:00
cosmohsieh
1a5bd24d58
Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev
...
am: ab3fed9b69
Change-Id: Ifb497131b4bab035840e23b14987eb40f7088810
2019-04-12 14:55:23 -07:00
TreeHugger Robot
ab3fed9b69
Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev
2019-04-12 21:27:37 +00:00
Fan Zhang
270fd6c872
Misc bug fixes around search bar in app list UI.
...
- Turn off DEBUG log flag, it's spammy and is a potential PII risk.
- Save search bar expand state so it stays open during screen rotation.
- Introduce a intent extra so callers can deep link into this UI with
search bar pre-expanded.
Fixes: 130422388
Test: robotest
Change-Id: Ib81080733707306de516c49340571c543e70874e
2019-04-12 13:50:54 -07:00
Maurice Lam
e1e52f7940
Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev
...
am: 76ffb2df02
Change-Id: I5a6c0aa2689ac171f832dce3464603640b44bf80
2019-04-12 12:48:32 -07:00
Lei Yu
bb94324293
Merge "Disable icon for NetworkOperatorPreference" into qt-dev
...
am: a55af7ea34
Change-Id: Iff4fb149a8b9a18d79524c76056fc3ec1eb37a8d
2019-04-12 12:40:38 -07:00
lindatseng
79957c3217
Update panel logging to include all hide page cases
...
The old logging only include see_more, done, and clicked_out when hiding
the panel page. We were missing many cases that user might use back
button, app switch button to close the page.
Update the hide page keys to change the clicked_out to others to
include all the other cases which hide the page.
Test: Manual verification
Test: atest PanelFragmentTest SettingsPanelActivityTest
Fixes: 130169553
Change-Id: Icede9a8dcb84565cba183963c9fb554507631c98
2019-04-12 11:33:41 -07:00
Maurice Lam
76ffb2df02
Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev
2019-04-12 17:59:42 +00:00
Lei Yu
a55af7ea34
Merge "Disable icon for NetworkOperatorPreference" into qt-dev
2019-04-12 17:44:59 +00:00
cosmohsieh
b0aee6abd0
Fix null App name in Wi-Fi scanning prompt dialog
...
App name of the dialog msg is null because getCallingPackage() is null
when calling activity does not use startActvitiyForResult().
Bug: 112248584
Test: manual
Change-Id: If5ba9eb62f895c66ac1839b4be5c372ecba6699c
2019-04-12 17:02:22 +00:00
Yanting Yang
21f9a0f6c9
Update search bar background drawable for dark mode
...
Bug: 129996634
Test: visual
Change-Id: I1657b1b570bf79ad776ae80b2f2878e4f4d72481
2019-04-12 20:42:08 +08:00
pastychang
fa68ec4f56
Set suw description textview to fixed id
...
Heavy theme supports to costomize description text style. Modify it to fixed id
that can be customized by partner resource.
Heavy theme screenshot: https://screenshot.googleplex.com/TL4M7wmTaPg
Set fixed id screenshot: https://screenshot.googleplex.com/CA6QHoNTQBZ
Test: atest
Bug: 121988926
Change-Id: I8882acd49e7d57f24afa9dd6f3e9abfd06556053
2019-04-12 09:20:12 +00:00
Yanting Yang
b29e53a450
Log interacted package from ContextualNotificationChannelSlice
...
Fixes:129726858
Test: visual, robotests
Change-Id: Ife4043fe0bcb52445e8e2efec20781ce43c54fef
2019-04-12 15:28:29 +08:00
Yanting Yang
78e097f239
Hide notification channel slice that is interacted
...
- Ignore interacted package in ContextualNotificationChannelSlice.
- Regularly clear package record with background worker.
Bug:129726858
Test: visual, robotests
Change-Id: I94661a53bcbbe4a15479224c33cfb2eff345aa67
2019-04-12 15:27:49 +08:00
Bill Yi
e8a33f25ff
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: db7f321526
-s ours
am skip reason: subject contains skip directive
Change-Id: I96647d998ac8bc8d05cbd851003b0a593509112e
2019-04-11 23:26:52 -07:00
TreeHugger Robot
db7f321526
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-12 06:11:17 +00:00
Bill Yi
010a39219b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3f2592d8b31abc79f4bf4edc54f05ff24edede32
2019-04-11 20:47:23 -07:00
Jordan Liu
26b7c81411
Merge "fix merge [DO NOT MERGE]" into qt-dev-plus-aosp
2019-04-12 03:12:04 +00:00
Jordan Liu
9291bfad0f
fix merge [DO NOT MERGE]
...
ag/7020248 defined mSelectPhoneIndexHandler twice,
this fix removes the double definition
Change-Id: I749ab26dc71f269fd322d51b94a4809cecfd0df1
2019-04-12 03:07:33 +00:00
Arc Wang
1785625089
Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev
...
am: ff0db2f26b
Change-Id: I6a6160f28ef0474f965701b88c186800a962a8ea
2019-04-11 19:56:32 -07:00
Arc Wang
ff0db2f26b
Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev
2019-04-12 02:44:33 +00:00
Arc Wang
54d5b05d69
Merge "Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator" into qt-dev
...
am: 982e46fe6c
Change-Id: I6b4b4e594bd1e62fb1bd927dd2e399838aca4a49
2019-04-11 19:41:13 -07:00
Arc Wang
982e46fe6c
Merge "Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator" into qt-dev
2019-04-12 02:36:21 +00:00
Pasty Chang
986bede1f1
Merge "Increasing char limited of skip dialog title to 48" into qt-dev
...
am: 326da4b510
Change-Id: I61cbefa73255d0dd65ea253005d4dee866c66a88
2019-04-11 18:27:48 -07:00
Pasty Chang
326da4b510
Merge "Increasing char limited of skip dialog title to 48" into qt-dev
2019-04-12 01:13:24 +00:00
Jordan Liu
79a2693dfe
Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp
2019-04-11 23:57:05 +00:00
Jordan Liu
84deb0ac4f
Do not reuse phonestatelistener
...
Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.
Fixes: 129989656
Test: manual
Change-Id: I7630e74a9361093d8cbe72fa72c14aaaab9fcc17
2019-04-11 23:55:53 +00:00
Mill Chen
b5cdcffd6b
Merge "Fix conditionals not show up in homepage" into qt-dev
...
am: 72f0aa2a68
Change-Id: I109ed36ffdcdc1b432cfdaf2ffa1c058213980c8
2019-04-11 16:50:56 -07:00
Brad Ebinger
68937ee0ac
[automerger skipped] Merge "Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
am: c91d33798b" into qt-dev
...
am: ba05893e37
-s ours
am skip reason: change_id Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc with SHA1 ac4a495fc2
is in history
Change-Id: I6e9aabab4263185ec4e604a4b092e1298350b746
2019-04-11 16:42:25 -07:00
Lei Yu
e9226c4bba
Disable icon for NetworkOperatorPreference
...
When using old api, disable icon because data in CellInfo is wrong.
Fixes: 128393160
Test: RunSettingsRoboTests
Change-Id: Ide5b424e86d2f0a19cf1e0e6bf22edb270822690
2019-04-11 16:18:50 -07:00
TreeHugger Robot
72f0aa2a68
Merge "Fix conditionals not show up in homepage" into qt-dev
2019-04-11 23:14:30 +00:00