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

59561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c938890c53 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: cf618708e8 
Change-Id: I5a21b24048d6fc7854e44d4e0f6b83b489202bb6
 2020-03-06 22:52:31 +00:00
Automerger Merge Worker
cf618708e8 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 
Change-Id: I94b5cd6d6cffa70d9b77465db6541513c0c17e06
 2020-03-06 22:46:06 +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
fd40e9e4b8 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 am: 9423b256fb 
Change-Id: Ieff5447ebeb79498be920359527fa8260a076f28
 2020-03-06 22:15:20 +00:00
Automerger Merge Worker
9423b256fb Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 
Change-Id: I313e85e71dc915d6fed46fa30076e5d230d54a6d
 2020-03-06 22:03:07 +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
Quang Luong
858cf42516 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev 2020-03-06 21:36:30 +00:00
Automerger Merge Worker
6e9a07ed82 Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8 am: acc4e72472 
Change-Id: I397aeea568418fa7e93b0bfc8a6ee08554adb04d
 2020-03-06 21:07:48 +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
acc4e72472 Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8 
Change-Id: I2c921a91564d672b6705668251486ff0b700e198
 2020-03-06 20:51:53 +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
Julia Reynolds
d27d2b375e Merge "Log errors on history load" into rvc-dev 2020-03-06 20:23:02 +00:00
Automerger Merge Worker
74b4b59323 [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2 am: 777ac0e39a 
Change-Id: I9172051ee3bfa4ebf106a8f1c2a96daee110b5ad
 2020-03-06 17:19:30 +00:00
Automerger Merge Worker
445e51dd7e [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: a9d8cc3de6 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929 is in history

Change-Id: Ie8198c0cf82f9063e90da2322a2b5f863c0ac978
 2020-03-06 17:18:05 +00:00
Automerger Merge Worker
777ac0e39a [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 am: 51692e38d2 
Change-Id: I00a4e29b17053932351edec3783b731acabbea22
 2020-03-06 16:59:09 +00:00
Automerger Merge Worker
a9d8cc3de6 [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: Iea5527d8640a6db4af7f866851596602c949ed4a
 2020-03-06 16:58:19 +00:00
Automerger Merge Worker
51692e38d2 [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 
Change-Id: I147730c1dcf6bc77335f6b4c9b8dcc5e96d91c20
 2020-03-06 16:32:16 +00:00
Automerger Merge Worker
deffa903e5 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours am: 9a4bdcaca6 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 9efc5ab929 is in history

Change-Id: I55b2916a093a997c07c736fb24b621b8f46e8041
 2020-03-06 16:31:55 +00:00
Automerger Merge Worker
eae534cda7 [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours 
am skip reason: subject contains skip directive

Change-Id: Id498eb2c8fe327e3639328d488db5900174240ec
 2020-03-06 16:18:58 +00:00
Automerger Merge Worker
9a4bdcaca6 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279 am: 86ce68877f -s ours 
am skip reason: subject contains skip directive

Change-Id: I2ac28217bd616bc49859f09a9eab0a20e1d5d285
 2020-03-06 16:17:35 +00:00
Automerger Merge Worker
e49067b8a1 Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 am: e48064ea7f 
Change-Id: I5e13a5aecb534a685fea6a5732a960ade81b521d
 2020-03-06 15:12:46 +00:00
Julia Reynolds
78b1848509 Log errors on history load 
Test: manual
Bug: 150336474
Change-Id: I10e0e5ab9d51d88b67678be0f7040c360dcbcbe4
 2020-03-06 10:05:30 -05:00
Automerger Merge Worker
e48064ea7f Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 
Change-Id: I36ffb4c244418c85861655a6c4e00ed3a0ce1f0e
 2020-03-06 14:56:15 +00:00
Automerger Merge Worker
229e8a35bd Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: a51ed4f14c 
Change-Id: I5bba3e276f8fd692e172e962aed2a5bb167f69ba
 2020-03-06 14:45:23 +00:00
Automerger Merge Worker
14d7c1e369 Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f 
Change-Id: Iaa48708579e6c223295134b38037e4ed53a99426
 2020-03-06 14:41:35 +00:00
Anna Trostanetski
f1fe93bc2f Merge "Fix PlatformCompatDashboardTest." into rvc-dev 2020-03-06 14:38:29 +00:00
Automerger Merge Worker
a51ed4f14c Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd 
Change-Id: I663c8c779d99107d661278a7c8e3941a46827a9a
 2020-03-06 14:34:41 +00:00
Automerger Merge Worker
83fb76a7fd Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 
Change-Id: I02c0925b503b7adb1d68c553eccb8c1f07a4d5e5
 2020-03-06 14:17:42 +00:00
tim peng
c241e434d5 Merge "Add string for output switcher transferring state" into rvc-dev 2020-03-06 14:08:28 +00:00
Arc Wang
f5e9927668 [Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon 
click the gear icon will always switch to Wi-Fi detail screen.

Bug: 150911380
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedWifiEntryPreferenceTest
Change-Id: I640d180ae5684ffaa9b2adec7b1be401b2bfd89d
 2020-03-06 19:27:08 +08:00
Automerger Merge Worker
ea55b254ed Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 am: e87b903aff 
Change-Id: Id01d884349acf57366cd926e0f869ee69ea6ee50
 2020-03-06 10:12:08 +00:00
menghanli
5d7083a103 ShortcutPreference Toggle design (2/n) 
- Removes edit shortcut disable condition.
- Shows "off" if user removes all items in edit dialog.
- Restores last time what user chosen options when show edit dialog.

Bug: 148989269
Test: Manually test
Change-Id: I105abda782999d38c92e3de9811e2fd378869e73
 2020-03-06 18:02:53 +08:00
Automerger Merge Worker
e87b903aff Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 
Change-Id: I47e1a6f1f0c4dbe859fcacddcec3ae4f544e8961
 2020-03-06 09:57:26 +00:00
Automerger Merge Worker
9505f30f26 Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 
Change-Id: Ifc4ca755dbbfec5a78ee5edd79a56be1b9424eab
 2020-03-06 09:44:32 +00:00
TreeHugger Robot
2093ad6ac0 Merge "Ignore some failed tests." into rvc-dev 2020-03-06 09:23:35 +00:00
Automerger Merge Worker
b87479c713 Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be am: 715f9465e2 
Change-Id: I42d240659382f4cc55a8918e4ff152340f62b9cc
 2020-03-06 09:22:52 +00:00
Automerger Merge Worker
5c9e794785 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 am: e3cf2e8ef4 
Change-Id: If143bb9c3cdae71b30f5b9ca22c169d9d081dde8
 2020-03-06 09:22:46 +00:00
Automerger Merge Worker
715f9465e2 Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be 
Change-Id: I0fb54974dfd4fa0f3e13a15eb5e070e1e8f0aa23
 2020-03-06 09:11:34 +00:00
Automerger Merge Worker
e3cf2e8ef4 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 
Change-Id: I7f0295dd33b3756bc8a8a893db75f4554a4c352d
 2020-03-06 09:11:25 +00:00
Automerger Merge Worker
8be83502be Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 
Change-Id: Ia3e859432dada22a9bcdeb90eb7140b537b67434
 2020-03-06 08:57:34 +00:00
Automerger Merge Worker
7e89b41219 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 
Change-Id: I95978fe3e4f797fa94ddd51701e92b8f4cd6142f
 2020-03-06 08:57:23 +00:00
Automerger Merge Worker
590754734c Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 4a7ba9a3c9 
Change-Id: I933bc9a6f7d96e06124e1e7082ce5b3efa12b436
 2020-03-06 08:57:17 +00:00
TreeHugger Robot
90d5d45506 Merge "Ignore failed test cases" into rvc-dev 2020-03-06 08:48:25 +00:00
Automerger Merge Worker
4a7ba9a3c9 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 
Change-Id: I0880e13a0bb8ac2cc3f4a2db21fe049d71da629a
 2020-03-06 08:45:19 +00:00
Lee Chou
f3ce231d17 Merge "Require authorization before turning off eSIM security feature" into rvc-dev 2020-03-06 08:45:09 +00:00
Automerger Merge Worker
696d25adf0 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb 
Change-Id: Ib3566a792f6d8671e4b4e84f64ed67f4c27eed86
 2020-03-06 08:23:30 +00:00
Menghan Li
b6ab224ddb Merge "Update edit shortcut dialog measurements and assets." into rvc-dev 2020-03-06 08:01:59 +00:00