diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-15 23:28:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-15 23:28:30 +0000 |
commit | 35a4ae02d1a54c96932323afd3dc9f408e043a6c (patch) | |
tree | c427598b257628a344020f59707f90f32f5214db /res/layout/add_item_confirmation_activity.xml | |
parent | 037fd6d96422ac79534a611ed9c741192182e649 (diff) | |
parent | 8b4342c9430580387a1fed2883c3a36a6c7328f9 (diff) | |
download | android_packages_apps_Trebuchet-35a4ae02d1a54c96932323afd3dc9f408e043a6c.tar.gz android_packages_apps_Trebuchet-35a4ae02d1a54c96932323afd3dc9f408e043a6c.tar.bz2 android_packages_apps_Trebuchet-35a4ae02d1a54c96932323afd3dc9f408e043a6c.zip |
Merge "Updating the UI for Add-to-homescreen dialog" into ub-launcher3-dorval-polish
Diffstat (limited to 'res/layout/add_item_confirmation_activity.xml')
-rw-r--r-- | res/layout/add_item_confirmation_activity.xml | 84 |
1 files changed, 50 insertions, 34 deletions
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml index 35bcac389..6c316e6ff 100644 --- a/res/layout/add_item_confirmation_activity.xml +++ b/res/layout/add_item_confirmation_activity.xml @@ -17,57 +17,73 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <TextView - android:paddingLeft="24dp" - android:paddingRight="24dp" - android:paddingTop="4dp" - android:paddingBottom="20dp" - android:text="@string/add_item_request_drag_hint" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <FrameLayout - android:theme="@style/WidgetContainerTheme" + android:layout_height="match_parent" + android:orientation="vertical"> + <ScrollView android:layout_width="match_parent" - android:background="?android:attr/colorPrimaryDark" - android:layout_height="wrap_content"> + android:layout_height="0dp" + android:layout_weight="1" + android:clipToPadding="false"> - <com.android.launcher3.dragndrop.LivePreviewWidgetCell - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - 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" > + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="20dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="4dp" + android:text="@string/add_item_request_drag_hint" /> - <include layout="@layout/widget_cell_content" /> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/colorPrimaryDark" + android:theme="@style/WidgetContainerTheme"> - </com.android.launcher3.dragndrop.LivePreviewWidgetCell> - </FrameLayout> + <com.android.launcher3.dragndrop.LivePreviewWidgetCell + android:id="@+id/widget_cell" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_weight="1" + android:background="?android:attr/colorPrimaryDark" + android:focusable="true" + android:gravity="center_horizontal" + android:orientation="vertical" > + + <include layout="@layout/widget_cell_content" /> + + </com.android.launcher3.dragndrop.LivePreviewWidgetCell> + </FrameLayout> + </LinearLayout> + </ScrollView> <LinearLayout + style="?android:attr/buttonBarStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - style="?android:attr/buttonBarStyle" - android:gravity="end" > + android:gravity="end" + android:paddingBottom="4dp" + android:paddingEnd="12dp" + android:paddingStart="12dp" + android:paddingTop="4dp" > <Button + style="?android:attr/buttonBarButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@android:string/cancel" android:onClick="onCancelClick" - style="?android:attr/buttonBarButtonStyle" /> + android:text="@android:string/cancel" /> <Button + style="?android:attr/buttonBarButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/place_automatically" android:onClick="onPlaceAutomaticallyClick" - style="?android:attr/buttonBarButtonStyle" /> + android:text="@string/place_automatically" /> </LinearLayout> </LinearLayout> |