drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2011-11-17 19:44:14 -08:00
committed by Android (Google) Code Review
parent 70bded0ab8 c992087d09
commit 8c54182f0b
5 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/AndroidManifest.xml
View File

@ -67,7 +67,8 @@
<activity android:name=".usb.UsbStorageActivity" <activity android:name=".usb.UsbStorageActivity"
android:excludeFromRecents="true"> android:label="@*android:string/usb_storage_activity_title"
android:excludeFromRecents="true">
</activity> </activity>
<activity android:name="com.android.internal.app.ExternalMediaFormatActivity" <activity android:name="com.android.internal.app.ExternalMediaFormatActivity"
android:theme="@*android:style/Theme.Dialog.Alert" android:theme="@*android:style/Theme.Dialog.Alert"

BIN
packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

5
packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java
View File

@ -114,16 +114,11 @@ public class UsbStorageActivity extends Activity
thr.start(); thr.start();
mAsyncStorageHandler = new Handler(thr.getLooper()); mAsyncStorageHandler = new Handler(thr.getLooper());
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setProgressBarIndeterminateVisibility(true);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
if (Environment.isExternalStorageRemovable()) { if (Environment.isExternalStorageRemovable()) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); 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); setContentView(com.android.internal.R.layout.usb_storage_activity);
mIcon = (ImageView) findViewById(com.android.internal.R.id.icon); mIcon = (ImageView) findViewById(com.android.internal.R.id.icon);