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

Commit c8824e56 authored by Steve Levis's avatar Steve Levis
Browse files

Update DeskClock's ActionBar for Alarm List 

- add "up affordance" to go back to desk clock
- remove "desk clock" menu item from overflow menu
- remove "Add alarm" list item.  Only have '+' in actionbar

Bug: 5954770
Change-Id: I458d8b3e9fa212c9807b6f3e928a3f2b19e47b7c
parent e4b6e5b6

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>

res/menu/alarm_list_menu.xml

+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>

src/com/android/deskclock/AlarmClock.java

+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: