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

Commit 8737d037 authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Remove unused 'Help' menu item 

Bug: 26291852
Change-Id: I2bb1641d6df698d87d85046dad20ce0f9906a3f8
parent b94725ca

res/menu/desk_clock_menu.xml

+1 −5
Original line number Diff line number Diff line
@@ -38,9 +38,5 @@ 
            android:id="@+id/menu_item_settings"

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

            android:title="@string/menu_item_settings"/>

        <item

            android:id="@+id/menu_item_help"

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

            android:title="@string/menu_item_help"/>

    </group>

</menu>

src/com/android/deskclock/DeskClock.java

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.app.Fragment; 
import android.app.FragmentManager;

import android.content.Context;

import android.content.Intent;

import android.media.AudioManager;

import android.net.Uri;

import android.os.Bundle;

import android.support.design.widget.TabLayout;
@@ -73,7 +72,7 @@ public class DeskClock extends BaseActivity 
    private enum FabState { SHOWING, HIDE_ARMED, HIDING }



    /** Coordinates handling of context menu items. */

    private final ActionBarMenuManager mActionBarMenuManager = new ActionBarMenuManager(this);

    private final ActionBarMenuManager mActionBarMenuManager = new ActionBarMenuManager();



    /** Shrinks the {@link #mFab}, {@link #mLeftButton} and {@link #mRightButton} to nothing. */

    private final AnimatorSet mHideAnimation = new AnimatorSet();

src/com/android/deskclock/actionbarmenu/ActionBarMenuManager.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public final class ActionBarMenuManager { 
    // A map of all menu item controllers, keyed by menu item id.

    private final ArrayMap<Integer, MenuItemController> mControllers;



    public ActionBarMenuManager(Activity activity) {

    public ActionBarMenuManager() {

        mControllers = new ArrayMap<>();

    }

src/com/android/deskclock/settings/SettingsActivity.java

+1 −4
Original line number Diff line number Diff line
@@ -19,10 +19,8 @@ package com.android.deskclock.settings; 
import android.app.Activity;

import android.app.DialogFragment;

import android.app.FragmentTransaction;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.media.AudioManager;

import android.net.Uri;

import android.os.Bundle;

import android.provider.Settings;
@@ -47,7 +45,6 @@ import com.android.deskclock.data.DataModel; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Locale;

import java.util.TimeZone;



/**
@@ -77,7 +74,7 @@ public final class SettingsActivity extends BaseActivity 
    public static final String PREFS_FRAGMENT_TAG = "prefs_fragment";

    public static final String PREFERENCE_DIALOG_FRAGMENT_TAG = "preference_dialog";



    private final ActionBarMenuManager mActionBarMenuManager = new ActionBarMenuManager(this);

    private final ActionBarMenuManager mActionBarMenuManager = new ActionBarMenuManager();



    @Override

    protected void onCreate(Bundle savedInstanceState) {

src/com/android/deskclock/worldclock/CitySelectionActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.deskclock.worldclock;



import android.content.Context;

import android.media.AudioManager;

import android.os.Bundle;

import android.support.v7.widget.SearchView;

import android.text.TextUtils;
@@ -80,7 +79,7 @@ public final class CitySelectionActivity extends BaseActivity { 
    private CityAdapter mCitiesAdapter;



    /** Manages all action bar menu display and click handling. */

    private final ActionBarMenuManager mActionBarMenuManager = new ActionBarMenuManager(this);

    private final ActionBarMenuManager mActionBarMenuManager = new ActionBarMenuManager();



    /** Menu item controller for search view. */

    private SearchMenuItemController mSearchMenuItemController;