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
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
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
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
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
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
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
3df7431c8e
Merge "Add background flag to CI system update intent" into qt-dev
...
am: 3ef0e5fc4f
Change-Id: I124b394824aecf879f4a9a2c45276c97bffe7902
2019-04-10 23:25:35 -07:00
Ugo Yu
6548b8ea96
Merge "Align with Bluetooth metadata API changes" into qt-dev
...
am: d13938b1f2
Change-Id: Ie1186542f19398d182dd4a83d927911b54a2511f
2019-04-10 22:58:28 -07:00
Naina Nalluri
3ef0e5fc4f
Merge "Add background flag to CI system update intent" into qt-dev
2019-04-11 04:42:28 +00:00
Raj Mojumder
84f10ae98b
Merge "Update OWNERS for nfc folder." into qt-dev
...
am: af9ef0ef06
Change-Id: I1b29f2f4e12d79d1a2cf3ae2e6d5e31141d571cc
2019-04-10 20:49:32 -07:00
Cn Chen
2c1fef68a8
Merge "Enable/disable fingerprint for SUW suggestion activity" into qt-dev
...
am: 7778904e2e
Change-Id: If9e53ec503e2a0330d7c33e9774e4fbff4e6baab
2019-04-10 20:48:22 -07:00
TreeHugger Robot
d13938b1f2
Merge "Align with Bluetooth metadata API changes" into qt-dev
2019-04-11 03:37:58 +00:00
Jack Yu
9765dc4422
Merge "Fixed display name not saved after carrier changed" into qt-dev
...
am: b346760045
Change-Id: I9dd3868c7eeed68e7361eb1512af867c2d55c635
2019-04-10 20:21:43 -07:00
Raff Tsai
c82c5ebfe6
Merge "Remove old format contextual card log" into qt-dev
...
am: cc0cec4636
Change-Id: I8772494e7ff6e064f8be30a3ac1a3e15936a8e75
2019-04-10 20:20:20 -07:00
Salvador Martinez
1405d44643
Merge "Update BS warning to follow through on action" into qt-dev
...
am: a42fe30fc7
Change-Id: I4f558b5f2b21b7862698809922ec9b21911be13f
2019-04-10 19:26:01 -07:00
Julia Reynolds
ed234f41e1
Merge "Changes for renamed API" into qt-dev
...
am: b027acfc6b
Change-Id: I4bbb331c48f6a17605cdb19becca217df221e343
2019-04-10 18:54:03 -07:00
TreeHugger Robot
af9ef0ef06
Merge "Update OWNERS for nfc folder." into qt-dev
2019-04-11 01:48:30 +00:00
Sean Stout
40f70ac3af
Merge "Add android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev
...
am: 560b8b8a44
Change-Id: I72eec1158bd339f39c756a41aa00179aae95efbf
2019-04-10 18:40:19 -07:00
Cn Chen
7778904e2e
Merge "Enable/disable fingerprint for SUW suggestion activity" into qt-dev
2019-04-11 01:32:43 +00:00
Brad Ebinger
6acceb3cd1
Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
...
am: c91d33798b
Bug: 117193148
Test: manual CP
Merged-In: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
Change-Id: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
(cherry picked from commit ac4a495fc2 )
2019-04-11 00:37:37 +00:00
Brad Ebinger
ac4a495fc2
Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
...
am: c91d33798b
Change-Id: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
2019-04-10 17:33:20 -07:00
TreeHugger Robot
b346760045
Merge "Fixed display name not saved after carrier changed" into qt-dev
2019-04-11 00:02:41 +00:00
Fabian Kozynski
be2c2128ee
Merge "Creates user_switcher_enabled setting to match setting" into qt-dev
...
am: 9eef4964a4
Change-Id: I313114405e3e00e99c48224e680db3b026b23104
2019-04-10 16:51:25 -07:00