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

59811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Automerger Merge Worker
b2d8e01b7a [automerger skipped] Revert "DO NOT MERGE - Track framework changes to crashApplicati..." am: 12ed043fdb -s ours am: eae534cda7 
Change-Id: I4aa269491f46a80bcf05ac2afb4fc428e34ae83a
 2020-03-06 16:32:24 +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
b329c29a04 [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: I5746e863609c14f30eaa6284463046a853e9323a
 2020-03-06 16:31:58 +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
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
16fcf16c45 Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 14d7c1e369 
Change-Id: Iab6841572b093b16e7c961becaab72cf839f1ba3
 2020-03-06 14:56:08 +00:00
Automerger Merge Worker
bdc4a744a2 Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f am: 1ab6e8b4fb 
Change-Id: I0794a3dedb843e148fff1e7f74336403be879c44
 2020-03-06 14:56:02 +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
Automerger Merge Worker
1ab6e8b4fb Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f 
Change-Id: I9816aac3c87fa49554badf0710edd3a217dee6bc
 2020-03-06 14:41:27 +00:00
Automerger Merge Worker
c36d3c6cf4 Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: ba597a6f39 
Change-Id: I2e1823a05c3e0cbe44c5900c95eda38f89b92639
 2020-03-06 14:40:24 +00:00
Anna Trostanetski
f1fe93bc2f Merge "Fix PlatformCompatDashboardTest." into rvc-dev 2020-03-06 14:38:29 +00:00
Automerger Merge Worker
daf3235a45 Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd 
Change-Id: I671b90e9fdfc0adc32f9c59ed80dd2b602346694
 2020-03-06 14:34:37 +00:00
Automerger Merge Worker
ba597a6f39 Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 
Change-Id: I6c363e7a541aa37d77897466fac1e188be9283cc
 2020-03-06 14:23:13 +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
Automerger Merge Worker
4d7c559849 Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 2bce5cdd68 
Change-Id: I568a3217d91d21d2da02d92623fed3aca9383380
 2020-03-06 11:35:31 +00:00
Automerger Merge Worker
d763a44943 Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 3f5aa48b55 
Change-Id: Ic51efb933041e01332fca08fc62404abb633d9b0
 2020-03-06 11:35:11 +00:00
Automerger Merge Worker
71ff7a2dd0 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: b4e56a9f35 
Change-Id: Ib218608b822ab3e8d6445e0cdea043ba56b5ee97
 2020-03-06 11:34:52 +00:00
Automerger Merge Worker
ac8fd20bfb Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: abbb4ee257 
Change-Id: I61ef8c3c0b4800e4113e310a5a26d255c9ec1d59
 2020-03-06 11:34:26 +00:00
Automerger Merge Worker
1bde70ca16 Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 545d58d702 
Change-Id: I21084ce86300ffd9e183a9b2e8482ba6b804a73e
 2020-03-06 11:34:16 +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
2bce5cdd68 Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 
Change-Id: I679f15c379b1ac742d9573052921f1e1080f1e65
 2020-03-06 10:25:32 +00:00
Automerger Merge Worker
3f5aa48b55 Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 
Change-Id: Ia8c7631512d6e65752bb67b630254c9975d9dacb
 2020-03-06 10:25:11 +00:00
Automerger Merge Worker
b4e56a9f35 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 
Change-Id: Ie89044a623e320ef2b790a8f89e271988de0531a
 2020-03-06 10:24:41 +00:00
Automerger Merge Worker
abbb4ee257 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb 
Change-Id: I71aa23a4d507d3266e096cec04c22a706ba2eb0a
 2020-03-06 10:24:09 +00:00
Automerger Merge Worker
545d58d702 Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 
Change-Id: I8e638569fd4567519f1b2072a3b77aeff74568a9
 2020-03-06 10:23:55 +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
036fe5c61b Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 
Change-Id: I3847d2e6bc24f499c728dcdfe734aeb03d69b62c
 2020-03-06 09:57:12 +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
9225023a2d Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be 
Change-Id: I2df380ad1c74c3d93fc0ec5f493fa5ddab039d22
 2020-03-06 09:11:41 +00:00
Automerger Merge Worker
6713550398 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 
Change-Id: Id273c8a1bc1bbf51b8fb475eb03e7d19447e1c02
 2020-03-06 09:11:22 +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
TreeHugger Robot
90d5d45506 Merge "Ignore failed test cases" into rvc-dev 2020-03-06 08:48:25 +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
5b97ecf287 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 
Change-Id: I120d9b2135ed0c6d65461dde644d5a55559c85d4
 2020-03-06 08:45:07 +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
Automerger Merge Worker
5cd16c76ab Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8 
Change-Id: I8693afc41c9f0eac5bf9d08158d0b6b32a06d01f
 2020-03-06 07:24:45 +00:00