Reduce build widget footprint to 1x1.
Default footprint, that is.
Change-Id: Ic8cdd0f97065291837b39bb79585fb86bdf23644
diff --git a/apps/BuildWidget/res/layout/widget.xml b/apps/BuildWidget/res/layout/widget.xml
index 81b3ae4..41be777 100644
--- a/apps/BuildWidget/res/layout/widget.xml
+++ b/apps/BuildWidget/res/layout/widget.xml
@@ -14,31 +14,64 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="6dip"
>
- <TextView
- android:id="@+id/build_info"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:gravity="left"
- style="@style/Text.BuildInfo.Fancy"
- android:textSize="18dip"
- />
+ <LinearLayout
+ android:id="@+id/block1x1"
+ android:layout_width="80dp"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center"
+ >
- <TextView
- android:id="@+id/build_changelist"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:gravity="left"
- android:layout_marginTop="4dip"
- style="@style/Text.BuildInfo.Fancy"
- android:textSize="9dip"
- />
+ <TextView
+ android:id="@+id/build_info"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ style="@style/Text.BuildInfo.Fancy"
+ android:textSize="18dip"
+ />
-</LinearLayout>
+ <TextView
+ android:id="@+id/build_date"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ style="@style/Text.BuildInfo.Fancy"
+ android:textSize="14dip"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_toRightOf="@id/block1x1"
+ >
+ <TextView
+ android:id="@+id/build_extra"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="32dp"
+ android:gravity="left|center_vertical"
+ android:minWidth="60dp"
+ style="@style/Text.BuildInfo.Fancy"
+ android:textSize="10dip"
+ android:layout_weight="1"
+ />
+
+ <ImageView
+ android:id="@+id/platlogo"
+ android:layout_width="64dp"
+ android:layout_height="match_parent"
+ android:padding="3dp"
+ android:src="@*android:drawable/platlogo"
+ android:scaleType="centerInside"
+ android:layout_weight="0"
+ />
+ </LinearLayout>
+</RelativeLayout>
diff --git a/apps/BuildWidget/res/xml/widget_build.xml b/apps/BuildWidget/res/xml/widget_build.xml
index c7c443a..a5a444d 100644
--- a/apps/BuildWidget/res/xml/widget_build.xml
+++ b/apps/BuildWidget/res/xml/widget_build.xml
@@ -15,7 +15,12 @@
-->
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
- android:minWidth="150dip"
+ android:minResizeWidth="72dip"
+ android:minResizeHeight="72dip"
+ android:minWidth="72dip"
android:minHeight="72dip"
android:updatePeriodMillis="0"
- android:initialLayout="@layout/widget" />
+ android:initialLayout="@layout/widget"
+ android:resizeMode="horizontal"
+/>
+
diff --git a/apps/BuildWidget/src/com/android/buildwidget/BuildWidget.java b/apps/BuildWidget/src/com/android/buildwidget/BuildWidget.java
index 327a34b..bd2db0b 100644
--- a/apps/BuildWidget/src/com/android/buildwidget/BuildWidget.java
+++ b/apps/BuildWidget/src/com/android/buildwidget/BuildWidget.java
@@ -26,6 +26,7 @@
import android.content.res.Resources;
import android.net.Uri;
import android.os.IBinder;
+import android.text.format.DateUtils;
import android.text.format.Time;
import android.util.Log;
import android.widget.RemoteViews;
@@ -69,12 +70,11 @@
0 /* no flags */);
updateViews.setOnClickPendingIntent(R.id.widget, pendingIntent);
- updateViews.setTextViewText(R.id.build_info,
- android.os.Build.VERSION.CODENAME + " " +
- android.os.Build.ID);
- updateViews.setTextViewText(R.id.build_changelist,
- android.os.Build.FINGERPRINT
- );
+ updateViews.setTextViewText(R.id.build_info, android.os.Build.ID);
+ updateViews.setTextViewText(R.id.build_date,
+ DateUtils.formatDateTime(context, android.os.Build.TIME,
+ DateUtils.FORMAT_NUMERIC_DATE));
+ updateViews.setTextViewText(R.id.build_extra, android.os.Build.FINGERPRINT);
return updateViews;
}
