summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout/gl_root_group.xml2
-rw-r--r--res/values-xlarge/dimensions.xml6
-rw-r--r--res/values-xlarge/styles.xml7
-rw-r--r--res/values/dimensions.xml20
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java2
-rw-r--r--src/com/android/gallery3d/app/SlideshowPage.java2
-rw-r--r--src/com/android/gallery3d/ui/AlbumLabelMaker.java23
-rw-r--r--src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java2
-rw-r--r--src/com/android/gallery3d/ui/AlbumSlotRenderer.java2
-rw-r--r--src/com/android/gallery3d/ui/GLCanvas.java2
-rw-r--r--src/com/android/gallery3d/ui/GLCanvasImpl.java9
-rw-r--r--tests/src/com/android/gallery3d/ui/GLCanvasStub.java1
12 files changed, 40 insertions, 38 deletions
diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml
index 76ff33b73..796c9cd7b 100644
--- a/res/layout/gl_root_group.xml
+++ b/res/layout/gl_root_group.xml
@@ -22,5 +22,5 @@
<View android:id="@+id/gl_root_cover"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@android:color/black"/>
+ android:background="@android:color/white"/>
</merge>
diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml
index 0b2defbbc..1a4c01185 100644
--- a/res/values-xlarge/dimensions.xml
+++ b/res/values-xlarge/dimensions.xml
@@ -20,12 +20,10 @@
<dimen name="stack_photo_height">165dp</dimen>
<!-- configuration for album set page -->
- <integer name="albumset_rows_land">3</integer>
- <integer name="albumset_rows_port">5</integer>
- <dimen name="albumset_slot_gap">1dp</dimen>
+ <integer name="albumset_rows_land">2</integer>
+ <integer name="albumset_rows_port">4</integer>
<!-- configuration for album page -->
<integer name="album_rows_land">3</integer>
<integer name="album_rows_port">5</integer>
- <dimen name="album_slot_gap">1dp</dimen>
</resources>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 7670f614d..2c6385ac6 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -14,13 +14,6 @@
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <style name="Theme.Gallery" parent="Theme.GalleryBase">
- <item name="android:displayOptions"></item>
- <item name="android:actionBarStyle">@style/Holo.ActionBar</item>
- <item name="android:windowBackground">@android:color/black</item>
- <item name="android:colorBackground">@null</item>
- <item name="android:colorBackgroundCacheHint">@null</item>
- </style>
<style name="DialogPickerTheme" parent="android:Theme.Holo.Dialog">
</style>
<bool name="picker_is_dialog">true</bool>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 92e671370..b950f0a90 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -20,22 +20,22 @@
<dimen name="stack_photo_height">120dp</dimen>
<!-- configuration for album set page -->
- <integer name="albumset_rows_land">2</integer>
- <integer name="albumset_rows_port">4</integer>
- <dimen name="albumset_slot_gap">1dp</dimen>
-
- <dimen name="albumset_label_background_height">40dp</dimen>
- <dimen name="albumset_title_offset">3dp</dimen>
- <dimen name="albumset_count_offset">4dp</dimen>
- <dimen name="albumset_title_font_size">14sp</dimen>
+ <integer name="albumset_rows_land">1</integer>
+ <integer name="albumset_rows_port">2</integer>
+ <dimen name="albumset_slot_gap">12dp</dimen>
+
+ <dimen name="albumset_label_background_height">45dp</dimen>
+ <dimen name="albumset_title_offset">10dp</dimen>
+ <dimen name="albumset_count_offset">10dp</dimen>
+ <dimen name="albumset_title_font_size">20sp</dimen>
<dimen name="albumset_count_font_size">12sp</dimen>
<dimen name="albumset_left_margin">6dp</dimen>
- <dimen name="albumset_icon_size">25dp</dimen>
+ <dimen name="albumset_icon_size">20dp</dimen>
<!-- configuration for album page -->
<integer name="album_rows_land">2</integer>
<integer name="album_rows_port">4</integer>
- <dimen name="album_slot_gap">1dp</dimen>
+ <dimen name="album_slot_gap">4dp</dimen>
<!-- configuration for manage page -->
<dimen name="cache_pin_size">24dp</dimen>
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index df648fdfd..c71312dd3 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -156,7 +156,7 @@ public class PhotoPage extends ActivityState implements
@Override
protected void renderBackground(GLCanvas view) {
- view.clearBuffer();
+ view.clearBuffer(0f, 0f, 0f, 1f);
}
@Override
diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java
index 5ec447f65..c0e35be26 100644
--- a/src/com/android/gallery3d/app/SlideshowPage.java
+++ b/src/com/android/gallery3d/app/SlideshowPage.java
@@ -99,7 +99,7 @@ public class SlideshowPage extends ActivityState {
@Override
protected void renderBackground(GLCanvas canvas) {
- canvas.clearBuffer();
+ canvas.clearBuffer(0f, 0f, 0f, 0f);
}
};
diff --git a/src/com/android/gallery3d/ui/AlbumLabelMaker.java b/src/com/android/gallery3d/ui/AlbumLabelMaker.java
index 93b37ce13..a689e6990 100644
--- a/src/com/android/gallery3d/ui/AlbumLabelMaker.java
+++ b/src/com/android/gallery3d/ui/AlbumLabelMaker.java
@@ -34,12 +34,11 @@ import com.android.gallery3d.util.ThreadPool;
import com.android.gallery3d.util.ThreadPool.JobContext;
public class AlbumLabelMaker {
- private static final int FONT_COLOR_TITLE = Color.WHITE;
- private static final int FONT_COLOR_COUNT = 0x80FFFFFF; // 50% white
+ private static final int FONT_COLOR_TITLE = Color.BLACK;
+ private static final int FONT_COLOR_COUNT = 0x80000000;
- // We keep a border around the album label to prevent aliasing
- private static final int BORDER_SIZE = 1;
- private static final int BACKGROUND_COLOR = 0x60000000; // 36% Dark
+ private static final int BORDER_SIZE = 0;
+ private static final int BACKGROUND_COLOR = 0xFFFFFFFF;
private final AlbumSetSlotRenderer.LabelSpec mSpec;
private final TextPaint mTitlePaint;
@@ -58,7 +57,7 @@ public class AlbumLabelMaker {
mContext = context;
mSpec = spec;
mTitlePaint = getTextPaint(spec.titleFontSize, FONT_COLOR_TITLE, false);
- mCountPaint = getTextPaint(spec.countFontSize, FONT_COLOR_COUNT, true);
+ mCountPaint = getTextPaint(spec.countFontSize, FONT_COLOR_COUNT, false);
mLocalSetIcon = new LazyLoadedBitmap(R.drawable.frame_overlay_gallery_folder);
mPicasaIcon = new LazyLoadedBitmap(R.drawable.frame_overlay_gallery_picasa);
@@ -89,7 +88,7 @@ public class AlbumLabelMaker {
paint.setTextSize(textSize);
paint.setAntiAlias(true);
paint.setColor(color);
- paint.setShadowLayer(2f, 0f, 0f, Color.BLACK);
+ //paint.setShadowLayer(2f, 0f, 0f, Color.LTGRAY);
if (isBold) {
paint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
}
@@ -181,23 +180,25 @@ public class AlbumLabelMaker {
// draw title
if (jc.isCancelled()) return null;
- int x = s.leftMargin;
+ int x = s.leftMargin + s.iconSize;
int y = s.titleOffset;
drawText(canvas, x, y, title, labelWidth - s.leftMargin, mTitlePaint);
- // draw the count
+ // TODO: draw the count once visual designers finalize where
+ /*
if (jc.isCancelled()) return null;
if (icon != null) x = s.iconSize;
y += s.titleFontSize + s.countOffset;
drawText(canvas, x, y, count,
labelWidth - s.leftMargin - s.iconSize, mCountPaint);
+ */
// draw the icon
if (icon != null) {
if (jc.isCancelled()) return null;
float scale = (float) s.iconSize / icon.getWidth();
- canvas.translate(0, bitmap.getHeight()
- - Math.round(scale * icon.getHeight()));
+ canvas.translate(s.leftMargin, (s.labelBackgroundHeight -
+ Math.round(scale * icon.getHeight()))/2f);
canvas.scale(scale, scale);
canvas.drawBitmap(icon, 0, 0, null);
}
diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
index cca8d40a5..f58c033b0 100644
--- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
@@ -28,7 +28,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer {
@SuppressWarnings("unused")
private static final String TAG = "AlbumSetView";
private static final int CACHE_SIZE = 96;
- private static final int PLACEHOLDER_COLOR = 0xFF222222;
+ private static final int PLACEHOLDER_COLOR = 0xFFDDDDDD;
private final ColorTexture mWaitLoadingTexture;
private final GalleryActivity mActivity;
diff --git a/src/com/android/gallery3d/ui/AlbumSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSlotRenderer.java
index ab9976621..dee9a0b11 100644
--- a/src/com/android/gallery3d/ui/AlbumSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AlbumSlotRenderer.java
@@ -31,7 +31,7 @@ public class AlbumSlotRenderer extends AbstractSlotRenderer {
public boolean acceptSlot(int index);
}
- private static final int PLACEHOLDER_COLOR = 0xFF222222;
+ private static final int PLACEHOLDER_COLOR = 0xFFDDDDDD;
private static final int CACHE_SIZE = 96;
private AlbumSlidingWindow mDataWindow;
diff --git a/src/com/android/gallery3d/ui/GLCanvas.java b/src/com/android/gallery3d/ui/GLCanvas.java
index c12a9f78c..6d9aa4271 100644
--- a/src/com/android/gallery3d/ui/GLCanvas.java
+++ b/src/com/android/gallery3d/ui/GLCanvas.java
@@ -121,4 +121,6 @@ public interface GLCanvas {
public void beginRenderTarget(RawTexture texture);
public void endRenderTarget();
+
+ public void clearBuffer(float r, float g, float b, float a);
}
diff --git a/src/com/android/gallery3d/ui/GLCanvasImpl.java b/src/com/android/gallery3d/ui/GLCanvasImpl.java
index 7b7a31773..a254bcce4 100644
--- a/src/com/android/gallery3d/ui/GLCanvasImpl.java
+++ b/src/com/android/gallery3d/ui/GLCanvasImpl.java
@@ -649,10 +649,17 @@ public class GLCanvasImpl implements GLCanvas {
}
@Override
- public void clearBuffer() {
+ public void clearBuffer(float r, float g, float b, float a) {
+ mGL.glClearColor(r, g, b, a);
mGL.glClear(GL10.GL_COLOR_BUFFER_BIT);
}
+ @Override
+ public void clearBuffer() {
+ // TODO: Make this grey background color constant
+ clearBuffer(0.93f, 0.93f, 0.93f, 1);
+ }
+
private void setTextureCoords(RectF source) {
setTextureCoords(source.left, source.top, source.right, source.bottom);
}
diff --git a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
index 5f749d8fc..f30b57964 100644
--- a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
+++ b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
@@ -23,6 +23,7 @@ import javax.microedition.khronos.opengles.GL11;
public class GLCanvasStub implements GLCanvas {
public void setSize(int width, int height) {}
public void clearBuffer() {}
+ public void clearBuffer(float r, float g, float b, float a) {}
public void setCurrentAnimationTimeMillis(long time) {}
public long currentAnimationTimeMillis() {
throw new UnsupportedOperationException();
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-13 06:54:32 +0000