am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread

Merge commit '6d44456da87dccb15b4086696f5e72a5aa198926' into gingerbread-plus-aosp

* commit '6d44456da87dccb15b4086696f5e72a5aa198926':
  Make USB mass storage hide keyguard when shown.
This commit is contained in:
Dianne Hackborn
2010-10-07 07:13:47 -07:00
committed by Android Git Automerger

View File

@@ -46,6 +46,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.util.Log;
import java.util.List;
@@ -102,6 +103,11 @@ public class UsbStorageActivity extends Activity
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setProgressBarIndeterminateVisibility(true);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
if (Environment.isExternalStorageRemovable()) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
}
setTitle(getString(com.android.internal.R.string.usb_storage_activity_title));
setContentView(com.android.internal.R.layout.usb_storage_activity);