hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug where clearing numpad did not disable the FAB

Browse Source
This commit is contained in:
Phillip Hsu
2016-07-16 00:39:39 -07:00
parent 231aa9a280
commit c0b914500d
3 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/dialog_time_picker_numpad.xml
+13 -20
View File
@@ -1,21 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<RelativeLayout
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/header_height"
android:background="@color/colorPrimary">
<ImageButton
android:id="@+id/cancel_icon"
android:layout_width="@dimen/cancel_icon_size"
android:layout_height="match_parent"
android:src="@android:drawable/ic_menu_close_clear_cancel"
android:background="?selectableItemBackground"
android:layout_alignParentStart="true"/>
android:minHeight="@dimen/header_height"
android:background="@color/colorPrimary"
android:layout_alignParentTop="true">
<!-- We want this to be an EditText because the cursor indicates
where the user's input will go. Otherwise, when the dialog first
@@ -26,18 +20,17 @@
android:id="@+id/input_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/cancel_icon"
android:layout_centerInParent="true"
android:textAlignment="center"
android:textSize="@dimen/time_input_text_size"
android:text="12:00 AM"
android:background="@null"
android:background="@android:color/transparent"
style="@style/TextAppearance.AppCompat.Inverse"/>
</RelativeLayout>
</android.support.v7.widget.Toolbar>
<com.philliphsu.clock2.editalarm.NumpadTimePicker
android:id="@+id/number_grid"
android:layout_width="match_parent"
android:layout_height="@dimen/numpad_height"/>
android:layout_height="@dimen/numpad_height"
android:layout_below="@id/toolbar"/>
</LinearLayout>
</RelativeLayout>