PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,979 Commits 1 Branch 0 Tags
83d06ef1f45235033920e5ca401f97ee76b5e69d
Commit Graph

59979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Automerger Merge Worker
c477088b78 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 
Change-Id: I9dd4c474e4eeea74b79207469ea3e164ccf0da48
 2020-03-12 12:42:21 +00: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
Automerger Merge Worker
f980963514 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af 
Change-Id: Idb839f020646f0abe4dbb338a7a15a7d1fbbe092
 2020-03-12 12:15:29 +00:00
Alex Johnston
01d61e49af Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev 2020-03-12 12:00:49 +00:00
hughchen
728d63c014 Use values-night to control the dark mode background color 
Bug: 149974597
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia10f7bab0ec7781db8b4b4dbdf359bb8a87672cc
 2020-03-12 19:47:44 +08:00
Edgar Wang
651edc5c44 Remove ignore test case 
Fixes: 147865441
Test: RunSettingsRoboTests ROBOTEST_FILTER=AssistFlashScreenPreferenceControllerTest
      RunSettingsRoboTests ROBOTEST_FILTER=DefaultAssistPreferenceControllerTest
      RunSettingsRoboTests ROBOTEST_FILTER=DefaultAutofillPickerTest
      RunSettingsRoboTests ROBOTEST_FILTER=StyleSuggestionActivityTest
Change-Id: I46f2d4b1dc38047bea3b287f11dcc71b7aed6c87
 2020-03-12 19:21:36 +08:00
Automerger Merge Worker
5f99e79af4 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 
Change-Id: I0cfa9d5863e02c5698740f7871d2c1ade41e8b8d
 2020-03-12 11:19:07 +00:00
Automerger Merge Worker
1e2416d458 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 
Change-Id: I415dc1c990098be2e95751fbe79dcc90d5e63ffa
 2020-03-12 11:02:03 +00:00
Automerger Merge Worker
56274ffaa3 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours 
am skip reason: subject contains skip directive

Change-Id: I17465ae7a650f532680446dc72eb315b9e16ba2d
 2020-03-12 10:49:42 +00:00
TreeHugger Robot
8697de6be3 Merge "DO NOT MERGE" into qt-qpr1-dev 2020-03-12 10:36:01 +00:00
Automerger Merge Worker
8fdc20fd87 Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 
Change-Id: Id1a853afd506b5570a17a977d5a2c1dc4d77b7dc
 2020-03-12 10:20:25 +00:00
Automerger Merge Worker
135d77ae70 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Ie0b527622c40aea9d916196c51bf78d02772238b
 2020-03-12 10:20:16 +00:00
Automerger Merge Worker
5d170c119a [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Ib5ee12b356012e6f159fc58292cfce7e4d0401d5
 2020-03-12 10:19:56 +00:00
Automerger Merge Worker
74ae03d4a8 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0 
Change-Id: I6503f9e76785858f5a0b17e4699f8ebd38f75787
 2020-03-12 10:19:18 +00:00
Automerger Merge Worker
d37f5b5a7a [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c 
Change-Id: Ic6a1170dbfd47e22a16a0548568582f0be7e7ad1
 2020-03-12 10:19:14 +00:00
Automerger Merge Worker
4302d438b0 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: Iad03e6bdbd1ee5f7721fa7144ec3c0c228956c47
 2020-03-12 10:18:43 +00:00
Automerger Merge Worker
5fe624a009 Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b 
Change-Id: Ib4a750e64f0e012e94898c15e1f369561231299a
 2020-03-12 09:55:28 +00:00
Automerger Merge Worker
999977ff27 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Iae2b16273c94c1cfefc3ba1cc377f796c45c4136
 2020-03-12 09:55:22 +00:00
Automerger Merge Worker
1b2cdfc1e0 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Ic938d11f692384c04b04aac9ddbd643a0983529f
 2020-03-12 09:55:01 +00:00
Automerger Merge Worker
bde8ce85e0 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d 
Change-Id: I6a6e037cc80eb9f2cc505158e5f937b287c05254
 2020-03-12 09:54:13 +00:00
Automerger Merge Worker
4cc152835c [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c 
Change-Id: I7ece5a97e683dec786ba8c95a7950bc4b4b0d693
 2020-03-12 09:54:12 +00:00
Automerger Merge Worker
c90737a257 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: I572fec74b56a8e2e4e7f3ca9ecdc536a09a376bc
 2020-03-12 09:53:24 +00:00
shafik
143ec3ec2b Update ManageExternalStorageDetailsTest setUidMode 
We previously changed ManageExternalStorageDetails to use
AppOpsManager#setUidMode instead of AppOpsManager#setMode, but forgot to
update the relevant unittest. This CL changes that unittest.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=ManageExternalStorageDetailsTest
Fix: 150914062
Change-Id: I2cfe7e7a19f2422474d11fb946089a6847b36b12
 2020-03-12 09:43:55 +00:00
Automerger Merge Worker
b2a718f62f [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours 
am skip reason: subject contains skip directive

Change-Id: Icbe574512461d49be73aaca3a3d94779a2017bf4
 2020-03-12 09:23:29 +00:00
Automerger Merge Worker
0922e7fdcb [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ibbf2edb55ba4f72cbb1d8c96ab266f841bf31f27
 2020-03-12 09:23:22 +00:00
Automerger Merge Worker
6708ebae6d [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours 
am skip reason: subject contains skip directive

Change-Id: I94cea1b92275f86a666fcba6c950bf4b4659531f
 2020-03-12 09:23:01 +00:00
Automerger Merge Worker
7dc37f978c [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours 
am skip reason: subject contains skip directive

Change-Id: I70c3e6daa2e2bbe6e2cef1fcbd1e78cd475fbc20
 2020-03-12 09:22:57 +00:00
Automerger Merge Worker
f816e89f7a [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462
 2020-03-12 09:21:48 +00:00
Tim Peng
dd39f44344 Handle ransferring state in output switcher 
-Add subtitle on Slice item for transferring and failed case
-Add test cases

Bug: 150903460
Test: make -j50 RunSettingsRoboTests
Change-Id: I45fee20194dc6c9ec86ca88158393dfda455d0c0
 2020-03-12 16:29:30 +08:00
Zhen Zhang
63c7c202d7 Log some actions for changing wifi hotspot config 
Log following actions:
- wifi hotspot name changed
- wifi hotspot password changed

Added tests for logging actions in each controller's test.

Bug: 151113705
Test: WifiTetherSSIDPrefereceControllerTest;
WifiTetherPasswordPreferenceControllerTest;
CodeInspectionTest

Change-Id: I84b1cd8449e575a6ee1ad8868e7791dc601e726f
 2020-03-12 01:06:46 -07:00
Automerger Merge Worker
779aa123c7 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 
Change-Id: I56bbe357b424ade4ce76ba892575c3363bf06c97
 2020-03-12 06:55:22 +00:00
Automerger Merge Worker
c25ebdfb56 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 
Change-Id: Ia15ff888a6672e952120888f6348e9b3323540ae
 2020-03-12 06:55:03 +00:00
Automerger Merge Worker
cae2447a56 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 
Change-Id: Ic3ec86390758853a91341650e1382215d04ea6d5
 2020-03-12 06:42:35 +00:00
Zoey Chen
e34dc697d2 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev 2020-03-12 06:40:04 +00:00
Automerger Merge Worker
c1059b0f25 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e 
Change-Id: Ibb0d255c96279db485f4190c98b5fc854826f8a7
 2020-03-12 06:39:18 +00:00
Calvin Pan
59f5eb638e Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev 2020-03-12 06:25:11 +00:00
Automerger Merge Worker
9c46665173 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 
Change-Id: I68a43988057229deae3a5b4c9daff400b6b5393e
 2020-03-12 06:18:16 +00:00
Automerger Merge Worker
51b2592d11 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 
Change-Id: I7f4cab8841a2be25a59de419fc9a7bf5039312fc
 2020-03-12 06:17:55 +00:00
Automerger Merge Worker
4c69bcab70 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a 
Change-Id: I80f8b6a996ec4006a225f63d5471ae7f70a2bcb4
 2020-03-12 06:03:46 +00:00
Automerger Merge Worker
9e15dc3582 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb 
Change-Id: Ib6deaaca23af6c8636e2861a011ff02d982c507b
 2020-03-12 06:03:40 +00:00
Menghan Li
873b50a46a Merge "Update R acessibility assets and strings (2/n)" into rvc-dev 2020-03-12 05:37:32 +00:00
Menghan Li
3fd654becb Merge "Update R acessibility assets and strings (1/n)" into rvc-dev 2020-03-12 05:37:19 +00:00
Tim Peng
e7bc985a35 Remove unnecessary permission for output switcher panel 
-Make this as a generic panel
-Add CTS to make sure this panel works on all Android devices

Bug: 151272095
Test: make -j50 RunSettingsRoboTests
Change-Id: Ie4fe277144a586eaf902dc5b700027153b1c86ab
 2020-03-12 05:13:26 +00:00
Automerger Merge Worker
aa16276bbe Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c 
Change-Id: Id0a18ac99f937486ebfecf026a9252bcd87aa0e0
 2020-03-12 05:06:24 +00:00
Automerger Merge Worker
70f287362c Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c 
Change-Id: I5f7a480c4dd5b035ad8e61e430d235dcd23c76e6
 2020-03-12 04:48:55 +00:00
TreeHugger Robot
40613ef30c Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev 2020-03-12 04:35:32 +00:00
zoey chen
cf33e51a55 Fix Card 2's pin shows ON when only turn on card 1's pin 
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
Merged-In: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
 2020-03-12 03:56:46 +00:00
Automerger Merge Worker
e5c6d8a658 Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f 
Change-Id: I8dae29cedff1eb8b29d3244ae0b3343ae51fbed7
 2020-03-12 03:16:20 +00:00
Automerger Merge Worker
93fedb0e3f Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 
Change-Id: If84bded0c61524cda613f57ff0b7839817655eae
 2020-03-12 03:04:00 +00:00