Commit Graph

60307 Commits

Author SHA1 Message Date
Automerger Merge Worker
a87391d147 Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e
Change-Id: I191139d52e10eff9fb0151f1c5c5dde8e6735beb
2020-03-09 04:04:31 +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
0e05847f2b Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10
Change-Id: Ia4f3155fd2820da536e1f9822ca181ab625d36d7
2020-03-09 03:45:29 +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
5e19adc7f9 Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b am: d6aa406045
Change-Id: I3b9f8ee94452b43623437e2e88856cfba10c2831
2020-03-09 02:38:12 +00:00
Automerger Merge Worker
90b95b0c38 Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 3bc7a52a36 am: 6a121c73c7
Change-Id: Ibba21f2252885acebec44164081d227f7b70d42e
2020-03-09 02:36:49 +00:00
Automerger Merge Worker
d6aa406045 Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b
Change-Id: I982afbcb983942f1d0d02d2be08d29389c2bddec
2020-03-09 02:21:37 +00:00
Automerger Merge Worker
e7e0c7a17b Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b
Change-Id: I0c78605f8d96dd8d3ee05c3c48ae451c037a0ba2
2020-03-09 02:21:24 +00:00
Automerger Merge Worker
6a121c73c7 Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 3bc7a52a36
Change-Id: Icdb9198be6abf0c1e4625438438e23a062085c9b
2020-03-09 02:21:06 +00: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
Automerger Merge Worker
3bc7a52a36 Merge "Update failed test case" into rvc-dev am: 9e5142b14d
Change-Id: Ia0a7848915d207d69b051cfee0ef1547ae98a0f6
2020-03-09 02:10:34 +00:00
tim peng
9e5142b14d Merge "Update failed test case" into rvc-dev 2020-03-09 01:53:35 +00:00
Automerger Merge Worker
3036bdf7d1 [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 66e7c85589 -s ours am: 7cafa9db06 -s ours
am skip reason: subject contains skip directive

Change-Id: I9ce20f1ad6f16022bddd897d8432c0a35525a301
2020-03-08 23:02:56 +00:00
Automerger Merge Worker
7cafa9db06 [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 66e7c85589 -s ours
am skip reason: subject contains skip directive

Change-Id: I07f2ca595573f52eed6d6b3a43fb7846f87c80b1
2020-03-08 22:49:00 +00:00
Automerger Merge Worker
5d3efb26a3 [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 0204e72806 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic11f89b8f6169d463cfecde60ccdffaf6d60bfab
2020-03-08 20:48:26 +00:00
Automerger Merge Worker
f5fd755190 [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 824aec4faf -s ours am: 2f97987e14 -s ours
am skip reason: subject contains skip directive

Change-Id: I93ee7fc54d593c31680e3fb689dc1c4050593cd1
2020-03-08 20:48:12 +00:00
Automerger Merge Worker
0204e72806 [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie719fca620201d22714e469d66a4a3a661ceec65
2020-03-08 20:38:03 +00:00
Automerger Merge Worker
66e7c85589 [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours
am skip reason: subject contains skip directive

Change-Id: I67bf8139e48a1b5ba0e606024e616568fc0a9627
2020-03-08 20:38:02 +00:00
Automerger Merge Worker
2f97987e14 [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 824aec4faf -s ours
am skip reason: subject contains skip directive

Change-Id: I34869c5020fc83627fd3fc48bf2f89ac0166b2db
2020-03-08 20:37:54 +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
Automerger Merge Worker
824aec4faf [automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours
am skip reason: subject contains skip directive

Change-Id: I4f446401a416b8720e06c08882649f719b4dd215
2020-03-08 20:22:16 +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
abbead8a71 [automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours am: c799d3bc49 -s ours am: aeeb6405a1 -s ours
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1 is in history

Change-Id: Id999d490234eac52fac2670f88a2b1857d0a71cd
2020-03-08 05:52:53 +00:00
Automerger Merge Worker
aeeb6405a1 [automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours am: c799d3bc49 -s ours
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1 is in history

Change-Id: Ie0e9f3ee5f73f7db555a50a3cec2b9c6fcdbed70
2020-03-08 05:39:10 +00:00
Automerger Merge Worker
c799d3bc49 [automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1 is in history

Change-Id: I8352d1b47e9d8bb71442d0f62bdf3717794d1089
2020-03-08 05:26:30 +00:00
Automerger Merge Worker
1ec7c14b3b Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e
Change-Id: Ia3bdc608b679922f93398ba3c11a9f393374548a
2020-03-08 05:10:45 +00:00
Treehugger Robot
a49021a71e Merge "PreferredNetworkModePreferenceController's summary no 5G item" 2020-03-08 04:52:56 +00:00
Automerger Merge Worker
4bfb3bd6a0 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6 am: 4b0e1b3440 am: c984dca0eb
Change-Id: Id5645d69dcc736fa2da38201fe60f0390f65efa3
2020-03-07 19:37:23 +00:00
Automerger Merge Worker
c984dca0eb Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6 am: 4b0e1b3440
Change-Id: I95b2d415975ea7b5b2955d6179faab021dd9f98d
2020-03-07 19:22:56 +00:00
Automerger Merge Worker
48cf7ebb43 Merge "Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6" into rvc-d1-dev-plus-aosp am: 7f72b3d0b6
Change-Id: If76765582d04979d6b1a4b56aa071d2f54000c00
2020-03-07 18:08:32 +00:00
Automerger Merge Worker
dcbe174ab5 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361 am: 241f426e36
Change-Id: I4404bdebcba053c57122ae9931d7717a9e8904fc
2020-03-07 18:08:25 +00:00
Automerger Merge Worker
7f72b3d0b6 Merge "Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6" into rvc-d1-dev-plus-aosp 2020-03-07 17:58:12 +00:00
Automerger Merge Worker
241f426e36 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361
Change-Id: I1d748b7ebdfd430023fa5ed47d0867f8dd7a1504
2020-03-07 17:58:06 +00:00
Automerger Merge Worker
903c040612 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6
Change-Id: Iffbe972133a1980f7c524e6b4f2eaf3dd2cd2d47
2020-03-07 17:58:04 +00:00
Automerger Merge Worker
4b0e1b3440 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6
Change-Id: I414aed330d2783a5781c039c1a2e9a06cf302730
2020-03-07 17:58:03 +00: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
Automerger Merge Worker
ff11b08361 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779
Change-Id: Idfdbf2f0c4684d5fa7934937a39be401a139362a
2020-03-07 17:37:49 +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
df15f18379 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e am: 9796155099 am: ed39063010
Change-Id: If3601e7044c0e64c5fd50e94938c62915f218747
2020-03-07 14:34:53 +00:00
Automerger Merge Worker
ed39063010 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e am: 9796155099
Change-Id: I3ca51f1ac477ab329cd076713997a3896ac46022
2020-03-07 14:21:32 +00:00
Automerger Merge Worker
1d975fa486 Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e" into rvc-d1-dev-plus-aosp am: 3e841653dc
Change-Id: I3a167c01c60b10a258225f53364d3efa65123c72
2020-03-07 13:03:57 +00:00
Automerger Merge Worker
4e12e932c6 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 384841ce59 am: 020ea67ea3
Change-Id: I2d856b616859c7eefd452f1a413e188e1d569dc7
2020-03-07 13:03:49 +00:00
Automerger Merge Worker
3e841653dc Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e" into rvc-d1-dev-plus-aosp 2020-03-07 12:50:01 +00:00
Automerger Merge Worker
e54fb4abe2 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e
Change-Id: Ic7dd524dbf984dba759f0ad0216db0f554c5b57a
2020-03-07 12:49:58 +00:00
Automerger Merge Worker
020ea67ea3 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 384841ce59
Change-Id: Iffdefa0e68f937226353dd4f2536b660acf363bc
2020-03-07 12:49:57 +00:00
Automerger Merge Worker
9796155099 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e
Change-Id: Iee76df2a320246cf05ff40a841d5ffbe38cfb11e
2020-03-07 12:49:56 +00:00
Automerger Merge Worker
384841ce59 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576
Change-Id: Ib7321fd67b98731a9c822d2143316d60017bdd2e
2020-03-07 12:39:54 +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