PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,590 Commits 1 Branch 0 Tags
09102972c4a41b9e6c163105f58656a13c57b8fc
Commit Graph

68590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
09102972c4 Merge "[Wi-Fi] Apply WifiTrackerLib objects in WifiDppQrCodeScannerFragment" 2020-05-11 15:39:50 +00:00
Arc Wang
b04ea2dde5 [Wi-Fi] Apply WifiTrackerLib objects in WifiDppQrCodeScannerFragment 
Bug: 152571756
Bug: 145100890
Test: manual
      Scan QR code and check connection.
Change-Id: I21b9fadc83ab185df5710f4bf777afec3dfbbc8d
 2020-05-11 22:17:55 +08:00
Automerger Merge Worker
97fe213b11 Merge "Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 am: ce855ed43e" into rvc-qpr-dev-plus-aosp am: 8cc58ffe1d 
Change-Id: Idf42e02b89c2226e099aff0c0df261bb76c854a8
 2020-05-11 13:25:56 +00:00
TreeHugger Robot
116fae2739 Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 am: dcf5391ec4 am: 6733b9d532 
Change-Id: I2240193a7e8ffc93cdb633c8f746740109f8a7ef
 2020-05-11 13:25:13 +00:00
Automerger Merge Worker
6230810f51 Merge "Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 325e4bc058 am: 7329e047c2" into rvc-qpr-dev-plus-aosp am: cdea0a3bd9 
Change-Id: Ice73b54dc0279c3f4f4b8dcc79c22a964f5f829a
 2020-05-11 13:24:28 +00:00
tim peng
9620fb43d6 Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 325e4bc058 am: 1cb4dd68cb am: 0e9b30a837 
Change-Id: I65c8694270a7ac64f83e6ef39885c0627391d5c4
 2020-05-11 13:23:28 +00:00
TreeHugger Robot
047c8b9c59 [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours am: 6e72ed8749 -s ours am: 6495886a7e -s ours am: 458abbad70 -s ours 
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history

Change-Id: I27a12759ab025621776e316e2c335a5db069f0c2
 2020-05-11 13:22:15 +00:00
TreeHugger Robot
90da36c153 [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours am: 6e72ed8749 -s ours am: d67e7d101c -s ours am: 07f59a8f2a -s ours 
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history

Change-Id: Ia4875e8999c61b9713e7033a0b6568d5cac5d75e
 2020-05-11 13:21:26 +00:00
Automerger Merge Worker
8cc58ffe1d Merge "Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 am: ce855ed43e" into rvc-qpr-dev-plus-aosp 2020-05-11 13:10:45 +00:00
TreeHugger Robot
b044c193da Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 am: ce855ed43e 
Change-Id: I4eea44c40359e65c8b5cc7612ad3b5427963cd8f
 2020-05-11 13:10:41 +00:00
TreeHugger Robot
6733b9d532 Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 am: dcf5391ec4 
Change-Id: I69724fb3d8136fec02944b50f4e543a684380a17
 2020-05-11 13:10:40 +00:00
Automerger Merge Worker
cdea0a3bd9 Merge "Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 325e4bc058 am: 7329e047c2" into rvc-qpr-dev-plus-aosp 2020-05-11 13:10:09 +00:00
tim peng
092b55d9b1 Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 325e4bc058 am: 7329e047c2 
Change-Id: I9cbd418b3b65f48ed72f8eb8f2e4f6fa5f088426
 2020-05-11 13:10:04 +00:00
tim peng
0e9b30a837 Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 325e4bc058 am: 1cb4dd68cb 
Change-Id: Iaaa8165b0f6f99548b23cd043832033551573500
 2020-05-11 13:10:00 +00:00
TreeHugger Robot
458abbad70 [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours am: 6e72ed8749 -s ours am: 6495886a7e -s ours 
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history

Change-Id: Id357e17af22d7d9c1ab4c246e353aac8cabe1486
 2020-05-11 13:09:32 +00:00
TreeHugger Robot
07f59a8f2a [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours am: 6e72ed8749 -s ours am: d67e7d101c -s ours 
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history

Change-Id: Ib2cc006834757e11f05cd848e694b7d1377dc942
 2020-05-11 13:09:09 +00:00
TreeHugger Robot
ce855ed43e Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 
Change-Id: Ie24bfdb97a15f77ea3c61682ca605222e07d2ff9
 2020-05-11 12:56:42 +00:00
TreeHugger Robot
dcf5391ec4 Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: e7e0479c36 
Change-Id: Ia8ce0fc2ddfb72cd5ffdc1c87aa5bff91b180787
 2020-05-11 12:56:38 +00:00
tim peng
7329e047c2 Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 325e4bc058 
Change-Id: I9abfd52ee19564326e5cd1fb5524d968508898e6
 2020-05-11 12:56:24 +00:00
tim peng
1cb4dd68cb Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 325e4bc058 
Change-Id: Iffc3c0c1557f86a81e59b45d7732acd99c6bb478
 2020-05-11 12:56:23 +00:00
TreeHugger Robot
6495886a7e [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours am: 6e72ed8749 -s ours 
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history

Change-Id: Ic1dc53c5928cf16746a6af7202f08fce2cbac458
 2020-05-11 12:56:16 +00:00
TreeHugger Robot
d67e7d101c [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours am: 6e72ed8749 -s ours 
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history

Change-Id: I50d02468081a56d2d7ba161f2248545e74f47cc5
 2020-05-11 12:55:54 +00:00
TreeHugger Robot
e7e0479c36 Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 
Change-Id: I10cde790a0c7e1a0d4a2e6712400b656afc35017
 2020-05-11 12:47:53 +00:00
tim peng
325e4bc058 Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f 
Change-Id: Ic16c64c0a7ebe4a8969cec96da9f5e84e5d4581e
 2020-05-11 12:47:40 +00:00
TreeHugger Robot
6e72ed8749 [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours 
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history

Change-Id: I3fd1bcaa6000809d365e1f39038485a9119519eb
 2020-05-11 12:41:53 +00:00
PETER LIANG
12de1247e9 Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev am: 7a31f2da60 am: 7057155390 am: 9e6ec39c81 am: e2c729fdd6 
Change-Id: Ifa1e61789868d42bb808042f80538361b902f7ea
 2020-05-11 08:41:16 +00:00
PETER LIANG
e2c729fdd6 Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev am: 7a31f2da60 am: 7057155390 am: 9e6ec39c81 
Change-Id: I5a6668ba6732774aae5af0022800bd58d6ca1102
 2020-05-11 08:21:11 +00:00
PETER LIANG
9e6ec39c81 Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev am: 7a31f2da60 am: 7057155390 
Change-Id: Ida5bcd2aaae39e6875976d924caa5676d331e881
 2020-05-11 08:03:59 +00:00
PETER LIANG
7057155390 Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev am: 7a31f2da60 
Change-Id: I6ea0512098a8c55b21d79d5089a8505afbac2d25
 2020-05-11 07:40:51 +00:00
PETER LIANG
7a31f2da60 Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev 2020-05-11 07:28:18 +00:00
Treehugger Robot
ecbd6bb070 Merge "Settings performance testing" am: 8683e38068 am: 0780e5d581 am: ea7d214c9b am: 2ff5e53fa5 am: 51854bf0cb 
Change-Id: Idb5c0e7867eb83a2d0d6aff8eb9430fd90e5ad6a
 2020-05-11 05:25:43 +00:00
Treehugger Robot
51854bf0cb Merge "Settings performance testing" am: 8683e38068 am: 0780e5d581 am: ea7d214c9b am: 2ff5e53fa5 
Change-Id: I56e5d0898051348048978e73826976b580c2ed8c
 2020-05-11 05:14:44 +00:00
Treehugger Robot
2ff5e53fa5 Merge "Settings performance testing" am: 8683e38068 am: 0780e5d581 am: ea7d214c9b 
Change-Id: Iefa8866434c79a2765df0bdc5c729d16af17e975
 2020-05-11 04:59:21 +00:00
Treehugger Robot
ea7d214c9b Merge "Settings performance testing" am: 8683e38068 am: 0780e5d581 
Change-Id: I25f91febf2272f2a50e75728d262168e64e12e6d
 2020-05-11 04:46:15 +00:00
Treehugger Robot
0780e5d581 Merge "Settings performance testing" am: 8683e38068 
Change-Id: I9ebe2a1749a4279d66c987a724cddef02526bfd1
 2020-05-11 04:18:19 +00:00
Treehugger Robot
8683e38068 Merge "Settings performance testing" 2020-05-11 04:02:55 +00:00
tim peng
8f144eb29c Merge "Update "Play media to" in Sound Settings" into rvc-dev am: 72948ab538 am: c56346d085 am: 8978d69743 am: 8dd871f833 
Change-Id: Ia7ac4d24b38b4f27735014f995b855e75e57420d
 2020-05-11 03:41:15 +00:00
tim peng
8dd871f833 Merge "Update "Play media to" in Sound Settings" into rvc-dev am: 72948ab538 am: c56346d085 am: 8978d69743 
Change-Id: I9c76e6a480cbd9ff41754aa52c7cac29210f33a5
 2020-05-11 03:29:28 +00:00
Peter_Liang
0cba2fe133 Fix that the inconsistent accessibility content pages under Setup Wizard. 
Root cause:
Exist the inconsistent conditions.

Next:
1. Move all the condition related to description to the back fragment to determine whether to show the footer preference or not.
2. Add extras relate to animated image.

Bug: 156180932
Test: manual test
Change-Id: I56d4ead6c5121637a2da2e074ef9bff2a8146732
 2020-05-11 11:22:36 +08:00
tim peng
8978d69743 Merge "Update "Play media to" in Sound Settings" into rvc-dev am: 72948ab538 am: c56346d085 
Change-Id: I2507189bf1d19adcb6d35d0216e25b9a2bbf3383
 2020-05-11 03:11:12 +00:00
tim peng
c56346d085 Merge "Update "Play media to" in Sound Settings" into rvc-dev am: 72948ab538 
Change-Id: I7685f6e07b7a067667fc176955737690bfb41a5c
 2020-05-11 02:55:33 +00:00
TreeHugger Robot
de2ab3bc26 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9454ab07a8 -s ours am: f65df4fa71 -s ours am: 94d0e9360c -s ours am: abb86c445c -s ours 
am skip reason: subject contains skip directive

Change-Id: If0d919a6ae37d17403052cecadfecfaef77bcb19
 2020-05-11 02:49:10 +00:00
tim peng
72948ab538 Merge "Update "Play media to" in Sound Settings" into rvc-dev 2020-05-11 02:45:27 +00:00
TreeHugger Robot
abb86c445c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9454ab07a8 -s ours am: f65df4fa71 -s ours am: 94d0e9360c -s ours 
am skip reason: subject contains skip directive

Change-Id: I6af763b3ac3aa4129d10e6b77ee366df20104cba
 2020-05-11 02:36:23 +00:00
TreeHugger Robot
94d0e9360c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9454ab07a8 -s ours am: f65df4fa71 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ibd8181130b30618d20d95248aba1a5d2c0eddbe5
 2020-05-11 02:09:42 +00:00
TreeHugger Robot
f65df4fa71 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9454ab07a8 -s ours 
am skip reason: subject contains skip directive

Change-Id: I05af4d983e85bb063a590b972f0da5fb57417466
 2020-05-11 01:45:59 +00:00
TreeHugger Robot
fae83f7d39 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2356a1abe1 -s ours am: 2fcc2689ce -s ours am: 1b5849cfe9 -s ours am: 7b6a092584 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9f859edf49370f0035d16f18f0c4634982f13be4
 2020-05-11 01:28:11 +00:00
TreeHugger Robot
9454ab07a8 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-11 01:26:37 +00:00
TreeHugger Robot
7b6a092584 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2356a1abe1 -s ours am: 2fcc2689ce -s ours am: 1b5849cfe9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I0567ad65cbb83b9c88a1e16225e0de956f41bc24
 2020-05-11 01:10:20 +00:00
TreeHugger Robot
1b5849cfe9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2356a1abe1 -s ours am: 2fcc2689ce -s ours 
am skip reason: subject contains skip directive

Change-Id: I2ff06d6f3e96cd3a52370375ec9cb47fd1d68b2e
 2020-05-11 00:55:09 +00:00