Automerger Merge Worker
888ebb0dbb
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
...
Change-Id: I2e0c16d8c8e0d593737f52afa97b65a9d474c1d1
2020-03-09 08:20:23 +00:00
Menghan Li
42dcad9b2b
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev
2020-03-09 08:01:56 +00:00
Automerger Merge Worker
0ebbf934af
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
...
Change-Id: Ie8fdaae839e1eb0df5907f04738de2e49882906d
2020-03-09 05:29:36 +00:00
TreeHugger Robot
5a4257deb4
Merge "[Wi-Fi] Remove redundant code" into rvc-dev
2020-03-09 05:15:25 +00:00
Automerger Merge Worker
8d7579e6b1
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
...
Change-Id: Idbaf87b5e50930bd2a7aa2af3ec6b87e32b31e16
2020-03-09 04:13:26 +00:00
TreeHugger Robot
bde2d44bb1
Merge "Refresh summary when update state of preference" into rvc-dev
2020-03-09 04:01:11 +00:00
Automerger Merge Worker
be6aa4d56e
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10
...
Change-Id: I0ce507c307abd057788a6af0f21f9fd22f59aad5
2020-03-09 03:45:25 +00:00
TreeHugger Robot
7d6011be10
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev
2020-03-09 03:29:30 +00:00
Arc Wang
ced9c346a5
[Wi-Fi] Remove redundant code
...
Should not setSummary in ConnectedWifiEntryPreference because
WifiEntryPreference updates summary by WifiEntry#getSummary
Bug: 150911380
Test: manual
See captive portal Wi-Fi summary 'Sign in to network'
before logging in.
Change-Id: Ibc47623d66b9d2844c0ca827081f205f0bab89e7
2020-03-09 10:47:58 +08:00
Automerger Merge Worker
423133c22b
Merge "Update failed test case" into rvc-dev am: 9e5142b14d
...
Change-Id: Ibe535a64b8f369575ea1dbeafb04b31017599642
2020-03-09 02:11:10 +00:00
tim peng
9e5142b14d
Merge "Update failed test case" into rvc-dev
2020-03-09 01:53:35 +00:00
Automerger Merge Worker
75b92d9a07
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib2bf0fa6dcc48cc989c8deda90f8ac012e648a41
2020-03-08 20:22:26 +00:00
Bill Yi
9ce0e0ca55
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I7966ad0beaa4bde063f8fc3ec17ce152b9acb3ac
2020-03-07 22:06:24 -08:00
Automerger Merge Worker
000cbb47b6
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779
...
Change-Id: Ie1031fb0582a7a2955a7fcaf4eef28d2ddc0c62d
2020-03-07 17:37:50 +00:00
TreeHugger Robot
29063e3779
Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev
2020-03-07 17:16:05 +00:00
Automerger Merge Worker
0c08f5d44e
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576
...
Change-Id: Ic06643022dc0bb3cbcab00645a6e7bb7669d240b
2020-03-07 12:39:50 +00:00
TreeHugger Robot
4105c9c576
Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev
2020-03-07 12:27:45 +00:00
Automerger Merge Worker
139caf98f3
Merge "Update enrollment with API update" into rvc-dev am: be753c3543
...
Change-Id: I1c4c6ba23c4bac4ef3d88aa0e76d155b515de012
2020-03-06 22:45:14 +00:00
Kevin Chyn
be753c3543
Merge "Update enrollment with API update" into rvc-dev
2020-03-06 22:43:57 +00:00
Automerger Merge Worker
0e03dfddd7
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516
...
Change-Id: I445496aac0d27a95e64a2c46c1b6ca965e96888a
2020-03-06 21:47:32 +00:00
Quang Luong
858cf42516
Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev
2020-03-06 21:36:30 +00:00
Brad Ebinger
60204898ec
Fixes ContactDiscoveryDialogFragmentTest
...
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Fixes: 150908269
Change-Id: I06df2928116b33fec39aade733401d60e6cde1c1
2020-03-06 20:54:00 +00:00
Automerger Merge Worker
f77db13ff8
Merge "Log errors on history load" into rvc-dev am: d27d2b375e
...
Change-Id: I760be35c988a41b54c1ad2fd5444f46389b3dedc
2020-03-06 20:35:26 +00:00
Julia Reynolds
d27d2b375e
Merge "Log errors on history load" into rvc-dev
2020-03-06 20:23:02 +00:00
Automerger Merge Worker
51692e38d2
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb
-s ours am: eae534cda7
...
Change-Id: I147730c1dcf6bc77335f6b4c9b8dcc5e96d91c20
2020-03-06 16:32:16 +00:00
Automerger Merge Worker
deffa903e5
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279
am: 86ce68877f
-s ours am: 9a4bdcaca6
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929
is in history
Change-Id: I55b2916a093a997c07c736fb24b621b8f46e8041
2020-03-06 16:31:55 +00:00
Automerger Merge Worker
eae534cda7
[automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id498eb2c8fe327e3639328d488db5900174240ec
2020-03-06 16:18:58 +00:00
Automerger Merge Worker
9a4bdcaca6
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279
am: 86ce68877f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ac28217bd616bc49859f09a9eab0a20e1d5d285
2020-03-06 16:17:35 +00:00
Julia Reynolds
78b1848509
Log errors on history load
...
Test: manual
Bug: 150336474
Change-Id: I10e0e5ab9d51d88b67678be0f7040c360dcbcbe4
2020-03-06 10:05:30 -05:00
Automerger Merge Worker
14d7c1e369
Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f
...
Change-Id: Iaa48708579e6c223295134b38037e4ed53a99426
2020-03-06 14:41:35 +00:00
Anna Trostanetski
f1fe93bc2f
Merge "Fix PlatformCompatDashboardTest." into rvc-dev
2020-03-06 14:38:29 +00:00
Automerger Merge Worker
83fb76a7fd
Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5
...
Change-Id: I02c0925b503b7adb1d68c553eccb8c1f07a4d5e5
2020-03-06 14:17:42 +00:00
tim peng
c241e434d5
Merge "Add string for output switcher transferring state" into rvc-dev
2020-03-06 14:08:28 +00:00
Arc Wang
f5e9927668
[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon
...
click the gear icon will always switch to Wi-Fi detail screen.
Bug: 150911380
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedWifiEntryPreferenceTest
Change-Id: I640d180ae5684ffaa9b2adec7b1be401b2bfd89d
2020-03-06 19:27:08 +08:00
menghanli
5d7083a103
ShortcutPreference Toggle design (2/n)
...
- Removes edit shortcut disable condition.
- Shows "off" if user removes all items in edit dialog.
- Restores last time what user chosen options when show edit dialog.
Bug: 148989269
Test: Manually test
Change-Id: I105abda782999d38c92e3de9811e2fd378869e73
2020-03-06 18:02:53 +08:00
Automerger Merge Worker
9505f30f26
Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0
...
Change-Id: Ifc4ca755dbbfec5a78ee5edd79a56be1b9424eab
2020-03-06 09:44:32 +00:00
TreeHugger Robot
2093ad6ac0
Merge "Ignore some failed tests." into rvc-dev
2020-03-06 09:23:35 +00:00
Automerger Merge Worker
8be83502be
Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506
...
Change-Id: Ia3e859432dada22a9bcdeb90eb7140b537b67434
2020-03-06 08:57:34 +00:00
Automerger Merge Worker
7e89b41219
Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17
...
Change-Id: I95978fe3e4f797fa94ddd51701e92b8f4cd6142f
2020-03-06 08:57:23 +00:00
TreeHugger Robot
90d5d45506
Merge "Ignore failed test cases" into rvc-dev
2020-03-06 08:48:25 +00:00
Lee Chou
f3ce231d17
Merge "Require authorization before turning off eSIM security feature" into rvc-dev
2020-03-06 08:45:09 +00:00
Automerger Merge Worker
696d25adf0
Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb
...
Change-Id: Ib3566a792f6d8671e4b4e84f64ed67f4c27eed86
2020-03-06 08:23:30 +00:00
Menghan Li
b6ab224ddb
Merge "Update edit shortcut dialog measurements and assets." into rvc-dev
2020-03-06 08:01:59 +00:00
Yi-Ling Chuang
db4fd2b1c3
Ignore some failed tests.
...
These test failures may relate to change of PowerManager. Ignore them
first and will have people working on the fix.
Bug: 150914017
Test: robotests
Change-Id: Id4d3bb9945a993517964376b5d52e31dd293e634
2020-03-06 15:20:09 +08:00
Automerger Merge Worker
32080a92e8
Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54
...
Change-Id: I6923626d227d0c4c82989949f7f1bffeb165c00d
2020-03-06 07:08:57 +00:00
tim peng
2d15cecf54
Merge "Add getSessionName() API for group name in worker" into rvc-dev
2020-03-06 06:56:30 +00:00
Tim Peng
37e8a34a40
Update failed test case
...
Bug: 150909916
Test: make RunSettingsRoboTests -j42
Change-Id: I541eea02cfa553f44e6da09c993e58ef5efb1471
2020-03-06 14:53:16 +08:00
hughchen
fbea0dc06d
Ignore failed test cases
...
Bug: 150909916
Test: make RunSettingsRoboTests -j42
Change-Id: Ice6c8e635a0a39c0cf86ad60e0175222cf32cf4b
2020-03-06 14:52:22 +08:00
Automerger Merge Worker
0e4b3e2d03
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c
...
Change-Id: Iaa9b5708c70120bd64c1df79af82bb08bd45be2f
2020-03-06 06:44:44 +00:00
TreeHugger Robot
a6760b347c
Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev
2020-03-06 06:27:29 +00:00