diff options
Diffstat (limited to 'src/com/android/camera/SettingsActivity.java')
| -rw-r--r-- | src/com/android/camera/SettingsActivity.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 32c6b5cad..d4f5ac13a 100644 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -39,10 +39,13 @@ import android.preference.PreferenceGroup; import android.preference.PreferenceActivity; import android.preference.PreferenceManager; import android.preference.SwitchPreference; +import android.view.Window; +import android.view.WindowManager; import android.util.Log; import android.widget.Toast; import org.codeaurora.snapcam.R; +import com.android.camera.util.CameraUtil; import java.util.List; import java.util.Map; @@ -86,6 +89,11 @@ public class SettingsActivity extends PreferenceActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + final boolean isSecureCamera = getIntent().getBooleanExtra( + CameraUtil.KEY_IS_SECURE_CAMERA, false); + if (isSecureCamera) { + setShowInLockScreen(); + } mSettingsManager = SettingsManager.getInstance(); addPreferencesFromResource(R.xml.setting_menu_preferences); @@ -213,5 +221,14 @@ public class SettingsActivity extends PreferenceActivity { protected void onStop() { super.onStop(); mSharedPreferences.unregisterOnSharedPreferenceChangeListener(mSharedPreferenceChangeListener); + finish(); + } + + private void setShowInLockScreen() { + // Change the window flags so that secure camera can show when locked + Window win = getWindow(); + WindowManager.LayoutParams params = win.getAttributes(); + params.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; + win.setAttributes(params); } }
\ No newline at end of file |