Commit Graph

10562 Commits

Author SHA1 Message Date
Automerger Merge Worker
4c8fb69605 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: f82c724f30 am: 7b83400539
Change-Id: I33bbe3624d2901d68341a0555a45bbd1b42f9b99
2020-03-17 12:35:45 +00:00
Automerger Merge Worker
f82c724f30 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e
Change-Id: Ia01fd111005b4806d82f909d05cbd3f6359e61d4
2020-03-17 12:04:25 +00:00
TreeHugger Robot
217740d640 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev 2020-03-17 11:32:34 +00:00
Automerger Merge Worker
850ec0b38a Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: d4bf77db85 am: 5b0b67f6fd
Change-Id: Ib2cc96a21a81b58cf1606daef9a4da48998e5f95
2020-03-17 06:43:58 +00:00
SongFerngWang
3d54554521 Fix sim pin lock preference disappear in dual sim.
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-17 14:35:31 +08:00
Automerger Merge Worker
d4bf77db85 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887
Change-Id: I0a8007c3bfd9dbd61f1856d139a54e97b429fb99
2020-03-17 06:11:19 +00:00
TreeHugger Robot
1a84719041 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev 2020-03-17 05:43:45 +00:00
Automerger Merge Worker
ef04267344 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 am: dab418626e am: 61e1d03d3b
Change-Id: I25c789e70f36b64c4756ef3e1f118bdce22f3934
2020-03-17 04:29:14 +00:00
Automerger Merge Worker
dab418626e Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682
Change-Id: I0819ebac710020ea2df799ada34f9fef48337860
2020-03-17 03:55:31 +00:00
tim peng
95cd4c9414 Merge "Output switcher header is not updated with the latest media content" into rvc-dev 2020-03-17 03:26:50 +00:00
Tim Peng
36c4949414 Output switcher header is not updated with the latest media content
-Register media controller callback
-Update panel header when medadata changes
-Add test cases

Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Id0b8f997899a96c0c94ca6bf099e624a9e87795b
2020-03-17 09:02:34 +08:00
Kweku Adams
a7e58d7732 Change to public POWER_SAVE_MODE_CHANGED broadcast.
The POWER_SAVE_MODE_CHANGING broadcast is sent at the same time as the
POWER_SAVE_MODE_CHANGED broadcast. Since broadcasts are asynchronous,
there's no reason to have both, so we're simplifying down to just one.

Bug: 79580230
Test: atest BatterySaverReceiverTest
Change-Id: Ib27fc91bc23126f58532e534575d912e3b72ac43
2020-03-16 12:56:46 -07:00
Automerger Merge Worker
ba861466e8 Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 1eedf27e67 am: 9586c26f3d
Change-Id: I284375f76e39aeca2d08245d05235f8e4414abf8
2020-03-16 14:31:43 +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
tim peng
b669fff40c Merge "Handle ransferring state in output switcher" into rvc-dev 2020-03-16 13:17:03 +00:00
Automerger Merge Worker
876a6f5816 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 225007141d am: 8a20a19b82
Change-Id: I81cfd1e401042001cc5cdc39ee0e132f1e043fcf
2020-03-16 12:51:36 +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
TreeHugger Robot
6d6e0f45b2 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev 2020-03-16 12:05:02 +00:00
Automerger Merge Worker
d62c3cd5c2 [Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 am: 8c051e397b am: bea9e2e1d2
Change-Id: I25fb389004c67d55ce789f090ccaae76ba001aa0
2020-03-16 10:23:39 +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
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
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
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
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
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
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
Lucas Dupin
59b3974433 Merge "Blur developer setting" into rvc-dev 2020-03-15 23:28:13 +00:00
Automerger Merge Worker
29aa7d5408 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 am: 9f2fb9b595 am: 693cb5a2f2 am: 58dc174c23
Change-Id: I64b425f4dd30754586f4bbc472a6ea88b5cc3c2e
2020-03-13 17:30:43 +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
TreeHugger Robot
907905bb96 Merge "Refine remove locale warning dialog string" into rvc-dev 2020-03-13 16:43:45 +00:00
Automerger Merge Worker
74f957c212 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 am: 92b4f17fe2 am: b8743359a3
Change-Id: I03ff3d2c1bb45042cced1b8413af357187196d3b
2020-03-13 15:31:28 +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
0a57a71af1 Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 am: 43d0d904c9 am: 00e82ceb9b am: e0ebc3382b
Change-Id: I76e8ad906ecd79f04ba4762dc49860be78dec1b6
2020-03-13 14:35:40 +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
43d0d904c9 Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12
Change-Id: I4ed00fb35eb82352a0609fd089d4fbb06ed01ef0
2020-03-13 13:57:02 +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
Bonian Chen
52dd9f5abf Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" 2020-03-13 12:05:36 +00:00
Bonian Chen
0972a6dd94 Merge "[Settings] Refactor DisabledSubscriptionController" 2020-03-13 11:52:53 +00:00
Automerger Merge Worker
7e427ab997 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 648fe31181 am: 053b614f70
Change-Id: Ia20cbab27b29416dd55923bfb993e4d91dab8059
2020-03-13 10:19:57 +00:00
Bonian Chen
985352d172 Merge "[Settings] Refactor CarrierPreferenceController" 2020-03-13 10:12:29 +00:00
Bonian Chen
1b00c00f79 Merge "[Settings] Refactor Telephony PreferenceController" 2020-03-13 10:11:54 +00:00
Tsung-Mao Fang
c7ecc98d5f Merge "Ignore broken test case" 2020-03-13 10:04:29 +00:00
Tsung-Mao Fang
bac694f2a1 Ignore broken test case
Bug: 151279674
Test: Run robo test
Change-Id: I6777c126a084fc22a34c76d14f004e75a99dcd9f
2020-03-13 17:33:40 +08:00
TreeHugger Robot
6d8e0fed61 Merge "Fix tests" into rvc-dev 2020-03-13 09:27:16 +00:00
Bonian Chen
0971feaeda [Settings] Code Refactor of MobileNetworkPreferenceController
Code Refactor of MobileNetworkPreferenceController

Bug: 150567855
Test: make
Change-Id: If5de2d0841e2f8705d2e202b6e6a7e53dc1a4897
2020-03-13 15:58:09 +08:00