Mill Chen
99b9dcddef
Merge "Fix conditionals not show up in homepage" into qt-dev am: 72f0aa2a68
...
am: b5cdcffd6b
2019-04-11 17:24:58 -07:00
Brad Ebinger
ea03a85026
[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: 68937ee0acac4a495fc2
2019-04-11 17:16:17 -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
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: ba05893e37ac4a495fc2
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
Fabian Kozynski
aa64f4faa8
Merge "Added activity with correct filter for DataSaver" into qt-dev am: 8f2f09f5d6
...
am: 3f5718a002
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
2019-04-11 15:53:01 -07:00
Jordan Liu
710c5bcc27
Merge "Revert "Do not reuse phonestatelistener"" into qt-dev-plus-aosp
...
am: d02e198fde
2019-04-11 15:48:47 -07: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
Mill Chen
4d6c86ceb9
Merge "Update magnification icon in Accessibility" into qt-dev am: 4303e28377
...
am: a07b1638cc
2019-04-11 15:10:50 -07:00
Jordan Liu
c6b820de43
[automerger skipped] Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp
...
am: 898462bb579bc2a584f6
2019-04-11 15:09:01 -07:00
Evan Laird
3d89792f08
Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev am: 4f988c8b29
...
am: fec0ebdde8
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
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
Mill Chen
a07b1638cc
Merge "Update magnification icon in Accessibility" into qt-dev
...
am: 4303e28377
2019-04-11 14:15:54 -07:00
Jordan Liu
898462bb57
Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp
2019-04-11 20:48:23 +00:00
TreeHugger Robot
4303e28377
Merge "Update magnification icon in Accessibility" into qt-dev
2019-04-11 20:43:39 +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
5f2cbc5012
Merge "Add OWNERS file for settings/vpn2" into qt-dev am: fd3cf32ad8
...
am: e7cf4fce8b
2019-04-11 08:19:07 -07: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
Sunny Shao
305d52570d
Merge "Update some wordings under the Display page" into qt-dev am: 86b6be0784
...
am: 9bd453b5d4
2019-04-11 04:27:54 -07:00
Naina Nalluri
e978a69ee8
Merge "Add background flag to CI system update intent" into qt-dev am: 3ef0e5fc4f
...
am: 3df7431c8e
2019-04-11 03:33:00 -07:00
Ugo Yu
be24194046
Merge "Align with Bluetooth metadata API changes" into qt-dev am: d13938b1f2
...
am: 6548b8ea96
2019-04-11 03:09:18 -07:00
lindatseng
4842af57e8
Merge "Have dialogCornerRadius same as theme for panel" into qt-dev am: d8f9412263
...
am: 2a22033092
2019-04-11 03:08:02 -07:00
Raj Mojumder
063f8c14da
Merge "Update OWNERS for nfc folder." into qt-dev am: af9ef0ef06
...
am: 84f10ae98b
2019-04-11 00:59:38 -07:00
Cn Chen
931560debd
Merge "Enable/disable fingerprint for SUW suggestion activity" into qt-dev am: 7778904e2e
...
am: 2c1fef68a8
2019-04-11 00:52:12 -07:00
Pasty Chang
f534b617b2
Increasing char limited of skip dialog title to 48
...
Test: atest
Bug: 130272235
Bug: 130272154
Bug: 130271754
Change-Id: I200eca37e3bcb10969cc82f77a7a485f9f33cbb3
2019-04-11 07:50:43 +00:00
Mill Chen
c04510c564
Merge "Set IA background not transparent" into qt-dev am: cab405d84d
...
am: d059b0ad2d
2019-04-11 00:50:28 -07:00
Sunny Shao
9bd453b5d4
Merge "Update some wordings under the Display page" into qt-dev
...
am: 86b6be0784
2019-04-11 00:33:50 -07:00
Jack Yu
103e5881d2
Merge "Fixed display name not saved after carrier changed" into qt-dev am: b346760045
...
am: 9765dc4422
2019-04-11 00:26:27 -07:00
Raff Tsai
c52f3117f3
Merge "Remove old format contextual card log" into qt-dev am: cc0cec4636
...
am: c82c5ebfe6
2019-04-11 00:25:30 -07:00
Salvador Martinez
48a7fddf0e
Merge "Update BS warning to follow through on action" into qt-dev am: a42fe30fc7
...
am: 1405d44643
2019-04-10 23:32:13 -07: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
Julia Reynolds
51afd8c9a5
Merge "Changes for renamed API" into qt-dev am: b027acfc6b
...
am: ed234f41e1
2019-04-10 23:19:43 -07:00
Sean Stout
3b78aaabb3
Merge "Add android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev am: 560b8b8a44
...
am: 40f70ac3af
2019-04-10 23:06:51 -07:00
