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

60047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b2c35f7fcc Merge "Do not finish early if caller is SUW" into rvc-dev 2020-03-16 18:56:54 +00:00
Automerger Merge Worker
894c3dc565 Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603 
Change-Id: I0734d11a825d521825f474c17137058eb33f128c
 2020-03-16 18:43:03 +00:00
Automerger Merge Worker
4629097190 [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: Ic1e70e00fe7273b71d5e2e45c407d1f0a750ef7a
 2020-03-16 18:42:56 +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
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
875cb73df7 Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e 
Change-Id: I75c4fd88132b994e36adbb776f7b8a57a7f34cb3
 2020-03-16 13:57:03 +00:00
Automerger Merge Worker
5a67d16648 Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 
Change-Id: I87a5cbc54cb9603157b1abf1b8a8d48551db25e5
 2020-03-16 13:55:53 +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
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
6bc38f14a5 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb 
Change-Id: I80306346be78398203ec7155ce2e148a6d46b0b2
 2020-03-16 12:33:58 +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
5df8cf0603 [Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 
Change-Id: I60323f6e1e665e9bf6e59c4118e9ea9e8e91480d
 2020-03-16 10:00:32 +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
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
a8d351d734 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 
Change-Id: I10eefa171f66c9516993600e936befc5b7206893
 2020-03-16 05:33:45 +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
7137ebed69 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 7f0be7ea69 
Change-Id: I1e1b919f9acbfe8c214b5bc7462ac7d429e99b50
 2020-03-16 04:21:08 +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
599b42127e Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 90d0060f81 
Change-Id: I7a2081325ad840269e19beeea2dc10613664fdf4
 2020-03-16 02:03:37 +00:00
Automerger Merge Worker
90d0060f81 Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a 
Change-Id: I394df077b58555d88ffeeb52fe727a772f9f6574
 2020-03-16 01:52:03 +00:00
Edgar Wang
ed39b5bb1a Merge "Remove duplicated index search data" into rvc-dev 2020-03-16 01:42:22 +00:00
Automerger Merge Worker
c4ddd27407 Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: 148b737ef2 
Change-Id: I48a0ed27e0e54a56fce9cc8902efce899e77e01c
 2020-03-15 23:53:26 +00:00
Automerger Merge Worker
148b737ef2 Merge "Blur developer setting" into rvc-dev am: 59b3974433 
Change-Id: Iddb1e91eb3aacbc71dde029cbb08873992b92f90
 2020-03-15 23:40:09 +00:00
Lucas Dupin
59b3974433 Merge "Blur developer setting" into rvc-dev 2020-03-15 23:28:13 +00:00
Hall Liu
45e4b8948c Rename NotificationChannel#setBlockableSystem 
Rename the method to setBlockable. Also rename isBlockableSystem in the
same way.

Bug: 151311073
Test: atest NotificationChannelTest
Change-Id: I0504f8043dc864fe6677f2e65783068ffa3437ba
 2020-03-13 13:54:10 -07:00
Automerger Merge Worker
4a56fb4144 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 am: 9f2fb9b595 
Change-Id: I2ff39501e6979dabd1240db56d0e00057690d825
 2020-03-13 17:07:23 +00:00
Automerger Merge Worker
9f2fb9b595 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 
Change-Id: Ifd13a1a6501378de9a41440a4a6cfb956fc75c71
 2020-03-13 16:52:12 +00:00
Automerger Merge Worker
4fd3a55579 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930 
Change-Id: I4820060b085db7384d9bbc6391a95553f6054e7b
 2020-03-13 16:46:43 +00:00
TreeHugger Robot
907905bb96 Merge "Refine remove locale warning dialog string" into rvc-dev 2020-03-13 16:43:45 +00:00
Automerger Merge Worker
25b03c9930 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 
Change-Id: I05cbeae87709b99b0fb5a2b7864bbef6071353d9
 2020-03-13 16:34:26 +00:00
Brad Ebinger
117995aec4 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev 2020-03-13 16:23:10 +00:00
Automerger Merge Worker
cf0e5bb296 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 
Change-Id: I26222d3b9175e4b85916a645124ea8a4a0787da6
 2020-03-13 15:00:25 +00:00
Automerger Merge Worker
62d9891328 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 
Change-Id: I317bd4c4e23b3738f95b90950e64c1a0181925b9
 2020-03-13 14:45:11 +00:00
Alex Johnston
37fa5bd059 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev 2020-03-13 14:28:15 +00:00
menghanli
9785c7e290 Update R accessibility assets and strings (4/n) 
- Color inversion preview
- Caption manager preview
- Dwell preview

Bug: 148837311
Test: Manual test
Change-Id: Ia637074c4282bbc51befc44efb0a4ff474f86b26
 2020-03-13 12:43:36 +00:00
Automerger Merge Worker
1b87244013 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 
Change-Id: Ic71e492c19a700e05654cb6b1dfb526fff012e7e
 2020-03-13 09:51:57 +00:00
Automerger Merge Worker
f08d965b53 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 
Change-Id: I76a1639f3530aee4c47fcc3cac1e01bfbe02aea5
 2020-03-13 09:38:45 +00:00
TreeHugger Robot
6d8e0fed61 Merge "Fix tests" into rvc-dev 2020-03-13 09:27:16 +00:00