diff options
| author | Adam Powell <adamp@google.com> | 2012-10-13 01:32:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-13 01:32:22 -0700 |
| commit | e19424f29d01b7ff00b8f3996f635b0bf2b085d8 (patch) | |
| tree | 328fd7c756edd835451d6477550082c3dddc77fe /src/com/android | |
| parent | 6b3bb24fc07a129dbc350f4c9891a7ec61937828 (diff) | |
| parent | fcf460eb874953fd663711fe7d6164f700d181ae (diff) | |
| download | packages_apps_Settings-e19424f29d01b7ff00b8f3996f635b0bf2b085d8.zip packages_apps_Settings-e19424f29d01b7ff00b8f3996f635b0bf2b085d8.tar.gz packages_apps_Settings-e19424f29d01b7ff00b8f3996f635b0bf2b085d8.tar.bz2 | |
am fcf460eb: am cc7f6e92: am a5f6762a: Show the overflow in the right place for keyguard settings
* commit 'fcf460eb874953fd663711fe7d6164f700d181ae':
Show the overflow in the right place for keyguard settings
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/Settings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 2d16262..f045db0 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -17,6 +17,7 @@ package com.android.settings; import com.android.internal.util.ArrayUtils; +import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.accounts.AccountSyncSettings; import com.android.settings.accounts.AuthenticatorHelper; import com.android.settings.accounts.ManageAccountsSettings; @@ -391,7 +392,8 @@ public class Settings extends PreferenceActivity ManageAccountsSettings.class.getName().equals(fragmentName) || VpnSettings.class.getName().equals(fragmentName) || SecuritySettings.class.getName().equals(fragmentName) || - InstalledAppDetails.class.getName().equals(fragmentName)) { + InstalledAppDetails.class.getName().equals(fragmentName) || + ChooseLockGenericFragment.class.getName().equals(fragmentName)) { intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true); } |