Commit Graph

27005 Commits

Author SHA1 Message Date
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
Jordan Liu
e431f6337f 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: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I7630e74a9361093d8cbe72fa72c14aaaab9fcc17
2019-04-12 17:26:10 +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
cosmohsieh
6938ad1630 [PasspointV2] Clear feature flag settings_wifi_details_saved_screen
Clear feature flag settings_wifi_details_saved_screen

Bug: b/128369527
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ib8fc9c9eb52bee12d6501a2041c32aa60c80e70e
2019-04-13 00:58:23 +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
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
Colin Cross
e2abf3f5c6 Update Settings for guava 27.1
Futures.addCallback now requires an Executor argument.

Bug: 130306229
Test: m checkbuild
Change-Id: I1958918e26eff6c0966c7a6bcf3dec6029003162
2019-04-11 18:21:41 -07: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
TreeHugger Robot
de827cb353 Merge "Change the owners of vpn2 settings again" into qt-dev 2019-04-11 21:48:53 +00:00
Mill Chen
f23b3b84d3 Fix conditionals not show up in homepage
Settings will not refresh conditionals status if there is no condition
card in homepage when Settings homepage gets in/out of window focus.
Whether or not there are conditional cards in the homepage, Settings
should always refresh conditional cards.

Fixes: 129725565
Test: robotests, visual
Change-Id: I1ed309d3fd4f7a2ba911097ea6b049c2aff48c8a
2019-04-11 14:43:58 -07:00
Jordan Liu
898462bb57 Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp 2019-04-11 20:48:23 +00:00
Evan Laird
fec0ebdde8 Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev
am: 4f988c8b29

Change-Id: I0b4a8a2f3b691f6ec4ab484c008385fb0d4a8b3b
2019-04-11 13:32:50 -07:00
TreeHugger Robot
4f988c8b29 Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev 2019-04-11 19:54:32 +00:00
Maurice Lam
288f67da10 Set the theme in BiometricEnrollIntroduction
So the theme used will be consistent throughout the flow.

Test: Manual
Bug: 130277993
Change-Id: I496767dca858f7b69cfa061c026733567b5e7361
2019-04-11 18:08:24 +00:00
Fabian Kozynski
d9aadd7dd1 Added activity with correct filter for DataSaver
Test: manual
Fixes: 122676059
Change-Id: Ia8507a3b608d19b93b1fcf3a65b499601136bd8e
2019-04-11 12:25:09 -04:00
Robin Lee
fd60c585a5 Change the owners of vpn2 settings again
Test: N/A
Change-Id: I3fa4bc4101a5942bbd9c95d7b0a8456801ba75f7
Fix: 130346282
2019-04-11 17:28:28 +02:00
Robin Lee
5f2cbc5012 Merge "Add OWNERS file for settings/vpn2" into qt-dev am: fd3cf32ad8
am: e7cf4fce8b

Change-Id: Iabb311006691a4e03d865fc4ffcf939f775482a0
2019-04-11 08:19:07 -07:00
Robin Lee
e7cf4fce8b Merge "Add OWNERS file for settings/vpn2" into qt-dev
am: fd3cf32ad8

Change-Id: I8c2bdb76d4cf587579bba0544ba417dbfacbae5c
2019-04-11 08:11:26 -07:00
Robin Lee
fd3cf32ad8 Merge "Add OWNERS file for settings/vpn2" into qt-dev 2019-04-11 14:53:10 +00:00
Robin Lee
7463700fb4 Add OWNERS file for settings/vpn2
Adds more people who can approve changes to the VPN Settings UI.

Test: repo upload .
Fix: 130346282
Change-Id: I8bb8a7559b5967189476406a00467c6b8bcdc52e
2019-04-11 14:52:37 +00:00
Evan Laird
3e98ff34d0 Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView
ThemedBatteryDrawable will no longer need it due to drawing more
betterer

Test: battery should look the same
Bug: 129014647
Change-Id: I6706cec2b3c3bfbdc0e0456c58191bc7152783e7
2019-04-11 10:52:14 -04:00
Naina Nalluri
e978a69ee8 Merge "Add background flag to CI system update intent" into qt-dev am: 3ef0e5fc4f
am: 3df7431c8e

Change-Id: I7e2165fb95ffbdd8291b0e5c82cd4d1715187269
2019-04-11 03:33:00 -07:00