Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cef38339 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

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

* commit '6d44456d':
  Make USB mass storage hide keyguard when shown.
parents 4790a2e2 6d44456d

packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -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);