diff options
Diffstat (limited to 'android/source/res/layout/toolbar_color_picker.xml')
| -rw-r--r-- | android/source/res/layout/toolbar_color_picker.xml | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/android/source/res/layout/toolbar_color_picker.xml b/android/source/res/layout/toolbar_color_picker.xml index 9393259123be..0969d0e52e3d 100644 --- a/android/source/res/layout/toolbar_color_picker.xml +++ b/android/source/res/layout/toolbar_color_picker.xml @@ -6,13 +6,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:background="@color/toolbar_background" + android:background="?attr/colorPrimary" android:elevation="3dp" android:orientation="vertical" app:popupTheme="@style/LibreOfficeTheme.Toolbar" app:theme="@style/LibreOfficeTheme.Toolbar" tools:showIn="@layout/activity_main" - app:layout_behavior="android.support.design.widget.BottomSheetBehavior" + app:layout_behavior="@string/bottom_sheet_behavior" app:behavior_hideable="true" app:behavior_peekHeight="0dp"> @@ -21,23 +21,41 @@ android:layout_height="wrap_content" android:padding="10dp" android:orientation="vertical"> - <ImageButton - android:id="@+id/button_go_back_color_picker" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:srcCompat="@drawable/ic_arrow_back_black_24dp" - android:background="@drawable/image_button_background" - android:layout_marginBottom="10dp"/> - <android.support.v7.widget.RecyclerView + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/button_go_back_color_picker" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="10dp" + android:background="@drawable/image_button_background" + app:srcCompat="@drawable/ic_arrow_back_24dp" /> + + <Button + android:id="@+id/button_auto_color" + android:layout_alignParentRight="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="10dp" + android:background="@drawable/image_button_background" + android:text="@string/automatic" + app:drawableLeftCompat="@drawable/ic_auto_color" /> + + </RelativeLayout> + + <androidx.recyclerview.widget.RecyclerView android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/fontColorView" > - </android.support.v7.widget.RecyclerView> + </androidx.recyclerview.widget.RecyclerView> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/fontColorViewSub" @@ -45,11 +63,11 @@ android:layout_below="@id/fontColorView" android:layout_alignParentBottom="true"> - </android.support.v7.widget.RecyclerView> + </androidx.recyclerview.widget.RecyclerView> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |