Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,291 Commits 1 Branch 0 Tags
4f19e358c8d72bc49196fc355ac01e5247b6afdb
Commit Graph

30486 Commits

Author SHA1 Message Date
Automerger Merge Worker
4f19e358c8 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 
Change-Id: I4fd74c8dba82fb6d92147c6b72bcbbe142704ea1
 2020-03-17 13:15:07 +00:00
TreeHugger Robot
76f4a29510 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev 2020-03-17 12:51:04 +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
calvinpan
ff11f200c8 Add NR Global to the logic to check if it is Global 
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
 2020-03-17 18:27:34 +08: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
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
Automerger Merge Worker
d227833dde Require attention pref not searchable by default am: 593b5671c8 am: 441019142c 
Change-Id: I7e5d52e4317a06495ad3c62db4dc7682401d9e03
 2020-03-17 00:50:24 +00:00
joshmccloskey
593b5671c8 Require attention pref not searchable by default 
Test: Attempted to search with the keyword eyes and found nothing.
Bug: 150933895
Change-Id: Ic69d4fc9fe495fe6d133b695ce48055f6fd65d35
 2020-03-16 22:03:28 +00: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
19b27604b6 Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 
Change-Id: Id7f186a312c69aeed5c7acefd7c3865df361e76a
 2020-03-16 19:25:31 +00:00
TreeHugger Robot
b2c35f7fcc Merge "Do not finish early if caller is SUW" into rvc-dev 2020-03-16 18:56:54 +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
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
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
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
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
1f835adb07 Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a 
Change-Id: I740e247daadfbfeb5ba763b6aa9ad783b6b81d4b
 2020-03-16 01:52:09 +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
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
c7bd3a2336 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019 
Change-Id: I4c52881346cada4fa65d8d9d39f9b461177a3c8e
 2020-03-13 23:42:29 +00:00
Treehugger Robot
9dec7506d3 Merge "Address cleanup comments from aosp/1234607" 2020-03-13 23:04:12 +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
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
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
Bonian Chen
aa08222778 Merge "[Settings] Refactor DataUsageSummaryPreferenceController" 2020-03-13 12:08:30 +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
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
Automerger Merge Worker
95ada20d2e Merge "Fix tests" into rvc-dev am: 6d8e0fed61 
Change-Id: I2ebe208fd9795e122b650b93b8a2dc81fe0ae3e8
 2020-03-13 09:38:46 +00:00
TreeHugger Robot
6d8e0fed61 Merge "Fix tests" into rvc-dev 2020-03-13 09:27:16 +00:00
Bonian Chen
1f1843f11c Merge "[Settings] Refactor MmsMessagePreferenceController" 2020-03-13 09:08:18 +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
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
Automerger Merge Worker
0bfda151bf Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 
Change-Id: I6ecd56f6855cfd160e491472e1c5276deccde92d
 2020-03-13 03:27:00 +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
Julia Reynolds
49f40ee77b Fix tests 
Fixing one of them by removing an unneeded setting

Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
 2020-03-12 17:27:35 -04:00
Automerger Merge Worker
58f8eded5d Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 
Change-Id: I4316b557413cc003049cff812d3b09e6bc3aea4d
 2020-03-12 20:03:04 +00:00
Zhen Zhang
0ad0a50538 Merge "Log some actions for changing wifi hotspot config" into rvc-dev 2020-03-12 19:47:42 +00:00
Automerger Merge Worker
75166350e2 Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 
Change-Id: I9c14c035b88153c86a4c027e54fef5989f167a89
 2020-03-12 17:53:31 +00:00