Misc fixes for User page and my device info page
- Rename UserAndAccountDashboard* to AccountDashboard* - Move emergency info from account to device info page - Move auto sync data toggles (4 of them) from Account page to user page - Move the controllers too. UserSettings is a not a DashboardFragment so I had to manually call each controller method. TODO: refactor UserSettings to a DashboardFragment - Move legal information/regulatory info above advance button within device info page. Fixes: 72523158 Bug: 71871075 Test: robotests Change-Id: I1b8af8af61e49d17926f984978a09a974b6c62e1
This commit is contained in:
@@ -22,7 +22,7 @@ import android.support.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
|
||||
import com.android.settings.users.AddUserWhenLockedPreferenceController;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.notification.LockScreenNotificationPreferenceController;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
@@ -86,10 +86,8 @@ public class LockscreenDashboardFragment extends DashboardFragment
|
||||
KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);
|
||||
lifecycle.addObserver(notificationController);
|
||||
controllers.add(notificationController);
|
||||
final AddUserWhenLockedPreferenceController addUserWhenLockedController =
|
||||
new AddUserWhenLockedPreferenceController(context, KEY_ADD_USER_FROM_LOCK_SCREEN);
|
||||
lifecycle.addObserver(addUserWhenLockedController);
|
||||
controllers.add(addUserWhenLockedController);
|
||||
controllers.add(new AddUserWhenLockedPreferenceController(
|
||||
context, KEY_ADD_USER_FROM_LOCK_SCREEN, lifecycle));
|
||||
mOwnerInfoPreferenceController =
|
||||
new OwnerInfoPreferenceController(context, this, lifecycle);
|
||||
controllers.add(mOwnerInfoPreferenceController);
|
||||
@@ -121,7 +119,7 @@ public class LockscreenDashboardFragment extends DashboardFragment
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new LockScreenNotificationPreferenceController(context));
|
||||
controllers.add(new AddUserWhenLockedPreferenceController(context,
|
||||
KEY_ADD_USER_FROM_LOCK_SCREEN));
|
||||
KEY_ADD_USER_FROM_LOCK_SCREEN, null /* lifecycle */));
|
||||
controllers.add(new OwnerInfoPreferenceController(
|
||||
context, null /* fragment */, null /* lifecycle */));
|
||||
controllers.add(new LockdownButtonPreferenceController(context));
|
||||
|
Reference in New Issue
Block a user