PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,724 Commits 1 Branch 0 Tags
3cb8e75d852cc138cb64833bb9f870368b1d1c77
Commit Graph

15 Commits

Author SHA1 Message Date
Edgar Wang
3cb8e75d85 Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b 
Change-Id: Ibb53d7709aab6f98d61045a5745fd0d52d108346
 2020-05-28 06:59:05 +00:00
Wang Han
719b573173 Fix NPE if default supervisor is not defined 
* Checking for null does not work sadly. This fixes NPE at
   calling who.compareTo(supervisorComponent).

Change-Id: Ie49df625b1514b1d1e5f8063db66dce4a5050039
 2020-05-15 14:06:11 +00:00
Alex Johnston
dd1747011a Add policy transparency dialog to 'Remove work profile' 
* For a work profile on an organization-owned device,
  no explanation was being shown to the user as to
  why the work profile cannot be removed.
* This CL adds a policy transparency dialog when the
  'Remove work profile' option is selected in the
  'Device Admin' Settings screen.

Bug: 149391073
Test: Manual testing
      atest com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAddTest
Change-Id: I8221973ed16fcc7c79f5897c3bea063050ae00a6
 2020-03-09 09:25:49 +00:00
Raff Tsai
6ff13962a3 Fix talkback issue 
Fixes: 141226569
Test: manual
Change-Id: I631554ab33d6cc77f3d3f2e4625d359a802dd5b5
 2019-10-04 11:59:56 +08:00
Varun Shah
3e228f5a1a Update design for Family Link supervision enrollment dialog. 
Bug: 124066840
Test: manual (trigger dialog via adb shell command)
Change-Id: Iff79a2ed034bb0128ce6c573ceea58c7a9f1c985
 2019-05-22 11:48:07 -07:00
Michael Wachenschwanz
35eef604a3 Simplify user flow for setting default supervisor as PO 
A follow up CL will clean up and separate the DeviceAdminAdd and
ProfileOwnerAdd logic (see b/131713071)

Bug: 124066840
Test: manual (overlay config_defaultSupervisionProfileOwnerComponent and
confirm only that component can be set as profile owner after setup is
complete)
Test: manual (install CtsVerifier, adb shell am start -n "com.android.cts.verifier/.admin.tapjacking.OverlayingActivity", user should not be able to click the "Allow" button)

Change-Id: Iccd931801145719110ce75421c35db80ea651779
 2019-05-02 03:42:06 +00:00
Fan Zhang
31b210017b Migrate all MetricsProto enums to SettingsEnums 
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
 2019-01-17 14:55:42 -08:00
Fan Zhang
a6c7db1888 Update logging: switch a bunch of action() logging calls. 
Use generic action(int, int, int, String, int) instead of
action(Context, int, string, Pair...) when possible.

Bug: 117860032
Test: robotests
Change-Id: I5213b52b2b10d80a3c488c37718df81b3b0a428f
 2018-11-13 21:50:34 -08:00
Philip P. Moltmann
e3f721132a RestrictedLockUtils was split into ...Internal 
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
 2018-08-30 08:11:39 -07:00
Fan Zhang
23f8d59d02 Sort imports 
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
 2018-08-28 22:13:15 +00:00
tmfang
41ab6b4bf8 Migrate all AlertDialogs to AndroidX version 
This CL only changed AlertDialog imports.
So, reviewer can review it easily.

Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
 2018-07-20 11:32:13 +08:00
jackqdyulei
f1213365fc Unrestrict SMS/PHONE app if it been set active 
If an app been set default SMS/PHONE app, we need to unrestrict this
app. This CL extract a common function and invoke it when necessary.

Change-Id: Id29c5138438aa6f6f22cdd9c4ecf336de8481782
Fixes: 80305978
Test: robotests
 2018-07-18 12:32:34 -07:00
tmfang
99cc23d0da Settings Fragment Migration (Change imports) 
This commit *only* changes imports and optimize imports.
We don't do anything else.

This patch can't compile pass and run test case.
We will update other patches to fix these problem.

Change list.

1. import android.app.Fragment; ->
   import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
   import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
   import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
   import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
   import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
   import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
   import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
   import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
    import androidx.loader.app.LoaderManager.LoaderCallbacks;

Bug: 110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
 2018-07-11 18:23:51 -07:00
Lei Yu
154af9a750 Unrestrict app if it been set as device admin app 
Fix merge conlict in imports area

Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
 2018-07-02 17:36:27 -07:00
Fan Zhang
ca6d86c5ab Move device admin viewer/adder to specialaccess package. 
Bug: 110207366
Test: robo
Change-Id: I51552dcc5ec6525040cfde17087b7f3f6b21b581
 2018-06-15 08:56:14 -07:00