Merge "Fix SetAlarm preferences for Tablets" into jb-dev (1779cd08) · Commits · e / os / android_packages_apps_DeskClock

res/layout-sw600dp/set_alarm.xml

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2010, 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"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<ListView android:id="@android:id/list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="16dip"
		android:layout_marginRight="16dip"
		android:layout_weight="1"/>

		<View
		android:layout_width="match_parent"
		android:layout_height="1dip"
		android:layout_marginLeft="16dip"
		android:layout_marginRight="16dip"
		android:background="?android:attr/dividerHorizontal" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		style="?android:attr/buttonBarStyle">

		<Button android:id="@+id/alarm_revert"
		style="?android:attr/buttonBarButtonStyle"
		android:focusable="true"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:text="@android:string/cancel"/>

		<Button android:id="@+id/alarm_delete"
		style="?android:attr/buttonBarButtonStyle"
		android:focusable="true"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:text="@string/delete"/>

		<Button android:id="@+id/alarm_save"
		style="?android:attr/buttonBarButtonStyle"
		android:focusable="true"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:text="@android:string/ok"/>

		</LinearLayout>

		</LinearLayout>

src/com/android/deskclock/SetAlarm.java

+48 −1

Original line number	Diff line number	Diff line
		@@ -132,6 +132,43 @@ public class SetAlarm extends PreferenceActivity implements Preference.OnPrefere
		}
		});
		}

		// Attach actions to each button.
		Button b = (Button) findViewById(R.id.alarm_save);
		if (b != null) {
		b.setOnClickListener(new View.OnClickListener() {
		public void onClick(View v) {
		long time = saveAlarm(null);
		if(mEnabledPref.isChecked()) {
		popAlarmSetToast(SetAlarm.this, time);
		}
		finish();
		}
		});
		}
		b = (Button) findViewById(R.id.alarm_revert);
		if (b != null) {
		b.setOnClickListener(new View.OnClickListener() {
		public void onClick(View v) {
		revert();
		finish();
		}
		});
		}
		b = (Button) findViewById(R.id.alarm_delete);
		if (b != null) {
		if (mId == -1) {
		b.setEnabled(false);
		b.setVisibility(View.GONE);
		} else {
		b.setVisibility(View.VISIBLE);
		b.setOnClickListener(new View.OnClickListener() {
		public void onClick(View v) {
		deleteAlarm();
		}
		});
		}
		}
		}

		@Override
		@@ -319,6 +356,16 @@ public class SetAlarm extends PreferenceActivity implements Preference.OnPrefere
		}
		}

		private void revert() {
		int newId = mId;
		// "Revert" on a newly created alarm should delete it.
		if (mOriginalAlarm.id == -1) {
		Alarms.deleteAlarm(SetAlarm.this, newId);
		} else {
		saveAlarm(mOriginalAlarm);
		}
		}

		/**
		* Store any changes to the alarm and exit the activity.
		* Show a toast if the alarm is enabled with the time remaining until alarm