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
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
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
Maurice Lam
ea28576e7a
Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev am: 76ffb2df02
...
am: e1e52f7940
Change-Id: Ic428560fa9ddd4d748d1269987bd076c67b37077
2019-04-12 15:01:29 -07: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
Lei Yu
0bc39338c1
Merge "Disable icon for NetworkOperatorPreference" into qt-dev am: a55af7ea34
...
am: bb94324293
Change-Id: Ia79f4a84ea5acb527339c4fdb182290a452ffbba
2019-04-12 14:30:25 -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
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
Arc Wang
3ef032d2a4
Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev am: ff0db2f26b
...
am: 1785625089
Change-Id: I0fb1ad5aa152d239412b054430a8d593d391d346
2019-04-11 20:28:04 -07:00
Arc Wang
5ec396c14c
Merge "Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator" into qt-dev am: 982e46fe6c
...
am: 54d5b05d69
Change-Id: I290732e2c88aacdf64d44721cc6133602b492b24
2019-04-11 20:26:06 -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
Jordan Liu
e677810e7d
Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp
...
am: 79a2693dfe
Change-Id: Ida5c874937a87521a79638e97e733fff10df513f
2019-04-11 17:50:35 -07:00
Mill Chen
99b9dcddef
Merge "Fix conditionals not show up in homepage" into qt-dev am: 72f0aa2a68
...
am: b5cdcffd6b
Change-Id: Ia0e715edd9ced175f1fc1be6adbcf1c7ea6ec282
2019-04-11 17:24:58 -07: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
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
Fabian Kozynski
aa64f4faa8
Merge "Added activity with correct filter for DataSaver" into qt-dev am: 8f2f09f5d6
...
am: 3f5718a002
Change-Id: I75c16a10288753167699fe07239e0beee4f9a29c
2019-04-11 16:11:37 -07:00
Brad Ebinger
ba05893e37
Merge "Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f am: c91d33798b" into qt-dev
2019-04-11 22:54:28 +00:00
Robin Lee
787706806b
Merge "Change the owners of vpn2 settings again" into qt-dev am: de827cb353
...
am: 5e20a543f8
Change-Id: I491970204a6ad38051884a2ca429f3c2eab788f3
2019-04-11 15:53:01 -07:00
Jordan Liu
710c5bcc27
Merge "Revert "Do not reuse phonestatelistener"" into qt-dev-plus-aosp
...
am: d02e198fde
Change-Id: I4a20ff324aadcc3270f93c743b616b9d59365bde
2019-04-11 15:48:47 -07:00
Fabian Kozynski
3f5718a002
Merge "Added activity with correct filter for DataSaver" into qt-dev
...
am: 8f2f09f5d6
Change-Id: I1bf364ac8db4a5ffc3148bec1b7a16f4c019f84d
2019-04-11 15:43:54 -07:00
TreeHugger Robot
8f2f09f5d6
Merge "Added activity with correct filter for DataSaver" into qt-dev
2019-04-11 22:20:13 +00:00
Robin Lee
5e20a543f8
Merge "Change the owners of vpn2 settings again" into qt-dev
...
am: de827cb353
Change-Id: I1d52a9100570718b14decb68a742d3933b3e85b7
2019-04-11 15:20:00 -07:00
Evan Laird
3d89792f08
Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev am: 4f988c8b29
...
am: fec0ebdde8
Change-Id: I51fdb7d95082d1b90692b24a20f320abfe4bdf8d
2019-04-11 15:01:59 -07:00
Jordan Liu
d02e198fde
Merge "Revert "Do not reuse phonestatelistener"" into qt-dev-plus-aosp
2019-04-11 21:56:31 +00:00
Jordan Liu
4cb626c12e
Revert "Do not reuse phonestatelistener"
...
This reverts commit 728e186441 .
Reason for revert: bad merge (unremoved === right at top of file)
Change-Id: I9c22804fa6f971cbb9685aac5ae3f6527e198ea7
2019-04-11 21:53:38 +00:00