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

60421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
56d1d84371 Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: e080bd7985 
Change-Id: I1d730c8e7a35fc97ff9ce0fd48733619198c296f
 2020-03-15 23:53:27 +00:00
Automerger Merge Worker
386b605c61 Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: 148b737ef2 
Change-Id: Icfa3260c1350885bdd7f740a56a86f20cd29c33d
 2020-03-15 23:53:08 +00:00
Automerger Merge Worker
e080bd7985 Merge "Blur developer setting" into rvc-dev am: 59b3974433 
Change-Id: Ibcb04fdd68889f304f67e02261c8484dff3afac5
 2020-03-15 23:40:18 +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
Automerger Merge Worker
7d738c3c2f Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019 am: c7bd3a2336 
Change-Id: Ibbf56871473d880945601652b90e12b96f09a075
 2020-03-13 23:56:35 +00:00
Automerger Merge Worker
c7bd3a2336 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019 
Change-Id: I4c52881346cada4fa65d8d9d39f9b461177a3c8e
 2020-03-13 23:42:29 +00:00
Automerger Merge Worker
008480e019 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 
Change-Id: I3aaa084901d593f3330469a499f548b6e40b42db
 2020-03-13 23:23:30 +00:00
Treehugger Robot
9dec7506d3 Merge "Address cleanup comments from aosp/1234607" 2020-03-13 23:04:12 +00:00
Automerger Merge Worker
9993680ac4 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 am: e3aaaa8a59 
Change-Id: Ieae089071a39d89aa8e5682a9e913c9e16ab7b95
 2020-03-13 17:07:30 +00:00
Automerger Merge Worker
693cb5a2f2 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 am: 9f2fb9b595 
Change-Id: I296a7d6c476a05f41d15b8c7a977d6332ccf60c6
 2020-03-13 17:07:22 +00:00
Automerger Merge Worker
e3aaaa8a59 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 
Change-Id: I84f4e0575e252520704d6afec262ecb6de9f0916
 2020-03-13 16:52:18 +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
73bd63c420 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 5b859bf70c 
Change-Id: I11445c34f4388a1ecbfe527b97cbcbebf193f4d0
 2020-03-13 16:46:52 +00:00
Automerger Merge Worker
d398a581d0 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930 
Change-Id: I464313af4431fac3c8197e6f3ddb73a81de4eb87
 2020-03-13 16:46:23 +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
5b859bf70c Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 
Change-Id: If38fe59db1f1ea7ad013a9a3d8c3991ceae689bc
 2020-03-13 16:34:31 +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
30a267f96d Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 91002efcd6 
Change-Id: I7f55bcff2e64cafa60caf7789bc6d7132e04731e
 2020-03-13 15:00:24 +00:00
Automerger Merge Worker
92b4f17fe2 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 
Change-Id: Ia860be60c8487ef08ece2dddf7765f7626f14623
 2020-03-13 14:59:59 +00:00
Automerger Merge Worker
91002efcd6 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 
Change-Id: I19c97f204b39f0097b32f433937fa40e555f03d5
 2020-03-13 14:47:29 +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
Automerger Merge Worker
00e82ceb9b Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 am: 43d0d904c9 
Change-Id: Icb68bd2fb4823fdf68146c4a0ab337cd6dc24468
 2020-03-13 14:11:57 +00:00
Automerger Merge Worker
43d0d904c9 Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 
Change-Id: I4ed00fb35eb82352a0609fd089d4fbb06ed01ef0
 2020-03-13 13:57:02 +00:00
Automerger Merge Worker
0c0a52cc12 Merge "Settings performance testing" am: 4186be0f29 
Change-Id: Iaf5b3e75f376bc7dc2e875f1e10adecedc34231a
 2020-03-13 13:35:25 +00:00
Raff Tsai
4186be0f29 Merge "Settings performance testing" 2020-03-13 13:22:57 +00:00
youtengliang
ef861b0e3e Settings performance testing 
Test: atest com.android.settings.tests.perf LaunchSettingsTest

Change-Id: I32a077b22bc4cd36c7aab32dd22dede87b406641
 2020-03-13 13:22:38 +00:00