diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-03-17 18:41:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-17 18:41:31 +0000 |
commit | afc3f09240abf904f0250aa7d3892ff41ec1ba6d (patch) | |
tree | 16197f015dfb3bf5e639c0a954b2955441896de1 /res | |
parent | f71bb700aa436d0e8c8c9056627e3999e1f667d6 (diff) | |
parent | c65a0085d77edd8e8821254f081eb94e9dcc5e75 (diff) | |
download | android_packages_apps_Trebuchet-afc3f09240abf904f0250aa7d3892ff41ec1ba6d.tar.gz android_packages_apps_Trebuchet-afc3f09240abf904f0250aa7d3892ff41ec1ba6d.tar.bz2 android_packages_apps_Trebuchet-afc3f09240abf904f0250aa7d3892ff41ec1ba6d.zip |
Adding support for showing the widget preview based on the provided RemoteViews
am: c65a0085d7
Change-Id: Iabea96bb74294e2775a08427c17e154020d9bc40
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/add_item_confirmation_activity.xml | 16 | ||||
-rw-r--r-- | res/layout/widget_cell.xml | 45 | ||||
-rw-r--r-- | res/layout/widget_cell_content.xml | 65 |
3 files changed, 78 insertions, 48 deletions
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml index 2aae5bc88..35bcac389 100644 --- a/res/layout/add_item_confirmation_activity.xml +++ b/res/layout/add_item_confirmation_activity.xml @@ -36,12 +36,20 @@ android:background="?android:attr/colorPrimaryDark" android:layout_height="wrap_content"> - <include - layout="@layout/widget_cell" - android:layout_gravity="center_horizontal" + <com.android.launcher3.dragndrop.LivePreviewWidgetCell android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/widget_cell" /> + android:layout_weight="1" + android:orientation="vertical" + android:focusable="true" + android:background="?android:attr/colorPrimaryDark" + android:gravity="center_horizontal" + android:id="@+id/widget_cell" + android:layout_gravity="center_horizontal" > + + <include layout="@layout/widget_cell_content" /> + + </com.android.launcher3.dragndrop.LivePreviewWidgetCell> </FrameLayout> <LinearLayout diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml index b9b098c3c..148a99b1e 100644 --- a/res/layout/widget_cell.xml +++ b/res/layout/widget_cell.xml @@ -23,49 +23,6 @@ android:background="?android:attr/colorPrimaryDark" android:gravity="center_horizontal"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="@dimen/widget_preview_label_vertical_padding" - android:paddingBottom="@dimen/widget_preview_label_vertical_padding" - android:paddingLeft="@dimen/widget_preview_label_horizontal_padding" - android:paddingRight="@dimen/widget_preview_label_horizontal_padding" - android:orientation="horizontal"> + <include layout="@layout/widget_cell_content" /> - <!-- The name of the widget. --> - <TextView - android:id="@+id/widget_name" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:ellipsize="end" - android:fadingEdge="horizontal" - android:fontFamily="sans-serif-condensed" - android:gravity="start" - android:singleLine="true" - android:maxLines="1" - android:textColor="?android:attr/textColorSecondary" - android:textSize="14sp" /> - - <!-- The original dimensions of the widget (can't be the same text as above due to different - style. --> - <TextView - android:id="@+id/widget_dims" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="5dp" - android:layout_marginLeft="5dp" - android:textColor="?android:attr/textColorSecondary" - android:textSize="14sp" - android:fontFamily="sans-serif-condensed" - android:alpha="0.8" /> - </LinearLayout> - - <!-- The image of the widget. This view does not support padding. Any placement adjustment - should be done using margins. --> - <com.android.launcher3.widget.WidgetImageView - android:id="@+id/widget_preview" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> </com.android.launcher3.widget.WidgetCell>
\ No newline at end of file diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml new file mode 100644 index 000000000..c77b0b931 --- /dev/null +++ b/res/layout/widget_cell_content.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 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. +--> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/widget_preview_label_vertical_padding" + android:paddingBottom="@dimen/widget_preview_label_vertical_padding" + android:paddingLeft="@dimen/widget_preview_label_horizontal_padding" + android:paddingRight="@dimen/widget_preview_label_horizontal_padding" + android:orientation="horizontal"> + + <!-- The name of the widget. --> + <TextView + android:id="@+id/widget_name" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:ellipsize="end" + android:fadingEdge="horizontal" + android:fontFamily="sans-serif-condensed" + android:gravity="start" + android:singleLine="true" + android:maxLines="1" + android:textColor="?android:attr/textColorSecondary" + android:textSize="14sp" /> + + <!-- The original dimensions of the widget (can't be the same text as above due to different + style. --> + <TextView + android:id="@+id/widget_dims" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="5dp" + android:layout_marginLeft="5dp" + android:textColor="?android:attr/textColorSecondary" + android:textSize="14sp" + android:fontFamily="sans-serif-condensed" + android:alpha="0.8" /> + </LinearLayout> + + <!-- The image of the widget. This view does not support padding. Any placement adjustment + should be done using margins. --> + <com.android.launcher3.widget.WidgetImageView + android:id="@+id/widget_preview" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> +</merge>
\ No newline at end of file |