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
Hall Liu
45e4b8948c
Rename NotificationChannel#setBlockableSystem
...
Rename the method to setBlockable. Also rename isBlockableSystem in the
same way.
Bug: 151311073
Test: atest NotificationChannelTest
Change-Id: I0504f8043dc864fe6677f2e65783068ffa3437ba
2020-03-13 13:54:10 -07: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
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
841b980a88
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e
...
Change-Id: I7fd4175f3347153ff2c84bab2714228919a20e31
2020-03-12 20:18:18 +00:00
Automerger Merge Worker
f34773fdad
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: 2c01f26e38 am: c299b60577
...
Change-Id: I5d679a49eef7049aff28a473eeedbc0a15892048
2020-03-12 20:09:22 +00: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
2c01f26e38
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22
...
Change-Id: If098a49eba7d3f7cee8495afd3a71d0e8bd01c80
2020-03-12 18:12:00 +00:00
Automerger Merge Worker
05017ca458
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: 60b59c3a56 am: 67e5d0e911 am: 7baff55fd5
...
Change-Id: I53ec5ff4e27fc97b36336db03062e85178086a68
2020-03-12 18:01:41 +00:00
Automerger Merge Worker
6bfc90ea6c
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 8dfa636433 am: f7e7def0a4 am: 0b883269c2
...
Change-Id: Ia6abe26b22ad4facd8de3cb258f7cba5fb1e7648
2020-03-12 18:00:38 +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
Bonian Chen
ac2c706809
Merge "[Settings] Fix behavior of mobile data plan"
2020-03-12 16:19:57 +00:00
Bonian Chen
0f15f98999
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController"
2020-03-12 16:19:18 +00:00
Automerger Merge Worker
60b59c3a56
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af
...
Change-Id: I430ce4669bb4f56a4a62d8dbeed09c269db6c275
2020-03-12 16:13:19 +00:00
Automerger Merge Worker
8dfa636433
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b
...
Change-Id: I29ec48cdee97305a70dba7fa76f28cb1a48ae5c9
2020-03-12 16:12:46 +00:00
Alex Johnston
341f995971
DPC can be uninstalled in personal profile in New COPE
...
* For an organization-owned device, the DPC should be able to
be uninstalled in the personal profile. Previously, the
observed behaviour was that the uninstall button in the App
Info Screen was being greyed out.
* This was because the previous logic did not allow for
uninstalling any app which has a profile owner or device
owner on *any* user.
* This CL updates this logic, such that, for non-system apps
uninstalling is blocked only if the app has a profile owner
or device owner for the current calling user.
Bug: 149381804
Test: Manual testing
atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ifaf03daa41724dbbd869c7e1371a77cc39d15ac7
2020-03-12 13:38:19 +00:00
Bonian Chen
0a00f0c44c
[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController
...
use TelephonyManager's setDefaultVoiceSubscriptionId instead of setDefaultVoiceSubId
Bug: 150352656
Test: make
Change-Id: I61078c72c9a5374d4840869ecf9b65d4ce8ef85c
2020-03-12 20:57:09 +08:00
Bonian Chen
332de69f8e
[Settings] Refactor CarrierPreferenceController
...
Refactor CarrierPreferenceController
Bug: 150352656
Test: make
Change-Id: I8b125eb501cdbf63cbfa84d72d78e44a655bf9a5
2020-03-12 20:53:10 +08:00
Bonian Chen
99c0f3fe14
[Settings] Refactor MmsMessagePreferenceController
...
Refactor MmsMessagePreferenceController
Bug: 150352656
Test: make
Change-Id: Id72f8f95eb12bb5c8f060df6c247312c56f2e69a
2020-03-12 20:50:25 +08:00
Bonian Chen
b7891e879f
[Settings] Refactor Telephony PreferenceController
...
Refactor TelephonyBasePreferenceController and TelephonyTogglePreferenceController
Bug: 150352656
Test: make
Change-Id: I3d52054fd9fbc5597db6266686d155a12d5a88d6
2020-03-12 20:43:54 +08:00
atrost
a84c219c30
Mark CHANGE_RESTRICT_SAW_INTENT as logging only
...
Test: m, flash
Test: adb shell dumpsys platform compat - the change is marked loggingOnly
Bug: 148009004
Change-Id: Ia04e8ef624a69feac7c68c858b48457385b9818a
2020-03-12 12:26:56 +00:00
Bonian Chen
29c1be284b
[Settings] Refactor DisabledSubscriptionController
...
Refactor DisabledSubscriptionController
Bug: 150352656
Test: make
Change-Id: I6d31247d77c8fb515b9ba1b1ead33102f0e9e12f
2020-03-12 20:17:17 +08:00