diff options
| author | Mert Tümer <merttumer7@gmail.com> | 2018-01-21 19:10:10 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-01-30 02:20:20 +0100 |
| commit | 3deac9691011711a3b9e50d19499c588af074d7f (patch) | |
| tree | 0b08b9f9c26d897aabcdc30909e735995defcba6 /android/source/res | |
| parent | [Pardus] tdf#112482 ability to add slides to impress (diff) | |
| download | core-3deac9691011711a3b9e50d19499c588af074d7f.tar.gz core-3deac9691011711a3b9e50d19499c588af074d7f.zip | |
[Pardus] tdf#106326 ability to change font background color
This patch is sponsored by ULAKBIM/PARDUS project.
Signed-off-by: Mert Tümer <merttumer7@gmail.com>
Change-Id: I4dfbb9e35214e4d4a9aa6dca1ce3d5d2604218a9
Reviewed-on: https://gerrit.libreoffice.org/48270
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'android/source/res')
| -rw-r--r-- | android/source/res/layout/activity_main.xml | 3 | ||||
| -rw-r--r-- | android/source/res/layout/toolbar_bottom.xml | 28 | ||||
| -rw-r--r-- | android/source/res/layout/toolbar_color_picker.xml | 1 |
3 files changed, 30 insertions, 2 deletions
diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml index 9f53b4f5d3dd..c2528023d0f8 100644 --- a/android/source/res/layout/activity_main.xml +++ b/android/source/res/layout/activity_main.xml @@ -110,7 +110,8 @@ </LinearLayout> <include layout="@layout/toolbar_bottom"/> - <include layout="@layout/toolbar_color_picker"/> + <include android:id="@+id/toolbar_back_color_picker" layout="@layout/toolbar_color_picker"/> + <include android:id="@+id/toolbar_color_picker" layout="@layout/toolbar_color_picker"/> <RelativeLayout android:id="@+id/loadingPanel" diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml index a537a52d32b9..d944b2713f2a 100644 --- a/android/source/res/layout/toolbar_bottom.xml +++ b/android/source/res/layout/toolbar_bottom.xml @@ -197,6 +197,34 @@ /> </RelativeLayout> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/font_back_color_picker" + android:padding="10dp"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Font Back Color" + android:paddingBottom="12dp" + android:paddingTop="12dp" + android:textSize="14sp" + android:gravity="center_vertical" + android:textColor="@color/fontBlack" + android:layout_alignParentLeft="true" + + /> + <ImageButton + android:id="@+id/font_back_color_picker_button" + android:layout_width="24dp" + android:layout_height="24dp" + android:gravity="center_vertical" + android:paddingBottom="12dp" + android:paddingTop="12dp" + android:layout_alignParentRight="true" + /> + + </RelativeLayout> </LinearLayout> </ScrollView> diff --git a/android/source/res/layout/toolbar_color_picker.xml b/android/source/res/layout/toolbar_color_picker.xml index e34b6c6a5d72..9393259123be 100644 --- a/android/source/res/layout/toolbar_color_picker.xml +++ b/android/source/res/layout/toolbar_color_picker.xml @@ -3,7 +3,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/toolbar_color_picker" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" |