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

Commit b372391c authored by Robyn Coultas's avatar Robyn Coultas
Browse files

Use locale for :00/:60 buttons in Alarm 

Bug:8556721
Also abstracted the dialog background color that contained the buttons.

Change-Id: Ib5fc698ab0354668005065934fda60bb6d73f02f
parent 4fd80b58

res/layout-land/time_setup_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:layout_marginBottom="8dip"

        android:background="#28ffffff" />

        android:background="@color/dialog_gray" />

    <include layout="@layout/three_keys_view"

        android:id="@+id/first" />

res/layout-sw600dp/three_keys_view_ampm.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:layout_height="0dip">

    <Button

        android:id="@+id/key_left"

        android:layoutDirection="locale"

        android:layout_width="0dip"

        android:layout_weight="1"

        style="@style/tablet_dialpad_ampm"
@@ -35,6 +36,7 @@ 
        android:layout_height="match_parent" />

    <Button

        android:id="@+id/key_right"

        android:layoutDirection="locale"

        android:background="@drawable/item_background"

        android:layout_weight="1"

        android:layout_width="0dip"

res/layout/three_keys_view_ampm.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:layout_height="0dip">

    <Button

        android:id="@+id/key_left"

        android:layoutDirection="locale"

        android:layout_width="0dip"

        android:layout_weight="1"

        style="@style/dialpad_ampm"
@@ -35,6 +36,7 @@ 
        android:layout_height="match_parent" />

    <Button

        android:id="@+id/key_right"

        android:layoutDirection="locale"

        android:background="@drawable/item_background"

        android:layout_weight="1"

        android:layout_width="0dip"

res/layout/time_picker_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 
    <View

        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:background="#28ffffff" />

        android:background="@color/dialog_gray" />

    <include layout="@layout/three_keys_view"

        android:id="@+id/first" />

res/layout/time_setup_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:layout_marginBottom="8dip"

        android:background="#28ffffff" />

        android:background="@color/dialog_gray" />

    <include layout="@layout/three_keys_view"

        android:id="@+id/first" />