summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2009-10-29 15:19:13 -0400
committerDaniel Sandler <dsandler@google.com>2009-10-29 15:19:13 -0400
commitd7967c599e0d5b9ddb992b5f9836582d402a8671 (patch)
treeaf82a0967dda94141948433c5d41773410e10876
parent6a354ff374529755d9c22d884095d61134fd7cd6 (diff)
downloadandroid_packages_wallpapers_LivePicker-d7967c599e0d5b9ddb992b5f9836582d402a8671.zip
android_packages_wallpapers_LivePicker-d7967c599e0d5b9ddb992b5f9836582d402a8671.tar.gz
android_packages_wallpapers_LivePicker-d7967c599e0d5b9ddb992b5f9836582d402a8671.tar.bz2
Improving Live Wallpaper picker UI.
The currently selected wallpaper's title is now shown in a Launcher-style bubble above the thumbnail gallery.
-rw-r--r--res/drawable-hdpi/focused_application_background.9.pngbin0 -> 1454 bytes
-rw-r--r--res/drawable/shortcut_selector.xml24
-rw-r--r--res/layout/live_wallpaper_content.xml11
-rw-r--r--res/values/colors.xml23
-rw-r--r--res/values/styles.xml38
-rw-r--r--src/com/android/wallpaper/livepicker/BubbleTextView.java143
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java8
7 files changed, 247 insertions, 0 deletions
diff --git a/res/drawable-hdpi/focused_application_background.9.png b/res/drawable-hdpi/focused_application_background.9.png
new file mode 100644
index 0000000..7bf37ef
--- /dev/null
+++ b/res/drawable-hdpi/focused_application_background.9.png
Binary files differ
diff --git a/res/drawable/shortcut_selector.xml b/res/drawable/shortcut_selector.xml
new file mode 100644
index 0000000..09fec1b
--- /dev/null
+++ b/res/drawable/shortcut_selector.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2007, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_window_focused="true" android:state_focused="true" android:drawable="@drawable/focused_application_background" />
+ <item android:state_window_focused="false" android:state_focused="true" android:drawable="@android:color/transparent" />
+</selector>
diff --git a/res/layout/live_wallpaper_content.xml b/res/layout/live_wallpaper_content.xml
index 94864c0..d9b3add 100644
--- a/res/layout/live_wallpaper_content.xml
+++ b/res/layout/live_wallpaper_content.xml
@@ -43,6 +43,17 @@
/>
</FrameLayout>
+ <com.android.wallpaper.livepicker.BubbleTextView
+ style="@style/WorkspaceIcon"
+ android:id="@+id/title"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:visibility="gone"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_marginBottom="4dip"
+ />
+
<Gallery android:id="@+id/gallery"
android:gravity="fill"
android:layout_width="fill_parent"
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000..90d633a
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* copyright (c) 2008 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.
+*/
+-->
+
+<resources>
+ <color name="bubble_dark_background">#B2191919</color>
+</resources>
+
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..088b473
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2008 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.
+*/
+-->
+
+<resources>
+ <style name="WorkspaceIcon">
+ <item name="android:textSize">13dip</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:ellipsize">marquee</item>
+ <item name="android:shadowColor">#FF000000</item>
+ <item name="android:shadowRadius">2.0</item>
+ <item name="android:textColor">#FFF</item>
+ <item name="android:gravity">center_horizontal</item>
+ <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_height">fill_parent</item>
+ <item name="android:background">@drawable/shortcut_selector</item>
+ <item name="android:paddingTop">4dip</item>
+ <item name="android:paddingBottom">4dip</item>
+ <item name="android:paddingLeft">8dip</item>
+ <item name="android:paddingRight">8dip</item>
+ </style>
+</resources>
+
diff --git a/src/com/android/wallpaper/livepicker/BubbleTextView.java b/src/com/android/wallpaper/livepicker/BubbleTextView.java
new file mode 100644
index 0000000..0b5778d
--- /dev/null
+++ b/src/com/android/wallpaper/livepicker/BubbleTextView.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2008 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.wallpaper.livepicker;
+
+import android.widget.TextView;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.text.Layout;
+
+/**
+ * TextView that draws a bubble behind the text. "Borrowed" from Launcher.
+ */
+public class BubbleTextView extends TextView {
+ static final float CORNER_RADIUS = 8.0f;
+ static final float PADDING_H = 5.0f;
+ static final float PADDING_V = 1.0f;
+
+ private final RectF mRect = new RectF();
+ private Paint mPaint;
+
+ private boolean mBackgroundSizeChanged;
+ private Drawable mBackground;
+ private float mCornerRadius;
+ private float mPaddingH;
+ private float mPaddingV;
+
+ public BubbleTextView(Context context) {
+ super(context);
+ init();
+ }
+
+ public BubbleTextView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init();
+ }
+
+ public BubbleTextView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ init();
+ }
+
+ private void init() {
+ setFocusable(true);
+ mBackground = getBackground();
+ setBackgroundDrawable(null);
+
+ mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ mPaint.setColor(getContext().getResources().getColor(R.color.bubble_dark_background));
+
+ final float scale = getContext().getResources().getDisplayMetrics().density;
+ mCornerRadius = CORNER_RADIUS * scale;
+ mPaddingH = PADDING_H * scale;
+ //noinspection PointlessArithmeticExpression
+ mPaddingV = PADDING_V * scale;
+ }
+
+ @Override
+ protected boolean setFrame(int left, int top, int right, int bottom) {
+ if (mLeft != left || mRight != right || mTop != top || mBottom != bottom) {
+ mBackgroundSizeChanged = true;
+ }
+ return super.setFrame(left, top, right, bottom);
+ }
+
+ @Override
+ protected boolean verifyDrawable(Drawable who) {
+ return who == mBackground || super.verifyDrawable(who);
+ }
+
+ @Override
+ protected void drawableStateChanged() {
+ Drawable d = mBackground;
+ if (d != null && d.isStateful()) {
+ d.setState(getDrawableState());
+ }
+ super.drawableStateChanged();
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ final Drawable background = mBackground;
+ if (background != null) {
+ final int scrollX = mScrollX;
+ final int scrollY = mScrollY;
+
+ if (mBackgroundSizeChanged) {
+ background.setBounds(0, 0, mRight - mLeft, mBottom - mTop);
+ mBackgroundSizeChanged = false;
+ }
+
+ if ((scrollX | scrollY) == 0) {
+ background.draw(canvas);
+ } else {
+ canvas.translate(scrollX, scrollY);
+ background.draw(canvas);
+ canvas.translate(-scrollX, -scrollY);
+ }
+ }
+
+ final Layout layout = getLayout();
+ final RectF rect = mRect;
+ final int left = getCompoundPaddingLeft();
+ final int top = getExtendedPaddingTop();
+
+ rect.set(left + layout.getLineLeft(0) - mPaddingH,
+ top + layout.getLineTop(0) - mPaddingV,
+ Math.min(left + layout.getLineRight(0) + mPaddingH, mScrollX + mRight - mLeft),
+ top + layout.getLineBottom(0) + mPaddingV);
+ canvas.drawRoundRect(rect, mCornerRadius, mCornerRadius, mPaint);
+
+ super.draw(canvas);
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ mBackground.setCallback(this);
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ mBackground.setCallback(null);
+ }
+}
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java
index c2db020..6bb1777 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java
@@ -54,6 +54,7 @@ import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.Gallery;
import android.widget.ImageView;
+import android.widget.TextView;
import java.io.IOException;
import java.util.List;
@@ -76,6 +77,7 @@ public class LiveWallpaperPickActivity extends Activity implements
WallpaperConnection mWallpaperConnection;
private Button mConfigureButton;
+ private TextView mWallpaperTitle;
private ArrayList<Intent> mWallpaperIntents;
private ArrayList<WallpaperInfo> mWallpaperInfos;
@@ -295,6 +297,9 @@ public class LiveWallpaperPickActivity extends Activity implements
mConfigureButton = (Button)findViewById(R.id.configure);
mConfigureButton.setVisibility(View.GONE);
mConfigureButton.setOnClickListener(this);
+
+ mWallpaperTitle = (TextView)findViewById(R.id.title);
+ mWallpaperTitle.setVisibility(View.GONE);
// Set default return data
setResult(RESULT_CANCELED);
@@ -346,6 +351,9 @@ public class LiveWallpaperPickActivity extends Activity implements
? View.VISIBLE
: View.GONE);
findViewById(R.id.set).setEnabled(true);
+
+ findViewById(R.id.title).setVisibility(View.VISIBLE);
+ mWallpaperTitle.setText(mSelectedInfo.loadLabel(mPackageManager).toString());
WallpaperConnection conn = new WallpaperConnection(mSelectedIntent);
if (conn.connect()) {