PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,632 Commits 1 Branch 0 Tags
cea28334a2b59c41037f98bf54a43a0da1df9427
Commit Graph

18 Commits

Author SHA1 Message Date
Yanting Yang
e14a3a3022 Make work profile sounds section as its own entry 
Also rephrase the strings by request.

Bug: 174964721
Test: manual
Change-Id: I760249cd48832f2739ab7ca33706cd11dd34a6b5
 2021-03-30 22:37:01 +08:00
Fan Zhang
7db118e367 Mass clean up: don't cast class when not needed. 
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
 2019-02-14 12:26:09 -08: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
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
Fan Zhang
176ccd0c35 Clean up: fix incorrect @VisibleForTesting imports 
Test: rebuild and robotests
Change-Id: I33d7ee1c0622c01f592920baaf01d44ad19d9a13
 2018-07-13 13:08:53 -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
Fan Zhang
3f34335e2e Suppress work-profile search terms when no AfW is on device 
- Share the same set of pref controller between main UI and search
  in AccountDashboardFragment.
- Update WorkSoundPreferenceController to actually do something for
  updateNonIndexable() method.
- LockscreenDashboardFragment to also suppress "Work notification" header. I
  think we just missed it previously.

Change-Id: Ifa6f9b2077c9810ffff33f240929f418d4a8a5aa
Fixes: 62167659
Test: robotests
 2018-06-04 22:37:42 +00:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx. 
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
 2018-04-20 12:52:29 -07:00
Tony Mantler
1d583e125f Make PreferenceController a mixin 
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
 2017-06-26 10:58:36 -07:00
Juan Lang
777ed2535a Depend on SettingsLib's version of lifecycle and FooterMixin. 
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.

Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
     && make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
 2017-05-12 11:10:46 -07:00
Fan Zhang
dc9a82f5b0 Fix a crash when resuming sound setting with AfW on Ryu 
Also renamed a few xmls

Change-Id: I8ff5a778a39ea45471a27048be4ea2f21075872a
Fix: 36357493
Test: make RunSettingsRoboTests
 2017-03-16 11:26:33 -07:00
Fan Zhang
3515cc8217 Refactor sound setting -> work profile initialization logic. 
- Some formatting change
- Merge work profile sound settings into main sound setting xml file, and
  use existing WorkCategory to host it. This category automatically hides
  everything within if user is not using work profile.
- Remove logic for manually populating work profile sound setting into
  the UI, thus removing the animation glitch when expanding advanced
  button.

Change-Id: I90459e5cd1d3d20a97ea3629e143ebf13dbd0f76
Fix: 35959624
Test: make RunSettingsRoboTests
 2017-03-09 17:49:54 -08:00
Robin Lee
805d59dc1d Fix 4 broken work profile tests 
Commit 2953f31b61 skipped
RunSettingsRoboTests. The tests started failing because
WorkSoundPreferenceController calls UserManager.isUserUnlocked(int) now
which is not implemented in robolectric.

Fixed by adding a wrapper method to AudioHelper.

Fix: 34819603
Test: make RunSettingsRoboTests
Change-Id: Ia79cc4def9442706752f7e7b9a895ffa8150fd9d
 2017-01-31 00:08:52 +00:00
Robin Lee
0c341d7357 Merge "Prompt to start user before choosing a new ringtone" 2017-01-27 14:03:12 +00:00
Robin Lee
2953f31b61 Prompt to start user before choosing a new ringtone 
Dead users can't hear, nor see, ringtones. Let's wake them up and give
them a good shake first.

Until then, show a nice friendly "work profile isn't available" message.
Or depending on locale something confusing, egregious, and mismatched
like "work profile isn't available" instead.

Fix: 34735015
Bug: 34734809
Test: make RunSettingsRoboTests && make Settings && adb install -r $OUT/system/priv-app/Settings/Settings.apk && then reboot the device to see what happens
Change-Id: I86e61a7f3f654d7f38f04c43227a31e2f288e18f
 2017-01-26 18:20:45 +00:00
Andre Lago
e474bd5f0f [Sound Settings] Act on managed user added/removed 
Use the new callbacks for managed profile being added/removed to update
visibility of work sound settings

Test: make RunSettingsRoboTests
Bug: 31701003

Change-Id: I3167e52102bcf9f18a58e85dd9c3117691c6ad3f
 2017-01-19 11:48:20 +00:00
Doris Ling
2adb6ea4ec Refactor Work sounds in SoundSettings. 
- final round of refactoring SoundSettings to use preference
  controller.
- add work sound controller to control all the work profile sound
  settings.

Change-Id: Ifa9f9c1f717ca292576f077311fe284325e12651
Fixes: 32276590
Test: make RunSettingsRoboTests
 2016-12-15 14:53:27 -08:00