diff options
author | Fan Zhang <zhfan@google.com> | 2018-01-26 10:15:56 -0800 |
---|---|---|
committer | Fan Zhang <zhfan@google.com> | 2018-01-26 12:39:34 -0800 |
commit | 881d5796204262f045d1f30596b824505ad8c0b5 (patch) | |
tree | 5ba2da440a281eb4a36a3a33d03e970a36c52f72 /src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java | |
parent | c24930aaf21b2a05e872df6a13fdba48cab61893 (diff) | |
download | packages_apps_Settings-881d5796204262f045d1f30596b824505ad8c0b5.tar.gz packages_apps_Settings-881d5796204262f045d1f30596b824505ad8c0b5.tar.bz2 packages_apps_Settings-881d5796204262f045d1f30596b824505ad8c0b5.zip |
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
Diffstat (limited to 'src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java')
-rw-r--r-- | src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java deleted file mode 100644 index c93ef730c0..0000000000 --- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.accounts; - -import android.content.Context; -import android.provider.Settings.Global; -import android.support.v7.preference.Preference; - -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.users.UserCapabilities; -import com.android.settingslib.RestrictedSwitchPreference; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnPause; -import com.android.settingslib.core.lifecycle.events.OnResume; - -public class AddUserWhenLockedPreferenceController extends AbstractPreferenceController - implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, - LifecycleObserver, OnPause, OnResume { - - private final String mPrefKey; - private final UserCapabilities mUserCaps; - private boolean mShouldUpdateUserList; - - public AddUserWhenLockedPreferenceController(Context context, String key) { - super(context); - mPrefKey = key; - mUserCaps = UserCapabilities.create(context); - } - - @Override - public void updateState(Preference preference) { - RestrictedSwitchPreference restrictedSwitchPreference = - (RestrictedSwitchPreference) preference; - int value = Global.getInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 0); - restrictedSwitchPreference.setChecked(value == 1); - restrictedSwitchPreference.setDisabledByAdmin( - mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - Boolean value = (Boolean) newValue; - Global.putInt(mContext.getContentResolver(), - Global.ADD_USERS_WHEN_LOCKED, value != null && value ? 1 : 0); - return true; - } - - @Override - public void onPause() { - mShouldUpdateUserList = true; - } - - @Override - public void onResume() { - if (mShouldUpdateUserList) { - mUserCaps.updateAddUserCapabilities(mContext); - } - } - - @Override - public boolean isAvailable() { - return mUserCaps.isAdmin() && - (!mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()); - } - - @Override - public String getPreferenceKey() { - return mPrefKey; - } -} |