Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 6862690..d09b23e 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -26,7 +26,7 @@
<item name="android:layout_marginTop">8dip</item>
<item name="android:layout_marginStart">16dip</item>
<item name="android:layout_marginEnd">16dip</item>
- <item name="android:orientation">horizontal</item>
+ <item name="android:orientation">vertical</item>
<item name="android:gravity">center_vertical</item>
</style>
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b72d5c5..861930a 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -425,6 +425,7 @@
if (mFirstPin.equals(pin)) {
final boolean isFallback = getActivity().getIntent().getBooleanExtra(
LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+ boolean wasSecureBefore = mLockPatternUtils.isSecure();
mLockPatternUtils.clearLock(isFallback);
final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
@@ -433,7 +434,9 @@
getActivity().setResult(RESULT_FINISHED);
getActivity().finish();
mDone = true;
- startActivity(RedactionInterstitial.createStartIntent(getActivity()));
+ if (!wasSecureBefore) {
+ startActivity(RedactionInterstitial.createStartIntent(getActivity()));
+ }
} else {
CharSequence tmp = mPasswordEntry.getText();
if (tmp != null) {
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 3d3ef16..2c3beef 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -540,6 +540,8 @@
final boolean isFallback = getActivity().getIntent()
.getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+ boolean wasSecureBefore = utils.isSecure();
+
final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
utils.setCredentialRequiredToDecrypt(required);
@@ -553,7 +555,9 @@
getActivity().setResult(RESULT_FINISHED);
getActivity().finish();
mDone = true;
- startActivity(RedactionInterstitial.createStartIntent(getActivity()));
+ if (!wasSecureBefore) {
+ startActivity(RedactionInterstitial.createStartIntent(getActivity()));
+ }
}
}
}
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 49fd6df..e36e92c 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -137,6 +137,8 @@
private boolean mServiceEnabled;
+ private SearchView mSearchView;
+
@Override
public void onResume() {
super.onResume();
@@ -148,6 +150,9 @@
@Override
public void onPause() {
mSettingsContentObserver.unregister(getContentResolver());
+ if (mSearchView != null) {
+ mSearchView.setOnQueryTextListener(null);
+ }
super.onPause();
}
@@ -408,8 +413,8 @@
MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);
if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {
- SearchView searchView = (SearchView) searchItem.getActionView();
- searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+ mSearchView = (SearchView) searchItem.getActionView();
+ mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
return true;
@@ -421,7 +426,7 @@
return true;
}
});
- searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+ mSearchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@Override
public void onViewAttachedToWindow(View view) {
if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {