PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,330 Commits 1 Branch 0 Tags
ac48e7c606a279333d3137b17d387ddc6765a02e
Commit Graph

61330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
ac48e7c606 Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0 
Change-Id: Id9ee5713de1bb803ae74cf43e2bc2d7b3f3d8803
 2020-04-01 16:33:59 +00:00
Bonian Chen
5d88416ee0 Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 
Change-Id: I64e7a3b6c251626620a3b77cb91b68e6a1c26dd1
 2020-04-01 16:18:52 +00:00
Bonian Chen
0d3732a595 Merge "[Settings] Code Refactor" into rvc-dev 2020-04-01 16:07:47 +00:00
TreeHugger Robot
6243bd9fce Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: 6b7d3f8290 
Change-Id: I6699e559e4e587bacd1d46c477f494af88423109
 2020-04-01 10:14:42 +00:00
TreeHugger Robot
010f812a43 Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d 
Change-Id: I5823b17e494a83fb7df031b82217a9cd4ef3ea3c
 2020-04-01 10:14:14 +00:00
TreeHugger Robot
6b7d3f8290 Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 
Change-Id: Ic1243f986b4c236c14c0c840fe7069d9557c35bc
 2020-04-01 09:52:54 +00:00
TreeHugger Robot
da8eb18b3d Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 
Change-Id: I22b80f8c34280390e8f7797e50172967494dff1e
 2020-04-01 09:52:32 +00:00
TreeHugger Robot
93162ce9f4 Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev 2020-04-01 09:39:12 +00:00
Bonian Chen
f1f31c5cac Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: d9f98f935b 
Change-Id: I944102b069e7a983e4067f95505f4ef8c2be7043
 2020-04-01 07:29:46 +00:00
Bonian Chen
3f6f4e44e0 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: 98f1a405c6 
Change-Id: Ic20177035e6902b8d55c52baa039f540bdd574ac
 2020-04-01 07:29:24 +00:00
Arc Wang
26d3b7dd1b [Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test 
Sign in feature is integrated in WifiTraclerLib, change the test cases
to verify if WifiEntry sign in methods is called.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ia0157f5a96c700e5596c00cef873c8f5016d6442
 2020-04-01 15:25:37 +08:00
Bonian Chen
d9f98f935b Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 
Change-Id: I3687e0c1884ea802801c3eb00aafe933428cb817
 2020-04-01 07:17:07 +00:00
Bonian Chen
98f1a405c6 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 
Change-Id: I9bc040d577318ffdec9ff8bd0634e766d2774b8b
 2020-04-01 07:16:47 +00:00
Bonian Chen
cfbdcaf9f5 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev 2020-04-01 07:00:15 +00:00
TreeHugger Robot
f444344c5d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: 80036cffa9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I12e9cdb4c20c5e5b6519a14553af0397ed60d11c
 2020-04-01 05:44:28 +00:00
TreeHugger Robot
93d950aa04 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iea664fae56e6e1822567ec0c7564b9c1f826b2bc
 2020-04-01 05:44:10 +00:00
TreeHugger Robot
80036cffa9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours 
am skip reason: subject contains skip directive

Change-Id: I195e28633ce35791208174a7b3d61eb83dadbcdb
 2020-04-01 05:32:13 +00:00
TreeHugger Robot
d9a0046fd6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours 
am skip reason: subject contains skip directive

Change-Id: Id41bbf1c7274c0475b5ed29577a88c17559ca9fa
 2020-04-01 05:31:47 +00:00
TreeHugger Robot
58cadcc6ee Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-01 05:13:22 +00:00
Bonian Chen
bd03b17a62 [Settings] Avoid from crash when pull out SIM 
Avoid from crash through exception handling.

Bug: 148803073
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
 2020-04-01 12:05:38 +08:00
Automerger Merge Worker
0295e02499 Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e" into rvc-d1-dev-plus-aosp 2020-04-01 03:49:43 +00:00
Goven Liu
4b67490445 Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb 
Change-Id: I4409afa7c65bbf7d6d5ac051b8ebd7e258bedf91
 2020-04-01 03:49:40 +00:00
Goven Liu
d0bc27f31e Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e 
Change-Id: Id059dbb0a8fc61d225f2efff917cba62dd3822d3
 2020-04-01 03:49:40 +00:00
Goven Liu
336834b17e Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad 
Change-Id: I4d369739d3d83771f220cacb1846338056367969
 2020-04-01 03:36:29 +00:00
Goven Liu
15ff53ecfb Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad 
Change-Id: I681ff5a91c45eca3d6f80dc61aed8907d08842b5
 2020-04-01 03:36:05 +00:00
Goven Liu
783b0257ad Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev 2020-04-01 03:16:34 +00:00
Bill Yi
5f16525806 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ie47208d5573659f3bdcc57c8d9933a2245625669
 2020-03-31 20:12:42 -07:00
Bonian Chen
39ff4e4495 [Settings] Code Refactor 
1. Code refactor for android.telephony.ims.ImsManager.
2. Remove unused methods

Bug: 140542283
Test: build pass
Change-Id: I187789a8a553a2c073b3591807dfebfafba6bc14
 2020-04-01 10:58:27 +08:00
Sarah Chin
8f14309c6a [automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours 
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0 is in history

Change-Id: Iab8f4ddeb21032e44ee74cc18db2b5fd5e3d1cb5
 2020-03-31 23:40:46 +00:00
Sarah Chin
902793ffa7 [automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours 
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0 is in history

Change-Id: I1763402a852df8d830f211313e1b2549bf9f7a05
 2020-03-31 23:26:57 +00:00
Sarah Chin
c03048cd27 Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a 
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
 2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a Merge "Rename calls to isGlobalModeEnabled" 2020-03-31 23:02:20 +00:00
Brad Ebinger
41df03ff47 [automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours am: 2139c0b50a -s ours 
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec is in history

Change-Id: I5e2e7dc6a41689412ba090174d8312bf15ce828a
 2020-03-31 20:28:50 +00:00
Brad Ebinger
3d3a32d3dd [automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 -s ours am: 5ef4a92dd0 -s ours 
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a is in history

Change-Id: I5ba07f1336bd4d4c5c9af6af38df350752667f55
 2020-03-31 20:28:49 +00:00
TreeHugger Robot
0b06034144 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: 0d78f267d8 
Change-Id: I1be31e7940bb9ff43dcca3753a8cc4390371c797
 2020-03-31 20:28:02 +00:00
TreeHugger Robot
d4aa412835 Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: c823a3169b 
Change-Id: I830b29d7328a9d0e0a71e5a208d7c629596b2e60
 2020-03-31 20:23:04 +00:00
TreeHugger Robot
81df373d42 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 
Change-Id: I12caf300aeefc9a15a97fdbe79598f2bdc538f1c
 2020-03-31 20:22:03 +00:00
TreeHugger Robot
0035707d32 Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 
Change-Id: I9995b090e07d81a3e46be1e9d80e87ab3b098dba
 2020-03-31 20:20:53 +00:00
Brad Ebinger
2139c0b50a [automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours 
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec is in history

Change-Id: I6ec8cb78adfd5916249bf2364b3bee0c4780b4c8
 2020-03-31 20:20:40 +00:00
Brad Ebinger
5ef4a92dd0 [automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 -s ours 
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a is in history

Change-Id: I94265a2af1e69f1257c93fb05222c79037840156
 2020-03-31 20:20:38 +00:00
TreeHugger Robot
0d78f267d8 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 
Change-Id: Ic5a9b57f6a6809decaab8153c11842860b8d44da
 2020-03-31 20:11:05 +00:00
TreeHugger Robot
e9c4d17eb2 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 
Change-Id: I1f8a53b6543452481e62c309a1140af3ef8e1899
 2020-03-31 20:10:56 +00:00
TreeHugger Robot
c823a3169b Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e 
Change-Id: I32217aa77a2291d6882500dc0484e52528a051d7
 2020-03-31 20:10:16 +00:00
TreeHugger Robot
6e9938cf48 Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e 
Change-Id: I5e6deeabc8dacb165ee20809a07af2e5b6db78d9
 2020-03-31 20:10:11 +00:00
Brad Ebinger
8bc35321d8 Merge changes I06df2928,I70821964 am: 24ddbf5e8c 
Change-Id: I3aeb0e140fcb3a6c28e1880a6784e7800c368f47
 2020-03-31 20:10:07 +00:00
Brad Ebinger
da1335a9f4 Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a 
Change-Id: If7f5ed1343a5b13810455bcf7168b8b095db149c
 2020-03-31 20:10:05 +00:00
TreeHugger Robot
947cb48303 Merge "Add dnd messages + calls senders image resource" into rvc-dev 2020-03-31 19:40:48 +00:00
Brad Ebinger
24ddbf5e8c Merge changes I06df2928,I70821964 
* changes:
  Fixes ContactDiscoveryDialogFragmentTest
  Add new DialogFragment and Controller for capability discovery opt-in
 2020-03-31 19:39:59 +00:00
TreeHugger Robot
04d64f470e Merge "Disable conversation strip setting." into rvc-dev 2020-03-31 19:21:51 +00:00
TreeHugger Robot
31e2de7c48 Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: 249a806fed 
Change-Id: Ie1685d04d11e986502b93cc9e61be43df1318c15
 2020-03-31 19:14:38 +00:00