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

61072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e124d8caa3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours am: 99d4f7fb02 -s ours 
am skip reason: subject contains skip directive

Change-Id: Icce74295aba2d2fa30c978c8b9df11c42b73ef64
 2020-04-01 05:57:15 +00:00
TreeHugger Robot
99d4f7fb02 [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: Ib60a65ab9435d37fafbd92a6c4504202e8d4b066
 2020-04-01 05:44:37 +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
Goven Liu
05dd6664e2 Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: ea63069e93 
Change-Id: I7ba160b65ec57f33f0c30afc88e34e9f2a74f8d1
 2020-04-01 04:00:56 +00:00
Bill Yi
20e0cbec41 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3d6289030419addc1ccd223de40be5e1bc422df8
 2020-03-31 20:55:13 -07:00
Goven Liu
ea63069e93 Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb 
Change-Id: I9c8ede2f1ddf8e3f763caf0d68f2a7a586db20ab
 2020-04-01 03:49:28 +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
Malcolm Chen
0b2b2b50d7 Update string of showing conflict between 5G and DSDS. 
Bug: 152786064
Test: manual
Change-Id: I3ab8dc326caff5b7480c17b9a8004ed91a8b0578
 2020-03-31 17:19:16 -07:00
TreeHugger Robot
b7690b92fb Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 am: 6c2f6a3e0a 
Change-Id: Iad3e19db543800dcab83404022b7d3983347a44d
 2020-03-31 20:34:10 +00:00
TreeHugger Robot
85aca25d5d Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 52fec7a9bd 
Change-Id: Iae0665df16c34a2fb71c02033d4b2462cf66deac
 2020-03-31 20:33:00 +00:00
TreeHugger Robot
6c2f6a3e0a Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 
Change-Id: Iae17458890d0195b2396f86c4625dae1bd2cfd48
 2020-03-31 20:24:25 +00:00
TreeHugger Robot
52fec7a9bd Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 
Change-Id: I25b23e9af82055cbba5633ffbd889a3a993390c1
 2020-03-31 20:20:45 +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
6e9938cf48 Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e 
Change-Id: I5e6deeabc8dacb165ee20809a07af2e5b6db78d9
 2020-03-31 20:10:11 +00:00
TreeHugger Robot
947cb48303 Merge "Add dnd messages + calls senders image resource" into rvc-dev 2020-03-31 19:40:48 +00:00
TreeHugger Robot
04d64f470e Merge "Disable conversation strip setting." into rvc-dev 2020-03-31 19:21:51 +00:00
TreeHugger Robot
5d9c3f0052 Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: e15d04acf1 am: 7bf3fbd41c 
Change-Id: I37aea89ef7291e222a7cbf5a9675fc891648d03a
 2020-03-31 18:24:20 +00:00
TreeHugger Robot
55c90fc1c5 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665 am: 2ed94f615d 
Change-Id: Ibabf1df5ff23c98806d995208ffac976af530b84
 2020-03-31 18:23:35 +00:00
TreeHugger Robot
7bf3fbd41c Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: e15d04acf1 
Change-Id: I91d78b831d08f85f7aca518a27f2ca0fc30be5a1
 2020-03-31 18:08:08 +00:00
TreeHugger Robot
2ed94f615d Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665 
Change-Id: Ifc49b297f808d7fa9536cfa4c2384ed5973a3e74
 2020-03-31 18:07:56 +00:00
TreeHugger Robot
e15d04acf1 Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed 
Change-Id: I57ba9793ea32bdc45b27a6f9aaf8f503897ff79d
 2020-03-31 17:52:19 +00:00
TreeHugger Robot
c5507e6665 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 
Change-Id: I327bc67ecb46d92e506474f1b4c0064cf7f9b71c
 2020-03-31 17:52:08 +00:00
TreeHugger Robot
07a3b1c6ed Merge "Use DEFAULT_LIST contact intent" into rvc-dev 2020-03-31 17:38:13 +00:00
TreeHugger Robot
d0d3873aa7 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev 2020-03-31 17:31:16 +00:00
Beverly
5a4fb7986f Add dnd messages + calls senders image resource 
Add a visual representation of the call or message senders that can
bypass DND.

Test: manual
Bug: 151845457
Change-Id: Ie7d3598d5993e4c1cd62294ab9e17da47f2b6f76
 2020-03-31 13:29:35 -04:00
Steve Elliott
8a575029fc Disable conversation strip setting. 
Test: manual, robotests
Fixes: 149070144
Fixes: 149001624
Change-Id: I422872e38f7adead81938c39b6084bbc7ed911ae
 2020-03-31 13:24:46 -04:00
Bonian Chen
70a914d893 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 am: accc3b5225 
Change-Id: I62fd20ecb0e7eac890bf8619d47fedb0a4944f85
 2020-03-31 16:55:55 +00:00
Bonian Chen
bb13961b1e Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 am: 92514b98a2 
Change-Id: I20628e74cc9f97326201ebcb36ee9c0705ee65f4
 2020-03-31 16:55:54 +00:00
Bonian Chen
accc3b5225 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 
Change-Id: I00de70493614a84c4cca7c3bbeb633bc4a96b1c3
 2020-03-31 16:39:02 +00:00
Bonian Chen
92514b98a2 Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 
Change-Id: Ib61d0c6668a57b2e46e9a33778ba6d52613b6e91
 2020-03-31 16:39:00 +00:00
Bonian Chen
d2fe2c9959 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 
Change-Id: I4cfc318b3ff3af20cb2edead69db0ef7c31430d9
 2020-03-31 16:26:55 +00:00
Bonian Chen
855152fd22 Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 
Change-Id: If4dec5a4bd6a24d0684aa30711a530d39a59ca63
 2020-03-31 16:26:51 +00:00
Bonian Chen
54002ca154 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev 2020-03-31 16:09:27 +00:00
Bonian Chen
311941c7d3 Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev 2020-03-31 16:09:27 +00:00
TreeHugger Robot
4be8b73f3e Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: b99184d84e 
Change-Id: I1e845fd38886716c2bbe016546815ab1aad53190
 2020-03-31 15:45:50 +00:00
TreeHugger Robot
b99184d84e Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 
Change-Id: I6410a4d0b06574df8e4688fe085a705d7befb07a
 2020-03-31 15:34:45 +00:00
TreeHugger Robot
37e6acd9a5 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 
Change-Id: I776a3e7e0418231db4e8ef72e3c1899228839941
 2020-03-31 15:18:56 +00:00
Beverly
82e7bc46cf Use DEFAULT_LIST contact intent 
Test: manual
Fixes: 152733367
Change-Id: Ib2addc353298e593160500347d0a9bbfa85d1e0b
 2020-03-31 11:09:50 -04:00
TreeHugger Robot
4b45334288 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev 
* changes:
  [Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
  [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
 2020-03-31 15:01:09 +00:00
Kholoud Mohamed
0329f2fcbe Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 14d05685a1 
Change-Id: Ic8267c53e159a2a6b6d10435d12b8dff68ae4d7f
 2020-03-31 13:52:23 +00:00
Kholoud Mohamed
14d05685a1 Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c 
Change-Id: I7e9a11c33a7fecdeaa52ac0a6f5363ddb7971862
 2020-03-31 13:38:47 +00:00
Kholoud Mohamed
bf7e468f0c Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a 
Change-Id: I7310a64ae95e0fdaf191b979cacefb8ad645d53a
 2020-03-31 13:26:09 +00:00
Kholoud Mohamed
7fb6f35c3a Merge "Show all apps that requested cross profile permission" into rvc-dev 2020-03-31 13:09:31 +00:00