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

Commit 22a168c9 authored by Erik's avatar Erik Committed by Android (Google) Code Review
Browse files

Merge "b/5397609 Remove uneeded menu items from DeskClock screen"

parents 0e5636d2 927b49cc

res/menu/desk_clock_menu.xml

+0 −6
Original line number Diff line number Diff line
@@ -15,12 +15,6 @@ 
-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@+id/menu_item_alarms"

        android:title="@string/alarm_list_title"

        android:icon="@drawable/ic_menu_alarms"/>

    <item android:id="@+id/menu_item_add_alarm"

        android:title="@string/add_alarm"

        android:icon="@drawable/ic_menu_add"/>

    <item android:id="@+id/menu_item_dock_settings"

        android:title="@string/menu_item_dock_settings"

        android:icon="@android:drawable/ic_menu_preferences"/>

src/com/android/deskclock/AlarmClock.java

+1 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ public class AlarmClock extends Activity implements OnItemClickListener { 
                return true;

            case R.id.menu_item_desk_clock:

                startActivity(new Intent(this, DeskClock.class));

                finish();

                return true;

            case R.id.menu_item_add_alarm:

                addNewAlarm();

src/com/android/deskclock/DeskClock.java

+0 −6
Original line number Diff line number Diff line
@@ -561,12 +561,6 @@ public class DeskClock extends Activity { 
    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        switch (item.getItemId()) {

            case R.id.menu_item_alarms:

                startActivity(new Intent(DeskClock.this, AlarmClock.class));

                return true;

            case R.id.menu_item_add_alarm:

                startActivity(new Intent(this, SetAlarm.class));

                return true;

            case R.id.menu_item_dock_settings:

                startActivity(new Intent(DOCK_SETTINGS_ACTION));

                return true;