mirror of https://github.com/tasks/tasks
Move alarm control set to main edit screen
parent
f42d5013f3
commit
34508ab6d1
@ -1,52 +1,24 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- Copyright (C) 2008 The Android Open Source Project
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:orientation="vertical"
|
android:orientation="horizontal"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingLeft="5dip"
|
android:paddingBottom="@dimen/task_edit_padding_top_bottom"
|
||||||
android:paddingRight="5dip">
|
android:layout_marginBottom="@dimen/task_edit_padding_top_bottom" >
|
||||||
<LinearLayout
|
|
||||||
android:orientation="horizontal"
|
<TextView
|
||||||
android:layout_width="fill_parent"
|
style="@android:style/TextAppearance"
|
||||||
android:layout_height="wrap_content"
|
android:id="@+id/alarm_string"
|
||||||
android:gravity="center_vertical">
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
<TextView
|
android:layout_weight="100"
|
||||||
android:id="@+id/alarm_string"
|
android:textColor="?attr/asTextColor" />
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
<ImageButton
|
||||||
android:layout_weight="100"
|
android:id="@+id/button1"
|
||||||
android:paddingTop="15dip"
|
android:background="@drawable/btn_dismiss"
|
||||||
android:paddingBottom="15dip"
|
android:layout_width="32dip"
|
||||||
style="@style/TextAppearance"/>
|
android:layout_height="32dip"
|
||||||
|
android:layout_gravity="center"
|
||||||
<ImageButton android:id="@+id/button1"
|
android:layout_weight="1" />
|
||||||
android:background="@drawable/btn_dismiss"
|
|
||||||
android:layout_width="32dip"
|
|
||||||
android:layout_height="32dip"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:layout_margin="4dip"
|
|
||||||
android:layout_weight="1"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
<View
|
|
||||||
android:id="@+id/TEA_Separator"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="1px"
|
|
||||||
android:background="?android:attr/listDivider" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -1,47 +1,28 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
<!--
|
|
||||||
** Copyright (c) 2012 Todoroo Inc
|
** Copyright (c) 2012 Todoroo Inc
|
||||||
**
|
**
|
||||||
** See the file "LICENSE" for the full license governing this code.
|
** See the file "LICENSE" for the full license governing this code.
|
||||||
-->
|
-->
|
||||||
<LinearLayout
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
android:orientation="vertical"
|
||||||
android:orientation="vertical"
|
android:layout_width="fill_parent"
|
||||||
android:layout_width="fill_parent"
|
android:layout_height="fill_parent">
|
||||||
android:layout_height="fill_parent">
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/alert_container"
|
||||||
<TextView android:id="@+id/alarms_label"
|
android:orientation="vertical"
|
||||||
android:layout_marginLeft="10dip"
|
android:layout_width="fill_parent"
|
||||||
android:layout_marginTop="10dip"
|
android:layout_height="wrap_content" />
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
<TextView
|
||||||
android:text="@string/alarm_ACS_label"
|
style="@android:style/TextAppearance"
|
||||||
style="@style/TextAppearance" />
|
android:id="@+id/alarms_add"
|
||||||
<LinearLayout android:id="@+id/alert_container"
|
android:layout_width="fill_parent"
|
||||||
android:paddingLeft="5dip"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
android:text="@string/add_a_reminder"
|
||||||
android:layout_width="fill_parent"
|
android:textColor="?attr/asTextColorHint"
|
||||||
android:layout_height="wrap_content">
|
android:layout_marginBottom="@dimen/task_edit_padding_top_bottom"
|
||||||
</LinearLayout>
|
android:paddingBottom="@dimen/task_edit_padding_top_bottom" />
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/alarms_add"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center_vertical">
|
|
||||||
<TextView
|
|
||||||
android:text="+"
|
|
||||||
android:gravity="center"
|
|
||||||
android:textSize="26sp"
|
|
||||||
android:textColor="?attr/asThemeTextColor"
|
|
||||||
android:layout_width="40dip"
|
|
||||||
android:layout_height="40dip"/>
|
|
||||||
<TextView
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/alarm_ACS_button"
|
|
||||||
style="@style/TextAppearance" />
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -1,102 +1,101 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
<!--
|
|
||||||
** Copyright (c) 2012 Todoroo Inc
|
** Copyright (c) 2012 Todoroo Inc
|
||||||
**
|
**
|
||||||
** See the file "LICENSE" for the full license governing this code.
|
** See the file "LICENSE" for the full license governing this code.
|
||||||
-->
|
-->
|
||||||
<LinearLayout
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
android:layout_width="fill_parent"
|
||||||
android:layout_width="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:orientation="vertical"
|
||||||
android:orientation="vertical"
|
android:paddingLeft="5dip"
|
||||||
android:paddingLeft="5dip"
|
android:paddingRight="5dip">
|
||||||
android:paddingRight="5dip">
|
|
||||||
<ScrollView
|
<LinearLayout
|
||||||
android:layout_width="fill_parent"
|
android:id="@+id/reminders_body"
|
||||||
android:layout_height="fill_parent"
|
android:orientation="vertical"
|
||||||
android:layout_weight="100"
|
android:layout_width="fill_parent"
|
||||||
android:minWidth="320dip">
|
android:layout_height="fill_parent">
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/reminders_body"
|
<!-- reminders -->
|
||||||
android:orientation="vertical"
|
<TextView
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingLeft="10dip"
|
||||||
<!-- reminders -->
|
android:text="@string/TEA_reminder_label"
|
||||||
<TextView
|
android:paddingTop="10dip"
|
||||||
android:layout_width="wrap_content"
|
style="@style/TextAppearance" />
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingLeft="10dip"
|
<CheckBox
|
||||||
android:text="@string/TEA_reminder_label"
|
style="@style/TextAppearance"
|
||||||
android:paddingTop="10dip"
|
android:id="@+id/reminder_due"
|
||||||
style="@style/TextAppearance" />
|
android:layout_width="fill_parent"
|
||||||
<CheckBox
|
android:layout_height="wrap_content"
|
||||||
style="@style/TextAppearance"
|
android:layout_marginLeft="10dip"
|
||||||
android:id="@+id/reminder_due"
|
android:text="@string/TEA_reminder_due" />
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
<CheckBox
|
||||||
android:layout_marginLeft="10dip"
|
style="@style/TextAppearance"
|
||||||
android:text="@string/TEA_reminder_due" />
|
android:id="@+id/reminder_overdue"
|
||||||
<CheckBox
|
android:layout_width="fill_parent"
|
||||||
style="@style/TextAppearance"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/reminder_overdue"
|
android:layout_marginLeft="10dip"
|
||||||
android:layout_width="fill_parent"
|
android:text="@string/TEA_reminder_overdue" />
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="10dip"
|
<LinearLayout
|
||||||
android:text="@string/TEA_reminder_overdue" />
|
android:orientation="horizontal"
|
||||||
<LinearLayout
|
android:layout_width="fill_parent"
|
||||||
android:orientation="horizontal"
|
android:layout_height="fill_parent">
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent">
|
<CheckBox
|
||||||
<CheckBox
|
style="@style/TextAppearance"
|
||||||
style="@style/TextAppearance"
|
android:id="@+id/reminder_random"
|
||||||
android:id="@+id/reminder_random"
|
android:layout_width="wrap_content"
|
||||||
android:layout_width="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_marginLeft="10dip"
|
||||||
android:layout_marginLeft="10dip"
|
android:text="@string/TEA_reminder_randomly" />
|
||||||
android:text="@string/TEA_reminder_randomly" />
|
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/reminder_random_interval"
|
android:id="@+id/reminder_random_interval"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<View
|
|
||||||
android:layout_width="fill_parent"
|
<View
|
||||||
android:layout_height="1px"
|
android:layout_width="fill_parent"
|
||||||
android:background="?android:attr/listDivider" />
|
android:layout_height="1px"
|
||||||
<LinearLayout
|
android:background="?android:attr/listDivider" />
|
||||||
android:id="@+id/reminder_alarm_container"
|
|
||||||
android:layout_width="fill_parent"
|
<LinearLayout
|
||||||
android:layout_height="50dip"
|
android:id="@+id/reminder_alarm_container"
|
||||||
android:layout_marginLeft="10dip"
|
android:layout_width="fill_parent"
|
||||||
android:layout_marginRight="10dip"
|
android:layout_height="50dip"
|
||||||
android:gravity="center_vertical"
|
android:layout_marginLeft="10dip"
|
||||||
android:orientation="horizontal">
|
android:layout_marginRight="10dip"
|
||||||
<TextView
|
android:gravity="center_vertical"
|
||||||
android:layout_width="wrap_content"
|
android:orientation="horizontal">
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/TEA_reminder_alarm_label"
|
<TextView
|
||||||
style="@style/TextAppearance" />
|
android:layout_width="wrap_content"
|
||||||
<TextView
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/reminder_alarm_display"
|
android:text="@string/TEA_reminder_alarm_label"
|
||||||
android:layout_width="fill_parent"
|
style="@style/TextAppearance" />
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1"
|
<TextView
|
||||||
android:gravity="right"
|
android:id="@+id/reminder_alarm_display"
|
||||||
android:paddingLeft="10dip"
|
android:layout_width="fill_parent"
|
||||||
android:textColor="?attr/asThemeTextColor" />
|
android:layout_height="wrap_content"
|
||||||
<Spinner
|
android:layout_weight="1"
|
||||||
android:id="@+id/reminder_alarm"
|
android:gravity="right"
|
||||||
android:layout_width="0dip"
|
android:paddingLeft="10dip"
|
||||||
android:layout_height="wrap_content" />
|
android:textColor="?attr/asThemeTextColor" />
|
||||||
</LinearLayout>
|
|
||||||
<View
|
<Spinner
|
||||||
android:id="@+id/TEA_Separator"
|
android:id="@+id/reminder_alarm"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="0dip"
|
||||||
android:layout_height="1px"
|
android:layout_height="wrap_content" />
|
||||||
android:background="?android:attr/listDivider" />
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
|
||||||
<include layout="@layout/control_dialog_ok"/>
|
<include layout="@layout/control_dialog_ok" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
|
|
||||||
<!-- Task Edit Activity: Container Label -->
|
|
||||||
<string name="alarm_ACS_label">Alarms</string>
|
|
||||||
|
|
||||||
<!-- Task Edit Activity: Add New Alarm -->
|
|
||||||
<string name="alarm_ACS_button">Add an Alarm</string>
|
|
||||||
|
|
||||||
</resources>
|
|
Loading…
Reference in New Issue