Merge "Make gradients look slightly better"

Author: Romain Guy

libs/hwui/GradientCache.cpp

@@ -120,7 +120,7 @@ Texture* GradientCache::addLinearGradient(GradientCacheEntry& gradient,
     width = width < mMaxTextureSize ? width : mMaxTextureSize;
 
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, 1);
+    bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, 4);
     bitmap.allocPixels();
     bitmap.eraseColor(0);
 
@@ -137,7 +137,7 @@ Texture* GradientCache::addLinearGradient(GradientCacheEntry& gradient,
     p.setStyle(SkPaint::kStrokeAndFill_Style);
     p.setShader(localShader)->unref();
 
-    canvas.drawRectCoords(0.0f, 0.0f, bitmap.width(), 1.0f, p);
+    canvas.drawRectCoords(0.0f, 0.0f, bitmap.width(), 4.0f, p);
 
     // Asume the cache is always big enough
     const uint32_t size = bitmap.rowBytes() * bitmap.height();

tests/HwAccelerationTest/AndroidManifest.xml

@@ -41,6 +41,15 @@
             </intent-filter>
         </activity>
 
+        <activity
+                android:name="BigGradientActivity"
+                android:label="_BigGradient">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        
         <activity
                 android:name="DatePickerActivity"
                 android:label="_DatePicker">

tests/HwAccelerationTest/src/com/android/test/hwui/BigGradientActivity.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.test.hwui;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.Shader;
+import android.os.Bundle;
+import android.view.View;
+
+public class BigGradientActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        setContentView(new BigGradientView(this));
+    }
+
+    private class BigGradientView extends View {
+        public BigGradientView(Context context) {
+            super(context);
+        }
+
+        @Override
+        protected void onDraw(Canvas canvas) {
+            Paint p = new Paint();
+            p.setShader(new LinearGradient(0.0f, 0.0f, 0.0f, getHeight(), 0xff000000,
+                    0xff333333, Shader.TileMode.CLAMP));
+
+            canvas.drawRect(0.0f, 0.0f, getWidth(), getHeight(), p);
+        }
+    }
+}