PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,803 Commits 1 Branch 0 Tags
ec2dfee42f455b032f0f8e17c61d75ee43e2aad9
Commit Graph

59803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
4105c9c576 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev 2020-03-07 12:27:45 +00:00
Automerger Merge Worker
f5d19cb558 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 
Change-Id: Id993d700a2132ef837f302c30942a9b41fd1e9c0
 2020-03-06 22:49:31 +00:00
Automerger Merge Worker
7c04e2f1ae Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: b7f10b9012 
Change-Id: Id63c7dc935e2cb68783c6052608597333ca15c7b
 2020-03-06 22:46:55 +00:00
Automerger Merge Worker
b7f10b9012 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 
Change-Id: If7503971a68c00057e6256ae32f032edc8b61a2d
 2020-03-06 22:45:48 +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
30ad1ae018 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 
Change-Id: I3683bfb691c40afcb6c3482106c5bb083dc9f04a
 2020-03-06 22:02:40 +00:00
Automerger Merge Worker
3806ccd234 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: e47d1cae4f 
Change-Id: I82b013c9f85a17826692cf1ebeb4988bc3b903f6
 2020-03-06 22:02:33 +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
Automerger Merge Worker
e47d1cae4f Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 
Change-Id: If8394b1d01bd07daeb6d53988a0844467b5fb336
 2020-03-06 21:46:58 +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
83585126ce Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: 045a1c53b0 
Change-Id: Ia9f32c919e7bdf5f9e033d1d217135f9b70e7d6a
 2020-03-06 20:52:03 +00:00
Automerger Merge Worker
caa1efc234 Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8 
Change-Id: Ib9cb1bd80156aa0e06888849c0f382d9b795b637
 2020-03-06 20:51:50 +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
Automerger Merge Worker
045a1c53b0 Merge "Log errors on history load" into rvc-dev am: d27d2b375e 
Change-Id: I6d67f30948567491a777c505b18084e383d4fa4b
 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
c397839b8b [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: b2d8e01b7a 
Change-Id: I2217e073d230f79a78320c89885d77708b1b6512
 2020-03-06 16:59:34 +00:00
Automerger Merge Worker
8bb9dcabc5 [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2 
Change-Id: If6e4e337c4c056740639fcede35bde246d8cecd9
 2020-03-06 16:59:22 +00:00
Automerger Merge Worker
4876ded481 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: b329c29a04 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929 is in history

Change-Id: Ie3d1102b5579ad64d47ed8d8498a54d12d568084
 2020-03-06 16:58:22 +00:00
Automerger Merge Worker
0d05c94eaa [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours am: deffa903e5 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929 is in history

Change-Id: Iaf6fab8fa5d955e0a19050159d592cb22d463cd0
 2020-03-06 16:58:11 +00:00