diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-06 11:19:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-06 11:19:51 -0700 |
| commit | 6d44456da87dccb15b4086696f5e72a5aa198926 (patch) | |
| tree | 29a3a2a85ed2e5a9bf7cd976cda3229a8af665d4 /packages/SystemUI | |
| parent | 18c000896f9cc77e790b92f29d4ddc18b213e1fb (diff) | |
| parent | 20754649790424455e8a5dbd5ab1fa0e0a4ca87e (diff) | |
| download | frameworks_base-6d44456da87dccb15b4086696f5e72a5aa198926.zip frameworks_base-6d44456da87dccb15b4086696f5e72a5aa198926.tar.gz frameworks_base-6d44456da87dccb15b4086696f5e72a5aa198926.tar.bz2 | |
Merge "Make USB mass storage hide keyguard when shown." into gingerbread
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java index 29df28e..d024dd0 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java @@ -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); |