8 Commits

Author	SHA1	Message	Date
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
Pavel Grafov	80d9020cc2	Ask profile password before unifying to prevent untrusted reset ... Test: make -j RunSettingsRoboTests Test: manual, unify when profile lock is compliant Test: manual, unify when profile lock is not compliant Test: manual, unify when profile lock is empty Fixes: 110262879 Change-Id: I0dfa885f2a0e44e09c217b3e7766b367f1340c9e	2018-07-06 14:40:10 +01:00
Fan Zhang	c7162cd24d	Reorder and clean up imports. ... Test: rebuild Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68	2018-06-18 15:45:09 -07:00
hjchangliao	e86eec0c07	Rename SubSettingLauncher.setTitle, add java doc ... For make this method usage more clear, setTitle(charSequence) rename as setTitleText, add java doc: it is only for user generated string setTitle(int) rename as setTitleRes. Change-Id: I972cb6a8ff90873dfdc25c23f6dc3d68103c8e4e Fixes: 78347436 Test: make RunSettingsRoboTests	2018-05-09 10:00:05 +08:00
Aurimas Liutikas	e0069d332d	Migrate Settings to androidx. ... Test: make Settings Bug: 76692459 Change-Id: I941dea40562170649bf056e675cc32e5163c0e39	2018-04-20 12:52:29 -07:00
Fan Zhang	b1d6c76b53	Migrate more settings to SubSettingLauncher ... Bug: 73250851 Test: robotest Change-Id: Ifc27b90d68bf4a907f169e19338e9b52ea5f9922	2018-02-18 21:10:03 -08:00
Fan Zhang	73dc479ab5	Remove security settings v1 code ... Change-Id: I958ed1588009b91f64cd8ecb98208e72a891903e Fixes: 32953042 Test: robotests	2018-01-29 13:17:05 -08:00
Fan Zhang	928ddbe731	Merge sub pages for lock/unlock into 1 xml. ... And create PreferenceControllers for each setting The page is still pretty janky and controllers are invoked manually. Next CL will clean these up. Bug: 32953042 Test: TODO Change-Id: I1d7478324f5de4fdb464d79f89086f7e79c0ee67	2018-01-04 15:02:36 -08:00