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

59827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
819edf41f3 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 6bc38f14a5 
Change-Id: Idb62e7a10f90fc566ca63972b2a5a727fd4ee75f
 2020-03-16 12:46:04 +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
8f2624d0b0 [Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 am: 5df8cf0603 
Change-Id: Ie5031be25e77aef0c10b61abd295850845bccab0
 2020-03-16 10:12:06 +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
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
c71d33b5d8 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 am: a8d351d734 
Change-Id: I8406655d8fc6b9794bff6baebf324ac2dd4dfd6c
 2020-03-16 05:46:34 +00: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
542a7a393b Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 7f0be7ea69 am: 7137ebed69 
Change-Id: I4d0a2af241d6ef35a425e627bcb17b4acdb8e3ac
 2020-03-16 04:35:11 +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
921dd4845d Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 90d0060f81 am: 599b42127e 
Change-Id: I0e74d20664d96ee96faa76a7534f81d55a986fd2
 2020-03-16 02:14:36 +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
04a22c7799 Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: 148b737ef2 am: c4ddd27407 
Change-Id: I08f3903759f5174d12aca7ad6a082375e9cc27c2
 2020-03-16 00:23:15 +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
Automerger Merge Worker
ae6a608db0 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 am: 9f2fb9b595 am: 4a56fb4144 
Change-Id: Ia884db2e362578a9048b51bea7eb7c3ab7b30694
 2020-03-13 17:17:34 +00: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
cb46421ec6 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930 am: 4fd3a55579 
Change-Id: I26fefeb9fda7d647be1cb8663e2a1c52191dc700
 2020-03-13 17:01:00 +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
b5bfc99ee5 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 am: cf0e5bb296 
Change-Id: I3ec524c950ec2c95aefe97c48ede7cdac75285aa
 2020-03-13 15:17:27 +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
Automerger Merge Worker
627642cc0d Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 1b87244013 
Change-Id: I984e3390f329188362b9a92b84a24a4d9a9adc73
 2020-03-13 10:05:24 +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
Automerger Merge Worker
1d2fee6c5a Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: d86df5d487 
Change-Id: Ie0d756b795c9f7721f7ca20b03fd7eee5a748d48
 2020-03-13 05:39:17 +00:00
Automerger Merge Worker
d86df5d487 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff 
Change-Id: I53566a529f76c804004941076c4549ab873b470c
 2020-03-13 05:15:10 +00:00
Automerger Merge Worker
e94cbd98ff Merge "Remove ignore test case" into rvc-dev am: ad30345078 
Change-Id: I6f1e2d5f3429c6fccee5d80403e27b445cd40012
 2020-03-13 05:01:38 +00:00
Edgar Wang
3b47408016 Refine remove locale warning dialog string 
- If the first language is not selected, just remove the body copy
  else warning user the locale will change to another language.

Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
 2020-03-13 12:49:21 +08:00
Edgar Wang
ad30345078 Merge "Remove ignore test case" into rvc-dev 2020-03-13 04:45:59 +00:00
Automerger Merge Worker
e6502b753a Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4 
Change-Id: Ic01687809ab05464a514ffeb4bbfac0c78429829
 2020-03-13 04:00:23 +00:00
Automerger Merge Worker
897eea3bc4 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 
Change-Id: Ic1db6caf15ef6aed31e27bf1aedf19c0dc9a93cc
 2020-03-13 03:40:08 +00:00
Automerger Merge Worker
3f6c723044 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 
Change-Id: Iee7a93a3c65d7bdb432937bcc5b81d2f3dd7fa45
 2020-03-13 03:27:02 +00:00
TreeHugger Robot
89a6fafa33 Merge "Use values-night to control the dark mode background color" into rvc-dev 2020-03-13 03:13:27 +00:00