Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,528 Commits 1 Branch 0 Tags
6a42a6df5a623fb8fd945cc06e33b578c7cb6afd
Commit Graph

30670 Commits

Author SHA1 Message Date
Automerger Merge Worker
ce524d941f Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 am: 19b27604b6 am: 5df00d8c17 
Change-Id: I18691f8b67c7b2f04edd1bf247fba35f7c13b9cc
 2020-03-16 20:17:44 +00: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
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
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
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
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
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
Edgar Wang
ed39b5bb1a Merge "Remove duplicated index search data" into rvc-dev 2020-03-16 01:42:22 +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
ac4634cd8b Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019 am: c7bd3a2336 am: 7d738c3c2f am: 2c1ca53660 
Change-Id: Ib7429e7719303b4732922cb51af99b3e04dba266
 2020-03-14 00:19:16 +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
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
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
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
Automerger Merge Worker
648fe31181 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 
Change-Id: If3e8ac385517d0fcad9160f24b8d6aaa1b3cdacd
 2020-03-13 09:51:27 +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
5616591d2b Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 2c3ee203bf am: f2755520a1 
Change-Id: Ia42aae3bf00ba46dfac23c2172d4d5abbee3ef7d
 2020-03-13 04:14:44 +00:00
Automerger Merge Worker
2c3ee203bf Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 
Change-Id: I5a80461f141c2c96234e05f65b7feb09d20101f3
 2020-03-13 03:39:54 +00: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
Automerger Merge Worker
8eb45c004d Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: 841b980a88 am: a9027be3b0 
Change-Id: I3db1900bc659a06796695ebc7f2c1a8460d06c94
 2020-03-12 23:32:35 +00:00