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
da791f3392
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 am: a8d351d734 am: c71d33b5d8 am: 444af7aa56
...
Change-Id: Ib9730e0ead28be3395ccd6ad82d6ae6478a689eb
2020-03-16 06:06:32 +00:00
Automerger Merge Worker
444af7aa56
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 am: a8d351d734 am: c71d33b5d8
...
Change-Id: I708364c6be2238167c123236410b6a7ccc9fcc9c
2020-03-16 06:02:53 +00:00
Automerger Merge Worker
a530c5bc78
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: fa49765db7 am: bcae257906 am: f651f175de
...
Change-Id: I7f2c448b5f0498e8ea9a4a4f8adab12d32dbca1f
2020-03-16 06:02:09 +00:00
Automerger Merge Worker
30c25f9272
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 am: 430b7df6d6 am: baf151c153
...
Change-Id: I397a6592f043b58b86d978f4863f1f0b3c644225
2020-03-16 06:01:49 +00:00
Automerger Merge Worker
f651f175de
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: fa49765db7 am: bcae257906
...
Change-Id: I64e5036b9ce2c6a856676aff1e4f06157bfe409b
2020-03-16 05:46:47 +00: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
baf151c153
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 am: 430b7df6d6
...
Change-Id: I5c3437a55898eca8c0acc46d5a42e3dbc08791b0
2020-03-16 05:46:34 +00: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
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
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
25c3528bb1
Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 7f0be7ea69 am: 7137ebed69 am: 542a7a393b am: 1028fa057a
...
Change-Id: I739d29556d6610bf69b44e6f50a23cd32a2cadbe
2020-03-16 05:13:01 +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
Automerger Merge Worker
1028fa057a
Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 7f0be7ea69 am: 7137ebed69 am: 542a7a393b
...
Change-Id: Ief66b9ac52e1f8dbadcb08c2e1b79b45c07b14be
2020-03-16 04:57:04 +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
5086305e82
Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 7f0be7ea69 am: dfbb1663a8 am: 009751da9c
...
Change-Id: I73212ddca0c3c22ca10b5bca40fdb6fe0ce7cb68
2020-03-16 04:32:55 +00:00
Automerger Merge Worker
8064dce464
Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 026ed69b8c am: 491eb59cfa am: 27c5efafe9
...
Change-Id: Iee2521f1e743e237162bf2fc76bc92fa2ac33b42
2020-03-16 04:32:13 +00:00
Automerger Merge Worker
009751da9c
Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 7f0be7ea69 am: dfbb1663a8
...
Change-Id: I1eeb187962621ce88541411b55a3025f4e7cf684
2020-03-16 04:32:07 +00:00
Automerger Merge Worker
27c5efafe9
Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 026ed69b8c am: 491eb59cfa
...
Change-Id: I298b356b120b49ec1864f006b910142a6f58204b
2020-03-16 04:31:36 +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
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
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
7740dc60b5
Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 90d0060f81 am: 599b42127e am: 921dd4845d am: ed51678076
...
Change-Id: I13de27c62d723f1f80a70139f27fc8d62253048e
2020-03-16 02:24:41 +00:00
Automerger Merge Worker
0a5f8ffd77
Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 1f835adb07 am: b6be60fff8 am: 288829df48
...
Change-Id: I3116013a1ed3535ce3f56911e1160b9b3a4debdd
2020-03-16 02:24:24 +00:00
Automerger Merge Worker
ed51678076
Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 90d0060f81 am: 599b42127e am: 921dd4845d
...
Change-Id: I934d904cbcbb8392ce046f5e0244198b8b9b237e
2020-03-16 02:24:12 +00:00
Automerger Merge Worker
f61673d708
Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 90d0060f81 am: 6ecf256ac9 am: f25b2550be
...
Change-Id: I9f81da0c934113800d84f9bd12ca0604209654c2
2020-03-16 02:24:07 +00:00
Automerger Merge Worker
288829df48
Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 1f835adb07 am: b6be60fff8
...
Change-Id: I951754d2d3bb90a90ab6bf8327ec6d6c7bd5a22a
2020-03-16 02:14:46 +00:00
Automerger Merge Worker
f25b2550be
Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 90d0060f81 am: 6ecf256ac9
...
Change-Id: I578d0ee16e769348a0d5b9808b111f5e42652d4f
2020-03-16 02:14:40 +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
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
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
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
25bbabe0e5
Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: 148b737ef2 am: c4ddd27407 am: 04a22c7799 am: 6efb65c77a
...
Change-Id: I4810671a4c4fe51c4e3cab2c64d3886e7d2e0268
2020-03-16 00:43:10 +00:00
Automerger Merge Worker
6efb65c77a
Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: 148b737ef2 am: c4ddd27407 am: 04a22c7799
...
Change-Id: I216e1cae6cd8ebb4ad23e7ed4a9c57d5bd98cc06
2020-03-16 00:39:13 +00:00
Automerger Merge Worker
e0f0e34adb
Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: e080bd7985 am: 56d1d84371 am: 20dbf2be5a
...
Change-Id: Ib25818605b4d6bb7427c26204d2427015cae525f
2020-03-16 00:39:08 +00:00
Automerger Merge Worker
63067d9e40
Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: 148b737ef2 am: 386b605c61 am: a5fd9a5a44
...
Change-Id: If700d215220a17fb3c7d8617c680a080e485e732
2020-03-16 00:38:51 +00:00
Automerger Merge Worker
20dbf2be5a
Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: e080bd7985 am: 56d1d84371
...
Change-Id: I60ba662293142bc21185a5741a65f847c982c6a0
2020-03-16 00:23:29 +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
