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
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
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
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
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
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
2019-04-10 23:25:35 -07:00
Ugo Yu
6548b8ea96
Merge "Align with Bluetooth metadata API changes" into qt-dev
...
am: d13938b1f2
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
2019-04-10 20:49:32 -07:00
Cn Chen
2c1fef68a8
Merge "Enable/disable fingerprint for SUW suggestion activity" into qt-dev
...
am: 7778904e2e
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
2019-04-10 20:21:43 -07:00
Raff Tsai
c82c5ebfe6
Merge "Remove old format contextual card log" into qt-dev
...
am: cc0cec4636
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
2019-04-10 19:26:01 -07:00
Julia Reynolds
ed234f41e1
Merge "Changes for renamed API" into qt-dev
...
am: b027acfc6b
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
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: c91d33798bac4a495fc2
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
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
2019-04-10 16:51:25 -07:00
Pavel Grafov
dcf6cb6fe6
Merge "Allow user without a password to clear credentials" into qt-dev
...
am: 0c6ead9e61
2019-04-10 16:49:03 -07:00
Raff Tsai
cc0cec4636
Merge "Remove old format contextual card log" into qt-dev
2019-04-10 23:42:48 +00:00
Antony Sargent
a6b87a24f2
Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev
...
am: 3b7cdfb708
2019-04-10 16:19:15 -07:00
Brad Ebinger
c91d33798b
Merge "Fix issue that user can't edit WFC mode for SIM2"
...
am: d2727d5d9f
2019-04-10 16:17:17 -07:00
Salvador Martinez
a42fe30fc7
Merge "Update BS warning to follow through on action" into qt-dev
2019-04-10 22:46:10 +00:00
Raj Mojumder
70907f547f
Update OWNERS for nfc folder.
...
BUG: 65294119
Test: gerrit upload
Change-Id: I71e6e39c61862529198378228d793d3a6ba14139
Signed-off-by: Raj Mojumder <rmojumder@google.com >
Exempt-From-Owner-Approval: Invalid owners.
2019-04-10 22:30:00 +00:00
TreeHugger Robot
b027acfc6b
Merge "Changes for renamed API" into qt-dev
2019-04-10 22:22:25 +00:00
Naina Nalluri
dfbe891e39
Add background flag to CI system update intent
...
Add flag to allow KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING
intent. This is needed
as the receiver service is modified to use
latest target version SDK which introduces Background
broadcast limitations.
Bug: 78634470
Test: On Device, verified that the intents are
received by the service
Change-Id: I140c1988b241885a737413bd5f0b9c3cc63c4ea8
2019-04-10 22:12:10 +00:00
Sean Stout
560b8b8a44
Merge "Add android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev
2019-04-10 22:02:41 +00:00
Brad Ebinger
d2727d5d9f
Merge "Fix issue that user can't edit WFC mode for SIM2"
2019-04-10 21:57:56 +00:00
Julia Reynolds
af2195bd98
Merge "Use correct key value" into qt-dev
...
am: b2bf285911
2019-04-10 14:32:42 -07:00
Matthew Fritze
7b5b8e620b
Merge "Fix up Network and Internet Slice" into qt-dev
...
am: d79e9c498a
2019-04-10 14:27:50 -07:00
TreeHugger Robot
9eef4964a4
Merge "Creates user_switcher_enabled setting to match setting" into qt-dev
2019-04-10 20:46:22 +00:00
TreeHugger Robot
0c6ead9e61
Merge "Allow user without a password to clear credentials" into qt-dev
2019-04-10 20:36:22 +00:00
Fan Zhang
9be307720b
Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev
...
am: 6dd38b462f
2019-04-10 13:19:12 -07:00
