diff options
author | Ximeng Zu <uznomis@yahoo.com> | 2017-07-20 09:17:15 -0500 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2017-11-16 06:31:10 +0100 |
commit | 4e2555b7f37172ab28d43d5aecfa52a38c0cdd65 (patch) | |
tree | ea1b232277294b72cc2235e4393e1bf418606a48 /android/source/res | |
parent | ofz: special case max index for cSymbol (diff) | |
download | core-4e2555b7f37172ab28d43d5aecfa52a38c0cdd65.tar.gz core-4e2555b7f37172ab28d43d5aecfa52a38c0cdd65.zip |
[Android] Add address/formula bars
Added address bar and formula bar to Calc.
Change-Id: I7cc7047d6d07629ab564261d294e481ae585fd29
Reviewed-on: https://gerrit.libreoffice.org/40842
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'android/source/res')
-rw-r--r-- | android/source/res/layout/activity_main.xml | 24 | ||||
-rw-r--r-- | android/source/res/values/dimens.xml | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml index e157e23454de..9f53b4f5d3dd 100644 --- a/android/source/res/layout/activity_main.xml +++ b/android/source/res/layout/activity_main.xml @@ -35,6 +35,30 @@ </android.support.design.widget.AppBarLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <EditText + android:id="@+id/calc_address" + android:layout_width="@dimen/calc_address_bar_width" + android:layout_height="@dimen/calc_toolbar_height" + android:layout_weight="0" + android:inputType="textNoSuggestions" + android:imeOptions="actionDone|actionGo" + android:visibility="gone"/> + + <EditText + android:id="@+id/calc_formula" + android:layout_width="0dp" + android:layout_height="@dimen/calc_toolbar_height" + android:layout_weight="1" + android:inputType="text" + android:imeOptions="actionDone|actionGo" + android:visibility="gone"/> + + </LinearLayout> + <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/android/source/res/values/dimens.xml b/android/source/res/values/dimens.xml index 8a153790ac69..3a3343ff56b0 100644 --- a/android/source/res/values/dimens.xml +++ b/android/source/res/values/dimens.xml @@ -11,4 +11,6 @@ <dimen name="toolbar_height">256dp</dimen> <dimen name="calc_header_width">48dp</dimen> <dimen name="calc_header_height">24dp</dimen> + <dimen name="calc_toolbar_height">40dp</dimen> + <dimen name="calc_address_bar_width">96dp</dimen> </resources> |