PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Misc tweaks to Indexable usage and tests."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-03 01:22:24 +00:00
committed by Android (Google) Code Review
parent 8746d226d2 78ea7da54c
commit 710098c009
25 changed files with 170 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/security/ScreenPinningSettings.java
View File

@@ -34,7 +34,6 @@ import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.search.SearchIndexable;
@@ -51,7 +50,7 @@ import androidx.preference.SwitchPreference;
*/
@SearchIndexable
public class ScreenPinningSettings extends SettingsPreferenceFragment
implements SwitchBar.OnSwitchChangeListener, Indexable {
implements SwitchBar.OnSwitchChangeListener {
private static final CharSequence KEY_USE_SCREEN_LOCK = "use_screen_lock";
private static final int CHANGE_LOCK_METHOD_REQUEST = 43;

4
src/com/android/settings/security/screenlock/LockScreenPreferenceController.java
View File

@@ -54,11 +54,11 @@ public class LockScreenPreferenceController extends BasePreferenceController imp
public int getAvailabilityStatus() {
if (!mLockPatternUtils.isSecure(MY_USER_ID)) {
return mLockPatternUtils.isLockScreenDisabled(MY_USER_ID)
? DISABLED_FOR_USER : AVAILABLE;
? DISABLED_FOR_USER : AVAILABLE_UNSEARCHABLE;
} else {
return mLockPatternUtils.getKeyguardStoredPasswordQuality(MY_USER_ID)
== PASSWORD_QUALITY_UNSPECIFIED
? DISABLED_FOR_USER : AVAILABLE;
? DISABLED_FOR_USER : AVAILABLE_UNSEARCHABLE;
}
}