Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
This commit is contained in:
The Android Open Source Project
2010-05-17 08:56:54 -07:00
parent c7388e3541 c4fee63301
commit f7fb5331e5
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/widget/ProgressBar.java
View File

@@ -947,4 +947,20 @@ public class ProgressBar extends View {
setProgress(ss.progress); setProgress(ss.progress);
setSecondaryProgress(ss.secondaryProgress); setSecondaryProgress(ss.secondaryProgress);
} }
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
if (mIndeterminate) {
startAnimation();
}
}
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
if (mIndeterminate) {
stopAnimation();
}
}
} }

4
media/libdrm/mobile2/Android.mk
View File

@@ -74,6 +74,10 @@ LOCAL_MODULE := libdrm2
ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86) ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)
LOCAL_CFLAGS += -DUSTL_ANDROID_X86 LOCAL_CFLAGS += -DUSTL_ANDROID_X86
else
ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-sh)
LOCAL_CFLAGS += -DUSTL_ANDROID_SH
endif
endif endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

2
media/libdrm/mobile2/src/util/ustl-1.0/uutility.h
View File

@@ -370,7 +370,7 @@ namespace simd {
/// implicit casts to pointer from an integral type. Ironically, such an /// implicit casts to pointer from an integral type. Ironically, such an
/// implicit cast is already detected by gcc. /// implicit cast is already detected by gcc.
/// ///
#if defined(USTL_ANDROID_X86) #if defined(USTL_ANDROID_X86) || defined(USTL_ANDROID_SH)
#define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type) #define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type)
#else #else
#define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type) \ #define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type) \