Merge "Add action for search results including the count" into mnc-dev
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index cfeddbb..bf17b9f 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -93,6 +93,10 @@
private void setLockToAppEnabled(boolean isEnabled) {
Settings.System.putInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED,
isEnabled ? 1 : 0);
+ if (isEnabled) {
+ // Set the value to match what we have defaulted to in the UI.
+ setScreenLockUsedSetting(isScreenLockUsed());
+ }
}
private boolean isScreenLockUsed() {
@@ -115,9 +119,13 @@
return false;
}
}
+ setScreenLockUsedSetting(isEnabled);
+ return true;
+ }
+
+ private void setScreenLockUsedSetting(boolean isEnabled) {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
isEnabled ? 1 : 0);
- return true;
}
@Override
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
index 9ef372a..6e6fe4b 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
@@ -22,9 +22,11 @@
import android.graphics.Color;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
+import android.widget.TextView;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
@@ -93,8 +95,22 @@
return (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
}
+ protected void setHeaderText(int resId, boolean force) {
+ TextView layoutTitle = (TextView) getSetupWizardLayout().findViewById(
+ R.id.suw_layout_title);
+ CharSequence previousTitle = layoutTitle.getText();
+ CharSequence title = getText(resId);
+ if (previousTitle != title || force) {
+ if (!TextUtils.isEmpty(previousTitle)) {
+ layoutTitle.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
+ }
+ getSetupWizardLayout().setHeaderText(title);
+ setTitle(title);
+ }
+ }
+
protected void setHeaderText(int resId) {
- getSetupWizardLayout().setHeaderText(getText(resId));
+ setHeaderText(resId, false /* force */);
}
protected Button getNextButton() {
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 49c5e82..80584f7 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -227,7 +227,8 @@
mStartMessage.setVisibility(View.VISIBLE);
mRepeatMessage.setVisibility(View.INVISIBLE);
} else {
- setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);
+ setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title,
+ true /* force */);
mStartMessage.setVisibility(View.INVISIBLE);
mRepeatMessage.setVisibility(View.VISIBLE);
}