提交: 666e504d7f3fa4c49d0ebd4bb1453411991dbb05 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修订版: 666e504d7f3fa4c49d0ebd4bb1453411991dbb05 (tree)
• 时间: 2011-06-26 15:15:25
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge remote-tracking branch 'korg/froyo' into froyo-x86

更改概述

• modified: services/java/com/android/server/PackageManagerService.java
• modified: tools/layoutlib/.gitignore
• modified: tools/layoutlib/Android.mk
• add: tools/layoutlib/README
• modified: tools/layoutlib/bridge/.classpath
• modified: tools/layoutlib/bridge/Android.mk
• add: tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4.png
• add: tools/layoutlib/bridge/resources/bars/hdpi/status_bar_background.png
• add: tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4.png
• add: tools/layoutlib/bridge/resources/bars/phone_system_bar.xml
• add: tools/layoutlib/bridge/resources/bars/title_bar.xml
• add: tools/layoutlib/bridge/src/android/content/res/Resources_Theme_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/AvoidXfermode_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/Bitmap.java
• delete: tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java
• add: tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/BitmapShader.java
• add: tools/layoutlib/bridge/src/android/graphics/BitmapShader_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/BlurMaskFilter_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/Canvas.java
• add: tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/ColorFilter_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/ColorMatrixColorFilter_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/ComposePathEffect_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/ComposeShader.java
• add: tools/layoutlib/bridge/src/android/graphics/ComposeShader_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/CornerPathEffect_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/DashPathEffect.java
• add: tools/layoutlib/bridge/src/android/graphics/DashPathEffect_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/DiscretePathEffect_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/DrawFilter_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/EmbossMaskFilter_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/LayerRasterizer_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/LightingColorFilter_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/LinearGradient.java
• add: tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/MaskFilter_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/Matrix.java
• add: tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/Paint.java
• add: tools/layoutlib/bridge/src/android/graphics/PaintFlagsDrawFilter_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/Path.java
• add: tools/layoutlib/bridge/src/android/graphics/PathDashPathEffect_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/PathEffect_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/PixelXorXfermode_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/PorterDuffXfermode_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/RadialGradient.java
• add: tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/Rasterizer_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/Region_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/Shader.java
• add: tools/layoutlib/bridge/src/android/graphics/Shader_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/SumPathEffect_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/Typeface.java
• add: tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
• add: tools/layoutlib/bridge/src/android/graphics/Xfermode_Delegate.java
• delete: tools/layoutlib/bridge/src/android/graphics/{GradientShader.java => Gradient_Delegate.java}
• delete: tools/layoutlib/bridge/src/android/graphics/{SweepGradient.java => SweepGradient_Delegate.java}
• add: tools/layoutlib/bridge/src/android/os/Build_Delegate.java
• add: tools/layoutlib/bridge/src/android/os/HandlerThread_Delegate.java
• add: tools/layoutlib/bridge/src/android/os/Handler_Delegate.java
• add: tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java
• delete: tools/layoutlib/bridge/src/android/util/{FloatMath.java => FloatMath_Delegate.java}
• add: tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java
• delete: tools/layoutlib/bridge/src/android/{graphics/PorterDuffXfermode.java => view/View_Delegate.java}
• add: tools/layoutlib/bridge/src/com/android/internal/util/XmlUtils_Delegate.java
• modified: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
• modified: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/LayoutResult.java
• modified: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/NinePatchDrawable.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/ResourceValue.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeLayoutParamsMapAttributes.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/PhoneSystemBar.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/TitleBar.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/DelegateManager.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/GcSnapshot.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Stack.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/binding/BaseAdapter.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/binding/FakeAdapter.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/binding/FakeExpandableAdapter.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/Debug.java
• add: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/SparseWeakArray.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => android}/BridgeAssetManager.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => android}/BridgeContentResolver.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => android}/BridgeContext.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => android}/BridgeResources.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => android}/BridgeTypedArray.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => android}/BridgeXmlBlockParser.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => android}/BridgeXmlPullAttributes.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => impl}/FontLoader.java
• delete: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/{ => impl}/ResourceHelper.java
• delete: tools/layoutlib/bridge/src/{android/view => com/android/layoutlib/bridge/android}/BridgeInflater.java
• add: tools/layoutlib/bridge/tests/.classpath
• add: tools/layoutlib/bridge/tests/.project
• add: tools/layoutlib/bridge/tests/Android.mk
• delete: tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
• delete: tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/TestClassReplacement.java
• add: tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/TestDelegates.java
• delete: tools/layoutlib/bridge/tests/{ => src}/com/android/layoutlib/testdata/layout1.xml
• delete: tools/layoutlib/bridge/tests/{com/android/layoutlib/bridge => src/com/android/layoutlib/bridge/android}/BridgeXmlBlockParserTest.java
• delete: tools/layoutlib/bridge/tests/{com/android/layoutlib/bridge/AndroidGraphicsTests.java => src/android/graphics/Matrix_DelegateTest.java}
• delete: tools/layoutlib/bridge/{tests/com/android/layoutlib/testdata/button.9.png => resources/bars/mdpi/status_bar_background.png}
• modified: tools/layoutlib/create/README.txt
• add: tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/LayoutlibDelegate.java
• add: tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/Nullable.java
• add: tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/VisibleForTesting.java
• modified: tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java
• modified: tools/layoutlib/create/src/com/android/tools/layoutlib/create/ClassHasNativeVisitor.java
• modified: tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
• add: tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java
• add: tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
• add: tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java
• modified: tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
• modified: tools/layoutlib/create/src/com/android/tools/layoutlib/create/TransformClassAdapter.java
• modified: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmAnalyzerTest.java
• modified: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java
• add: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/ClassHasNativeVisitorTest.java
• add: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/DelegateClassAdapterTest.java
• modified: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/LogTest.java
• add: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/MockLog.java
• add: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/ClassWithNative.java
• add: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/ClassWithNative_Delegate.java
• add: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass.java
• add: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass_Delegate.java
• add: tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass_InnerClass_Delegate.java