Merge "Update DeskClock's ActionBar for Alarm List" into jb-dev (5ddc974f) · Commits · e / os / android_packages_apps_DeskClock

res/layout/alarm_clock.xml

+4 −46

Original line number	Diff line number	Diff line
		@@ -14,51 +14,9 @@
		limitations under the License.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/base_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<LinearLayout
		android:id="@+id/add_alarm"
		android:clickable="true"
		android:focusable="true"
		android:layout_width="match_parent"
		android:layout_height="?android:attr/listPreferredItemHeight"
		android:orientation="horizontal"
		android:background="?android:attr/listChoiceBackgroundIndicator">

		<ImageView
		style="@style/alarm_list_left_column"
		android:duplicateParentState="true"
		android:gravity="center"
		android:scaleType="center"
		android:src="@drawable/ic_menu_add" />

		<TextView
		android:duplicateParentState="true"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center_vertical"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:textColor="?android:attr/textColorPrimary"
		android:text="@string/add_alarm" />

		</LinearLayout>

		<ImageView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:scaleType="fitXY"
		android:gravity="fill_horizontal"
		android:src="@android:drawable/divider_horizontal_dark" />

		<ListView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/alarms_list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1" />

		</LinearLayout>

+4 −9

Original line number	Diff line number	Diff line
		@@ -15,19 +15,14 @@
		-->

		<menu xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:id="@+id/menu_item_desk_clock"
		android:title="@string/menu_desk_clock"
		android:icon="@drawable/ic_menu_desk_clock"/>
		<item android:id="@+id/menu_item_add_alarm"
		android:title="@string/add_alarm"
		android:icon="@drawable/ic_menu_add"/>
		android:icon="@drawable/ic_menu_add"
		android:showAsAction="always"/>
		<item android:id="@+id/menu_item_settings"
		android:title="@string/settings"
		android:icon="@android:drawable/ic_menu_preferences"/>
		<item android:id="@+id/menu_item_done"
		android:title="@string/done"
		android:icon="?android:attr/actionModeCloseDrawable"
		android:showAsAction="ifRoom\|withText" />
		android:icon="@android:drawable/ic_menu_preferences"
		android:showAsAction="never"/>
		</menu>

+20 −11

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.deskclock;

		import android.app.ActionBar;
		import android.app.Activity;
		import android.app.AlertDialog;
		import android.content.Context;
		@@ -211,6 +212,7 @@ public class AlarmClock extends Activity implements OnItemClickListener {
		mAlarmsList.setOnCreateContextMenuListener(this);

		View addAlarm = findViewById(R.id.add_alarm);
		if (addAlarm != null) {
		addAlarm.setOnClickListener(new View.OnClickListener() {
		public void onClick(View v) {
		addNewAlarm();
		@@ -222,6 +224,8 @@ public class AlarmClock extends Activity implements OnItemClickListener {
		v.setSelected(hasFocus);
		}
		});
		}

		View doneButton = findViewById(R.id.done);
		if (doneButton != null) {
		doneButton.setOnClickListener(new View.OnClickListener() {
		@@ -230,6 +234,11 @@ public class AlarmClock extends Activity implements OnItemClickListener {
		}
		});
		}

		ActionBar actionBar = getActionBar();
		if (actionBar != null) {
		actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
		}
		}

		private void addNewAlarm() {
		@@ -291,7 +300,7 @@ public class AlarmClock extends Activity implements OnItemClickListener {
		case R.id.menu_item_add_alarm:
		addNewAlarm();
		return true;
		case R.id.menu_item_done:
		case android.R.id.home:
		finish();
		return true;
		default: