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

Commit 65035d2a authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass... 

am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1

* commit '8c54182f':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
parents 1a783be3 8c54182f

packages/SystemUI/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 




        <activity android:name=".usb.UsbStorageActivity"

                  android:label="@*android:string/usb_storage_activity_title"

                  android:excludeFromRecents="true">

        </activity>

        <activity android:name="com.android.internal.app.ExternalMediaFormatActivity"

packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png

−202 B (7.06 KiB)
Loading image diff...

packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png

−57 B (4.03 KiB)
Loading image diff...

packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png

−785 B (10.9 KiB)
Loading image diff...

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

+0 −5
Original line number Diff line number Diff line
@@ -114,16 +114,11 @@ public class UsbStorageActivity extends Activity 
        thr.start();

        mAsyncStorageHandler = new Handler(thr.getLooper());



        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);



        mIcon = (ImageView) findViewById(com.android.internal.R.id.icon);