summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-11-02 23:05:34 -0700
committerMichael Jurka <mikejurka@google.com>2012-11-06 15:14:03 -0800
commit4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f (patch)
treeedfae5a0ba413600048445571dcf4a3943bc785e /res/layout
parentab3472f5946c5dc3193c29513e31be7309ece378 (diff)
downloadpackages_apps_settings-4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f.zip
packages_apps_settings-4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f.tar.gz
packages_apps_settings-4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f.tar.bz2
Add widget previews to the key guard widget picker
Bug: 7381803 Change-Id: I86946b7d0d75f8a1f89120600be2513bdf9026f0
Diffstat (limited to 'res/layout')
-rwxr-xr-xres/layout/keyguard_appwidget_item.xml44
-rw-r--r--res/layout/keyguard_appwidget_pick_layout.xml2
2 files changed, 30 insertions, 16 deletions
diff --git a/res/layout/keyguard_appwidget_item.xml b/res/layout/keyguard_appwidget_item.xml
index 7280098..ed17bcf 100755
--- a/res/layout/keyguard_appwidget_item.xml
+++ b/res/layout/keyguard_appwidget_item.xml
@@ -15,21 +15,33 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
- <TextView
- android:id="@+id/icon_and_label"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
- android:layout_marginTop="4dip"
- android:layout_marginBottom="4dip"
- android:background="@drawable/appwidget_item_bg"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center_vertical"
- android:drawablePadding="8dip"
- android:paddingStart="11dip"
- android:paddingEnd="11dip" />
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="@drawable/appwidget_item_bg"
+ android:layout_marginTop="2dip"
+ android:layout_marginBottom="2dip"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:paddingTop="16dip"
+ android:paddingBottom="16dip" >
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="@dimen/appwidget_preview_width"
+ android:layout_height="@dimen/appwidget_preview_height"
+ android:scaleType="center" />
+ <TextView
+ android:id="@+id/label"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="24dip"
+ android:paddingBottom="8dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="left|bottom" />
+ </LinearLayout>
</FrameLayout>
diff --git a/res/layout/keyguard_appwidget_pick_layout.xml b/res/layout/keyguard_appwidget_pick_layout.xml
index feb85a5..85667f6 100644
--- a/res/layout/keyguard_appwidget_pick_layout.xml
+++ b/res/layout/keyguard_appwidget_pick_layout.xml
@@ -18,6 +18,8 @@
android:id="@+id/layout_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
android:orientation="vertical" >
<GridView android:layout_width="match_parent"
android:layout_height="0dp"