Skip to content

Commit

Permalink
fix display not expanding on tablets
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xlythe
Xlythe committed Feb 4, 2013
1 parent 9d51f8a commit 224223c
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 103 deletions.
95 changes: 44 additions & 51 deletions res/layout-sw600dp-land/main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,60 +29,53 @@

<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@android:color/transparent">
android:minHeight="@dimen/min_display_height"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:orientation="horizontal">
<com.android2.calculator3.view.CalculatorDisplay
android:id="@+id/display"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
maxDigits="@integer/max_digits"
>

<LinearLayout
android:layout_width="match_parent"
android:minHeight="@dimen/min_display_height"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.android2.calculator3.view.CalculatorDisplay
android:id="@+id/display"
android:layout_width="0dp"
android:layout_weight="1"
<com.android2.calculator3.view.ScrollableDisplay
style="@style/display_style" />
<com.android2.calculator3.view.ScrollableDisplay
style="@style/display_style" />

</com.android2.calculator3.view.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"
android:contentDescription="@null"/>
<FrameLayout
android:layout_width="100dip"
android:layout_height="match_parent">
<Button
android:id="@+id/clear"
android:text="@string/clear"
style="@style/btn_clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
maxDigits="@integer/max_digits"
>

<com.android2.calculator3.view.ScrollableDisplay
style="@style/display_style" />
<com.android2.calculator3.view.ScrollableDisplay
style="@style/display_style" />

</com.android2.calculator3.view.CalculatorDisplay>
<ImageButton android:id="@+id/overflow_menu"
android:layout_width="48dip"
android:paddingLeft="5dip"
android:paddingRight="5dip" />
<ImageButton
android:id="@+id/del"
android:src="@drawable/calc_clear_symbol"
style="@style/btn_clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/ic_menu_overflow"
android:background="@android:color/transparent"
android:layout_marginLeft="8dip"
android:visibility="gone"
android:contentDescription="@null"/>
<FrameLayout
android:layout_width="100dip"
android:layout_height="match_parent">
<Button
android:id="@+id/clear"
android:text="@string/clear"
style="@style/btn_clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="5dip"
android:paddingRight="5dip" />
<ImageButton
android:id="@+id/del"
android:src="@drawable/calc_clear_symbol"
style="@style/btn_clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:contentDescription="@null" />
</FrameLayout>
</LinearLayout>
<include layout="@layout/history_panel"/>
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:contentDescription="@null" />
</FrameLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
Expand Down
95 changes: 43 additions & 52 deletions res/layout-sw600dp-port/main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,62 +28,53 @@
android:paddingRight="@dimen/left_right_padding" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:minHeight="@dimen/min_display_height"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@android:color/transparent">
<com.android2.calculator3.view.CalculatorDisplay
android:id="@+id/display"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
maxDigits="@integer/max_digits"
>

<LinearLayout
android:layout_width="match_parent"
android:minHeight="@dimen/min_display_height"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@android:color/transparent">

<com.android2.calculator3.view.CalculatorDisplay
android:id="@+id/display"
android:layout_width="0dp"
android:layout_weight="1"
<com.android2.calculator3.view.ScrollableDisplay
style="@style/display_style" />
<com.android2.calculator3.view.ScrollableDisplay
style="@style/display_style" />

</com.android2.calculator3.view.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"
android:contentDescription="@null"/>
<FrameLayout
android:layout_width="100dip"
android:layout_height="match_parent">
<Button
android:id="@+id/clear"
android:text="@string/clear"
style="@style/btn_clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
maxDigits="@integer/max_digits"
>

<com.android2.calculator3.view.ScrollableDisplay
style="@style/display_style" />
<com.android2.calculator3.view.ScrollableDisplay
style="@style/display_style" />

</com.android2.calculator3.view.CalculatorDisplay>
<ImageButton android:id="@+id/overflow_menu"
android:layout_width="48dip"
android:paddingLeft="5dip"
android:paddingRight="5dip" />
<ImageButton
android:id="@+id/del"
android:src="@drawable/calc_clear_symbol"
style="@style/btn_clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/ic_menu_overflow"
android:background="@android:color/transparent"
android:layout_marginLeft="8dip"
android:visibility="gone"
android:contentDescription="@null"/>
<FrameLayout
android:layout_width="100dip"
android:layout_height="match_parent">
<Button
android:id="@+id/clear"
android:text="@string/clear"
style="@style/btn_clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="5dip"
android:paddingRight="5dip" />
<ImageButton
android:id="@+id/del"
android:src="@drawable/calc_clear_symbol"
style="@style/btn_clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:contentDescription="@null" />
</FrameLayout>

</LinearLayout>
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:contentDescription="@null" />
</FrameLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
Expand Down

0 comments on commit 224223c

Please sign in to comment.