PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,299 Commits 1 Branch 0 Tags
1f15f102f49fbb4c8f962bc242dd40bf82fc8fe4
Commit Graph

60299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
ea3d48855c Merge "Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603" into rvc-d1-dev-plus-aosp 2020-03-16 18:42:57 +00:00
Automerger Merge Worker
015ea725f6 Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603 
Change-Id: I8fcd965aed01fddb516eb6bb1b99486331dff0c9
 2020-03-16 18:42:53 +00:00
Automerger Merge Worker
8965b8677b Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010 
Change-Id: I639eaa2d87eb80b5b4b12779dc2750445c9f9a84
 2020-03-16 18:42:49 +00:00
Automerger Merge Worker
6d4df5ece8 Merge "[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours" into rvc-d1-dev-plus-aosp 2020-03-16 18:42:22 +00:00
Automerger Merge Worker
e4258d5c03 [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours 
am skip reason: subject contains skip directive

Change-Id: I140b938dff8b500f6807a36ce8ffe81a28cbc473
 2020-03-16 18:42:18 +00:00
Automerger Merge Worker
624190cb2a [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: c4e391ad7c -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie14b440004aa649b06f10834e80316cee2a99348
 2020-03-16 18:42:14 +00:00
Automerger Merge Worker
d3b8d8c603 Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf 
Change-Id: I9b3494582be6e8e3563dc75e59ed8d921b834475
 2020-03-16 18:26:26 +00:00
Automerger Merge Worker
7486f6a010 Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf 
Change-Id: I592406722b54ca059e4159826edff6d453802db2
 2020-03-16 18:25:34 +00:00
Automerger Merge Worker
c4e391ad7c [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie8de471415f4dd47fe4da433648cda9c173848b9
 2020-03-16 18:25:25 +00:00
Automerger Merge Worker
4768304de8 [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours 
am skip reason: subject contains skip directive

Change-Id: If219277f2764d85a82482fd2c8782bf6caa1a3c7
 2020-03-16 18:24:32 +00:00
TreeHugger Robot
6c9cad2caf Merge "Update NLS/NAS warning text" into rvc-dev 2020-03-16 18:10:09 +00:00
Automerger Merge Worker
0a9e463fff [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6e10c86bf149e6eae1e1efbc00da7ec2e0e86c88
 2020-03-16 18:09:37 +00:00
Kevin Chyn
e6bcc49eb9 Do not finish early if caller is SUW 
Fixes: 151576034


Test: Wipe device, go past fingerprint enrollment in SUW, press
      back button. SUW should not get stuck
Change-Id: I9021946dd169acfa205e6bacc4c4581242452983
 2020-03-16 09:32:41 -07:00
Bill Yi
d49c677499 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
 2020-03-16 08:20:15 -07:00
Automerger Merge Worker
18ae0b78a2 Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e 
Change-Id: I7a6621f5d52612be031382a990f3e1d2c13af5f1
 2020-03-16 13:57:01 +00:00
Automerger Merge Worker
1019cb702d Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: a692d719cb 
Change-Id: I28b0ac25eaa256f09767ac47e488f32d67d7eacf
 2020-03-16 13:56:51 +00:00
Automerger Merge Worker
5a0f0de777 Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: b32674e24f 
Change-Id: I2a5d5dddadef629572f3b10a64ca3d17dbb0e298
 2020-03-16 13:56:31 +00:00
Automerger Merge Worker
1eedf27e67 Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 
Change-Id: I006df7c1d8e4e2512e9934ec107c4e41f25f6d8b
 2020-03-16 13:55:06 +00:00
Automerger Merge Worker
a692d719cb Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 
Change-Id: If953928e35be8b0a93b6438c32084238bd9b6859
 2020-03-16 13:48:06 +00:00
Automerger Merge Worker
cdbca2b45e Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 
Change-Id: I3641366b12a396edc6dbafc50700f248bac002a8
 2020-03-16 13:47:57 +00:00
TreeHugger Robot
b94605c378 Merge "Update strings for Screen Attention suggestion." into rvc-dev 2020-03-16 13:46:14 +00:00
Automerger Merge Worker
b32674e24f Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c 
Change-Id: Ibd5b7c7dfc2435253f969ba9f497e7a9dc1924f9
 2020-03-16 13:39:19 +00:00
Automerger Merge Worker
2fe4235ae3 Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c 
Change-Id: I03eb5de2959fd59643ebb39d155f91fd2fb02298
 2020-03-16 13:39:08 +00:00
Julia Reynolds
68fad762ff Update NLS/NAS warning text 
Test: manual
Fixes: 145129456
Change-Id: Ie3e7ecb432445c596d888614ae71cff27873ac6b
 2020-03-16 09:30:10 -04:00
tim peng
b669fff40c Merge "Handle ransferring state in output switcher" into rvc-dev 2020-03-16 13:17:03 +00:00
Automerger Merge Worker
9a58bd18f4 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: c9e4a2934f 
Change-Id: I01883cb97e83e2250ff82596a68cff7466c8f354
 2020-03-16 12:33:54 +00:00
Automerger Merge Worker
225007141d Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb 
Change-Id: I3b0dd3fb1aa1cfb4582948239b7d1a753dbe1e0b
 2020-03-16 12:33:39 +00:00
Automerger Merge Worker
c9e4a2934f Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 
Change-Id: I334933880d8a192e7d031cfa039c406a56a753c0
 2020-03-16 12:21:28 +00:00
Automerger Merge Worker
2ae7c371cb Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 
Change-Id: I0bdc9b69c620576e2575e628af5d60d02f2eb58a
 2020-03-16 12:21:21 +00:00
TreeHugger Robot
6d6e0f45b2 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev 2020-03-16 12:05:02 +00:00
Automerger Merge Worker
d7614e928b [Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 9c6921cfb7 
Change-Id: I2ff3e9f463d2d95a8efa9ca864f1dec063731c9e
 2020-03-16 10:00:31 +00:00
Automerger Merge Worker
8c051e397b [Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 
Change-Id: If132aff3582f2c10a32d38e3f1bdf93f8de8fc35
 2020-03-16 10:00:10 +00:00
Yi-Ling Chuang
f288a4ec53 Update strings for Screen Attention suggestion. 
Bug: 144865404
Test: rebuild
Change-Id: Id5ab9a68a5f83c6fdc6451b96d8e7bfd831891d1
 2020-03-16 17:54:39 +08:00
Automerger Merge Worker
9c6921cfb7 [Settings] Fix MobileNetworkActivity test case am: 2fad549b08 
Change-Id: I31a8f50caf0c783d659eb9fbbe49261bdd5590fe
 2020-03-16 09:46:47 +00:00
Automerger Merge Worker
4c2d10ee97 [Settings] Fix MobileNetworkActivity test case am: 2fad549b08 
Change-Id: I561fafa46f5970c033fca48d9d0d6071333c797b
 2020-03-16 09:46:43 +00:00
Alex Johnston
8d430de5d5 Fix AppButtonPreferenceControllerTest 
* isSystem was not being mocked.
* The tests where isSystem should return true
  were not being tested properly.

Bug: 151569506
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ib4249bca8f3c0321d0b64b4dbd4c4e5fc29586e1
 2020-03-16 09:37:10 +00:00
zoey chen
2fad549b08 [Settings] Fix MobileNetworkActivity test case 
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkActivityTest
Bug: 144664534
Change-Id: Ifc63646f709b29c3a8947430bcec6a82fae02ea5
 2020-03-16 14:51:16 +08:00
Automerger Merge Worker
bcae257906 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: fa49765db7 
Change-Id: I7953fd3cadea5e8446d8fb3f895f26218c22147b
 2020-03-16 05:33:58 +00:00
Automerger Merge Worker
430b7df6d6 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 
Change-Id: I0f97da54668a741cf3f54d0166c87f6fb3a2337d
 2020-03-16 05:33:26 +00:00
Automerger Merge Worker
fa49765db7 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 
Change-Id: Ic83b788655896ccc5f2f7a4694ecb8adf1f0b1d6
 2020-03-16 05:12:16 +00:00
Automerger Merge Worker
4dfb70f145 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 
Change-Id: Id9d1849ccdb5842b706fe7bd3bc28563a14caeca
 2020-03-16 05:11:42 +00:00
tim peng
3a18ee5c79 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev 2020-03-16 04:56:01 +00:00
Automerger Merge Worker
dfbb1663a8 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 7f0be7ea69 
Change-Id: I886e94b634a9ee8151759cbe526d97bcf69a75c2
 2020-03-16 04:22:26 +00:00
Automerger Merge Worker
491eb59cfa Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 026ed69b8c 
Change-Id: I466385516a7e73db7d1f11271b07bcccae1f6c10
 2020-03-16 04:21:41 +00:00
Automerger Merge Worker
026ed69b8c Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 
Change-Id: I679887c29602a2e445e22c1e0e7ce455605c2eed
 2020-03-16 04:06:36 +00:00
Automerger Merge Worker
7f0be7ea69 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 
Change-Id: I033b74fba64e39993173c995e95696ed725db642
 2020-03-16 04:06:29 +00:00
Mehdi Alizadeh
42a906d874 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev 2020-03-16 04:01:11 +00:00
Automerger Merge Worker
b6be60fff8 Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 1f835adb07 
Change-Id: Ica1be3353d887993aad9349f0bdaaac871b6f384
 2020-03-16 02:03:37 +00:00
Automerger Merge Worker
6ecf256ac9 Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 90d0060f81 
Change-Id: Ifef0bc7f203170b63ba9dc8733eead3470519ea9
 2020-03-16 02:03:14 +00:00
Automerger Merge Worker
1f835adb07 Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a 
Change-Id: I740e247daadfbfeb5ba763b6aa9ad783b6b81d4b
 2020-03-16 01:52:09 +00:00