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

Commit 6f26c7c9 authored by Luca Stefani's avatar Luca Stefani
Browse files

DeskClock: Remove empty MenuItemControllerFactory 

Change-Id: If4e1fde3a27907c2a2f961d744b6fd357e0bb509
parent 3aa3517d

src/com/android/deskclock/DeskClock.java

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import androidx.appcompat.app.ActionBar; 
import androidx.appcompat.widget.Toolbar;

import androidx.fragment.app.Fragment;



import com.android.deskclock.actionbarmenu.MenuItemControllerFactory;

import com.android.deskclock.actionbarmenu.OptionsMenuManager;

import com.android.deskclock.actionbarmenu.SettingsMenuItemController;

import com.android.deskclock.data.DataModel;
@@ -161,8 +160,6 @@ public class DeskClock extends BaseActivity 


        // Configure the menu item controllers add behavior to the toolbar.

        mOptionsMenuManager.addMenuItemController(new SettingsMenuItemController(this));

        mOptionsMenuManager.addMenuItemController(

                MenuItemControllerFactory.getInstance().buildMenuItemControllers(this));



        // Inflate the menu during creation to avoid a double layout pass. Otherwise, the menu

        // inflation occurs *after* the initial draw and a second layout pass adds in the menu.

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

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 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.

 */



package com.android.deskclock.actionbarmenu;



import android.app.Activity;



import java.util.ArrayList;

import java.util.List;



/**

 * Factory that builds optional {@link MenuItemController} instances.

 */

public final class MenuItemControllerFactory {



    private static final MenuItemControllerFactory INSTANCE = new MenuItemControllerFactory();



    public static MenuItemControllerFactory getInstance() {

        return INSTANCE;

    }



    private final List<MenuItemProvider> mMenuItemProviders;



    private MenuItemControllerFactory() {

        mMenuItemProviders = new ArrayList<>();

    }



    public MenuItemController[] buildMenuItemControllers(Activity activity) {

        final int providerSize = mMenuItemProviders.size();

        final MenuItemController[] controllers = new MenuItemController[providerSize];

        for (int i = 0; i < providerSize; i++) {

            controllers[i] = mMenuItemProviders.get(i).provide(activity);

        }

        return controllers;

    }

}

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

+1 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.deskclock.DropShadowController; 
import com.android.deskclock.R;

import com.android.deskclock.Utils;

import com.android.deskclock.actionbarmenu.MenuItemController;

import com.android.deskclock.actionbarmenu.MenuItemControllerFactory;

import com.android.deskclock.actionbarmenu.NavUpMenuItemController;

import com.android.deskclock.actionbarmenu.OptionsMenuManager;

import com.android.deskclock.actionbarmenu.SearchMenuItemController;
@@ -129,9 +128,7 @@ public final class CitySelectionActivity extends BaseActivity { 
        mOptionsMenuManager.addMenuItemController(new NavUpMenuItemController(this))

                .addMenuItemController(mSearchMenuItemController)

                .addMenuItemController(new SortOrderMenuItemController())

                .addMenuItemController(new SettingsMenuItemController(this))

                .addMenuItemController(MenuItemControllerFactory.getInstance()

                        .buildMenuItemControllers(this));

                .addMenuItemController(new SettingsMenuItemController(this));

        mCitiesList = findViewById(R.id.cities_list);

        mCitiesList.setAdapter(mCitiesAdapter);