Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0a1cea7 authored by Sam Blitzstein's avatar Sam Blitzstein
Browse files

Hide bottom bar in landscape. 

This way we can make sure analog clock has enough space.

Bug: 10691481
Change-Id: I2075238965fcff2574ffbf3405299378b8cf3c51
(cherry picked from commit 13b1605e)
parent 595e83dc

res/layout-land/clock_fragment.xml

+18 −32
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center" >

        android:gravity="center"

        android:weightSum="@integer/clocks_per_row" >

        <include layout="@layout/main_clock_frame"

            android:id="@+id/main_clock_left_pane"

            android:layout_width="0dp"
@@ -42,11 +43,6 @@ 
            android:layout_marginRight="20dp"

            android:layout_gravity="center" />

    </LinearLayout>

    <FrameLayout

        android:background="@drawable/footer_bg"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom" >

    <ImageButton

        android:id="@+id/cities_button"

        android:contentDescription="@string/button_cities"
@@ -58,19 +54,9 @@ 
        android:layout_marginEnd="@dimen/footer_button_layout_margin"

        android:layout_marginLeft="@dimen/footer_button_layout_margin"

        android:layout_marginStart="@dimen/footer_button_layout_margin"

            android:layout_gravity="center_horizontal"

        android:layout_gravity="right|bottom"

        android:src="@drawable/ic_globe"

        style="@style/button"

        android:onClick="clockButtonsOnClick"

        android:background="@drawable/main_button_normal" />

        <ImageButton

            android:id="@+id/menu_button"

            android:contentDescription="@string/button_menu"

            style="?android:attr/actionOverflowButtonStyle"

            android:background="@drawable/item_background"

            android:onClick="clockButtonsOnClick"

            android:layout_gravity="end|center_vertical"

            android:layout_width="@dimen/footer_button_size"

            android:layout_height="@dimen/footer_button_size" />

    </FrameLayout>

</FrameLayout>

res/values-land/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -20,5 +20,8 @@ 
<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Number of world clocks in a row, for the clock tab. -->

    <item type="integer" name="world_clocks_per_row">1</item>

    <!-- Total clocks per row is 2 + world_clocks_per_row. -->

    <item type="integer" name="clocks_per_row">3</item>

</resources>

res/values-land/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


    <!-- Size of margin for circles. -->

    <dimen name="circle_margin">8dp</dimen>

    <dimen name="analog_clock_margin">200dp</dimen>

    <dimen name="analog_clock_margin">70dp</dimen>

    <dimen name="timer_circle_margin">8dp</dimen>



    <dimen name="world_clock_margin">8dp</dimen>

res/values-sw600dp-land/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -21,5 +21,8 @@ 
     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <item type="integer" name="timer_column_count">2</item>

    <!-- Number of world clocks in a row, for the clock tab. -->

    <item type="integer" name="world_clocks_per_row">2</item>

    <!-- Total clocks per row is 2 + world_clocks_per_row. -->

    <item type="integer" name="clocks_per_row">4</item>

</resources>

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -24,5 +24,8 @@ 
    <bool name="config_dockAppEnabled">true</bool>

    <bool name="config_rotateAlarmAlert">false</bool>

    <item type="integer" name="timer_column_count">1</item>

    <!-- Number of world clocks in a row, for the clock tab. -->

    <item type="integer" name="world_clocks_per_row">2</item>

    <!-- Total clocks per row is 2 + world_clocks_per_row. -->

    <item type="integer" name="clocks_per_row">4</item>

</resources>