diff options
| author | Adam Powell <adamp@google.com> | 2011-11-18 14:47:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 14:47:55 -0800 |
| commit | 74b7c892cb1465bd85e6fc5e4db77051f8f39bd6 (patch) | |
| tree | a27e696f75004216f6ee92b6d16416d5e836d735 /packages | |
| parent | b32f5037e9870a2dc7034b6c6a95f903dc2a1f0c (diff) | |
| parent | 65035d2a72fd8c847aa9c78c0e97058535ec18a5 (diff) | |
| download | frameworks_base-74b7c892cb1465bd85e6fc5e4db77051f8f39bd6.zip frameworks_base-74b7c892cb1465bd85e6fc5e4db77051f8f39bd6.tar.gz frameworks_base-74b7c892cb1465bd85e6fc5e4db77051f8f39bd6.tar.bz2 | |
am 65035d2a: am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
* commit '65035d2a72fd8c847aa9c78c0e97058535ec18a5':
Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png | bin | 7432 -> 7230 bytes | |||
| -rw-r--r-- | packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png | bin | 4179 -> 4122 bytes | |||
| -rw-r--r-- | packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png | bin | 11968 -> 11183 bytes | |||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java | 5 |
5 files changed, 2 insertions, 6 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index dff41c9..e937587 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -67,7 +67,8 @@ <activity android:name=".usb.UsbStorageActivity" - android:excludeFromRecents="true"> + android:label="@*android:string/usb_storage_activity_title" + android:excludeFromRecents="true"> </activity> <activity android:name="com.android.internal.app.ExternalMediaFormatActivity" android:theme="@*android:style/Theme.Dialog.Alert" diff --git a/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png b/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png Binary files differindex cbd72fb..c02bd42 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png b/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png Binary files differindex 7651331..05cdd9a 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png b/packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png Binary files differindex b631779..2b2907b 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java index 43dfb96..e61ef8a 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java @@ -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); |
