PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,173 Commits 1 Branch 0 Tags
f3e20a2bc826b7ff6ffbbbcf3f29f84e9b7c6b0e
Commit Graph

60173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
f3e20a2bc8 Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 0ebbf934af am: 815f3498b8 
Change-Id: Ifabb4115e3b38e13e0d436dda5975e846f4cc443
 2020-03-09 05:45:38 +00:00
Automerger Merge Worker
815f3498b8 Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 0ebbf934af 
Change-Id: I4c6bb18524bf97a065b4733ff50e5d3084ee6edd
 2020-03-09 05:39:15 +00:00
Automerger Merge Worker
42a2ca5927 Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e am: 185c089e2a am: 1be993ac10 
Change-Id: I5f3697bbae6370783098781f45919ddb21bea39b
 2020-03-09 05:29:49 +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
Automerger Merge Worker
1be993ac10 Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e am: 185c089e2a 
Change-Id: I7c3a8be790499259eb56b7c6fc13850d6a1b5963
 2020-03-09 05:19:08 +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
701d779019 Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b am: e7e0c7a17b am: 80ef08bac2 
Change-Id: I3cddf77f07ebdb953e7adc320307d205742390b2
 2020-03-09 05:05:25 +00:00
Automerger Merge Worker
80ef08bac2 Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b am: e7e0c7a17b 
Change-Id: Ie603a22f987d8d933759f0740eb44ad3024a0d68
 2020-03-09 04:52:59 +00:00
Automerger Merge Worker
2d16a4b8a5 Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: d4970a9df1 am: a080d8a016 
Change-Id: I6f47e0b36a4d935794e8a6db8d68154928ba2127
 2020-03-09 04:36:13 +00:00
Automerger Merge Worker
e840eb9f3c Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: 8d7579e6b1 am: 221357cef9 
Change-Id: I5a888c0b21eb87ae891f8e78f19fdc4bf3f8c839
 2020-03-09 04:36:07 +00:00
Automerger Merge Worker
a080d8a016 Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: d4970a9df1 
Change-Id: Ia59c42089646102ad763d6d952434d1efa25a89f
 2020-03-09 04:28:48 +00:00
Automerger Merge Worker
221357cef9 Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: 8d7579e6b1 
Change-Id: I2b94c6c407738096d1d3657c9012abbe5135d833
 2020-03-09 04:28:32 +00:00
Automerger Merge Worker
d4970a9df1 Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 
Change-Id: I035e835ec5565100464fe1b14108b49cedca7546
 2020-03-09 04:13:27 +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
Automerger Merge Worker
347181da79 Merge "Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e" into rvc-d1-dev-plus-aosp am: fed106ea1e 
Change-Id: Ib4bc6ea905c7d6b3e45e1d26f6f6a9cc9089be12
 2020-03-09 04:13:22 +00:00
Automerger Merge Worker
49d43c3cd0 Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: 0e05847f2b am: c2395edf5e 
Change-Id: I69c439d6ddec07d3da9f69397516af708f98e740
 2020-03-09 04:13:08 +00:00
Automerger Merge Worker
fed106ea1e Merge "Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e" into rvc-d1-dev-plus-aosp 2020-03-09 04:04:38 +00:00
Automerger Merge Worker
c2395edf5e Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: 0e05847f2b 
Change-Id: Ibbc6c35ba70781c42a5f339690bb82d322232b2f
 2020-03-09 04:04:32 +00:00
Automerger Merge Worker
185c089e2a Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e 
Change-Id: Id9a1d53f8fc7002ef8ceffae6c9c1702edb4e8cc
 2020-03-09 04:04:31 +00:00
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