Skip to content

GitLab

Commit 540b2132 authored by Mindy Pereira's avatar Mindy Pereira
Browse files

Move delete button to main. 

That way landscape and port work the same.

Fixes bug:5414350 digit erased in calculator

Change-Id: I0dc18fb789ee4ca3089f701123fffba65c1d33ca
parent 5169ab29
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 70 deletions
res/layout-port/main.xml
View file @ 540b2132
......@@ -24,39 +24,79 @@
android:layout_height="match_parent"
android:background="#ff000000">
<LinearLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="3"
android:orientation="horizontal"
android:layout_gravity="center_vertical"
android:gravity="center_vertical">
<com.android.calculator2.CalculatorDisplay
android:id="@+id/display"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
maxDigits="@integer/max_digits">
<com.android.calculator2.CalculatorEditText
style="@style/display_style" />
<com.android.calculator2.CalculatorEditText
style="@style/display_style" />
</com.android.calculator2.CalculatorDisplay>
<ImageButton android:id="@+id/overflow_menu"
android:layout_width="48dip"
android:layout_height="match_parent"
android:src="@drawable/ic_menu_overflow"
android:background="@android:color/transparent"
android:layout_marginLeft="8dip"
android:visibility="gone"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.5"
>
<View
android:background="@drawable/btn_function"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
/>
<FrameLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent">
<!-- marginRight has to be 0 to catch border-touch -->
<com.android.calculator2.ColorButton
android:id="@+id/clear"
android:text="@string/clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="0dp"
android:textSize="15dp"
style="@style/button_style"
/>
<!-- marginRight has to be 0 to catch border-touch -->
<com.android.calculator2.ColorButton
android:id="@+id/del"
android:text="@string/del"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="horizontal"
android:layout_gravity="center_vertical"
android:gravity="center_vertical">
<com.android.calculator2.CalculatorDisplay
android:id="@+id/display"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
maxDigits="@integer/max_digits">
<com.android.calculator2.CalculatorEditText
style="@style/display_style" />
<com.android.calculator2.CalculatorEditText
style="@style/display_style" />
</com.android.calculator2.CalculatorDisplay>
<ImageButton android:id="@+id/overflow_menu"
android:layout_width="48dip"
android:layout_height="match_parent"
android:src="@drawable/ic_menu_overflow"
android:background="@android:color/transparent"
android:layout_marginLeft="8dip"
android:visibility="gone"/>
</LinearLayout>
android:layout_height="match_parent"
android:layout_marginRight="0dp"
android:textSize="15dp"
style="@style/button_style"
/>
</FrameLayout>
</LinearLayout>
<android.support.v4.view.ViewPager
android:id="@+id/panelswitch"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4"
android:layout_weight="10"
/>
</LinearLayout>
res/layout-port/simple_pad.xml
View file @ 540b2132
......@@ -26,47 +26,6 @@
android:layout_gravity="center"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"
>
<View
android:background="@drawable/btn_function"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
/>
<FrameLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent">
<!-- marginRight has to be 0 to catch border-touch -->
<com.android.calculator2.ColorButton
android:id="@+id/clear"
android:text="@string/clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="0dp"
android:textSize="15dp"
style="@style/button_style"
/>
<!-- marginRight has to be 0 to catch border-touch -->
<com.android.calculator2.ColorButton
android:id="@+id/del"
android:text="@string/del"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="0dp"
android:textSize="15dp"
style="@style/button_style"
/>
</FrameLayout>
</LinearLayout>
<LinearLayout
android:layout_weight="3"
android:layout_width="match_parent"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment