Bill Yi
f043fdf12e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: db7f321526 -s ours
...
am: e8a33f25ff
2019-04-11 23:30:56 -07:00
Bill Yi
e8a33f25ff
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: db7f321526
2019-04-11 23:26:52 -07:00
TreeHugger Robot
db7f321526
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-12 06:11:17 +00:00
Bill Yi
010a39219b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3f2592d8b31abc79f4bf4edc54f05ff24edede32
2019-04-11 20:47:23 -07:00
Jordan Liu
7d1f5e5d8e
[automerger skipped] Merge "fix merge [DO NOT MERGE]" into qt-dev-plus-aosp
...
am: 26b7c81411
2019-04-11 20:28:27 -07:00
Arc Wang
3ef032d2a4
Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev am: ff0db2f26b
...
am: 1785625089
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
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
Pasty Chang
8b6dc2057d
Merge "Increasing char limited of skip dialog title to 48" into qt-dev am: 326da4b510
...
am: 986bede1f1
2019-04-11 20:04:51 -07:00
Arc Wang
1785625089
Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev
...
am: ff0db2f26b
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
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
Pasty Chang
986bede1f1
Merge "Increasing char limited of skip dialog title to 48" into qt-dev
...
am: 326da4b510
2019-04-11 18:27:48 -07:00
Pasty Chang
326da4b510
Merge "Increasing char limited of skip dialog title to 48" into qt-dev
2019-04-12 01:13:24 +00:00
Jordan Liu
e677810e7d
Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp
...
am: 79a2693dfe
2019-04-11 17:50:35 -07:00
Nate Jiang
47b9292fde
Merge "[CLEANUP] Clean up unused permissions from Settings"
2019-04-12 00:35:57 +00:00
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
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
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
