diff options
| author | Rohan Shah <shahrk@google.com> | 2014-08-10 21:08:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-09 00:40:15 +0000 |
| commit | 8c9dab6247568eee0f97fef1dcb52b6a03c311e7 (patch) | |
| tree | 0984e4d5df4414ee77f9e95697ab205868983af1 /res/layout | |
| parent | 7bb942b4402a8d24904baf637db98784c3d79983 (diff) | |
| parent | 705475563630dac7c9eddf9ecd01c9b990f0cd9c (diff) | |
| download | android_packages_apps_UnifiedEmail-8c9dab6247568eee0f97fef1dcb52b6a03c311e7.tar.gz android_packages_apps_UnifiedEmail-8c9dab6247568eee0f97fef1dcb52b6a03c311e7.tar.bz2 android_packages_apps_UnifiedEmail-8c9dab6247568eee0f97fef1dcb52b6a03c311e7.zip | |
Merge "Changed widget style to Quantum." into ub-gmail-ur14-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/widget.xml | 83 |
1 files changed, 22 insertions, 61 deletions
diff --git a/res/layout/widget.xml b/res/layout/widget.xml index 678a90ac4..c671a8649 100644 --- a/res/layout/widget.xml +++ b/res/layout/widget.xml @@ -25,75 +25,36 @@ android:layout_marginRight="@dimen/widget_margin_right" android:layout_marginBottom="@dimen/widget_margin_bottom" android:orientation="vertical"> - <LinearLayout + + <RelativeLayout android:id="@+id/widget_header" android:layout_width="match_parent" - android:layout_height="48sp" - android:orientation="horizontal" - android:paddingLeft="8dip" - android:paddingRight="8dip" - android:background="@drawable/header_bg_widget_holo" - android:gravity="center_vertical"> - <ImageView - android:id="@+id/widget_icon" - android:layout_width="32dip" - android:layout_height="32dip" - android:layout_marginRight="8dip" - android:src="@mipmap/ic_launcher_mail" /> - <LinearLayout - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight = "1" - android:layout_marginRight="8dip" - android:orientation="vertical"> - <TextView - android:id="@+id/widget_folder" - style="@style/WidgetTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:freezesText="true" - android:includeFontPadding="false" /> - <TextView - android:id="@+id/widget_account_noflip" - style="@style/WidgetSubtitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:freezesText="true" - android:includeFontPadding="false"/> - <ViewFlipper - android:id="@+id/widget_account_unread_flipper" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:autoStart="true" - android:flipInterval="@integer/widget_account_unread_flip_ms" - android:visibility="gone"> - <TextView - android:id="@+id/widget_account" - style="@style/WidgetSubtitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:freezesText="true" - android:includeFontPadding="false"/> - <!-- Note: We can't set "freezesText" on the widget_unread_count view, as the - launcher can restore stale data over updated data. --> - <TextView - android:id="@+id/widget_unread_count" - style="@style/WidgetSubtitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:includeFontPadding="false" /> - </ViewFlipper> - </LinearLayout> + android:layout_height="48dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:background="@color/widget_header_bg_color"> <ImageButton android:id="@+id/widget_compose" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_menu_compose_normal_holo_light" + android:src="@drawable/ic_widget_compose_wht_24dp" android:background="?android:attr/selectableItemBackground" - android:paddingLeft="4dip" - android:layout_gravity="center_vertical" + android:paddingLeft="16dp" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" android:contentDescription="@string/compose" /> - </LinearLayout> + <TextView + android:id="@+id/widget_folder" + style="@style/WidgetTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:freezesText="true" + android:layout_toLeftOf="@id/widget_compose" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:includeFontPadding="false" /> + </RelativeLayout> + <LinearLayout android:id="@+id/widget_configuration" android:layout_width="match_parent" |