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

Commit 8d14e8ac authored by Chihhang Chuang's avatar Chihhang Chuang
Browse files

Replace "Hub" naming with "Customization" 

- Since "Hub" is a meaningless naming.
- Also update "Mode" prefix naming to "DarkMode".
- Remove unused interface in Injector.

Bug: 190354625
Test: Manually
Change-Id: I5293f590070e9f4a852ab31e64506639a549a558
parent 1187d676

res/layout/mode_section_view.xml→res/layout/dark_mode_section_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.customization.picker.mode.ModeSectionView

<com.android.customization.picker.mode.DarkModeSectionView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -41,4 +41,4 @@ 
        android:focusable="false"

        style="@style/Switch.SettingsLib" />



</com.android.customization.picker.mode.ModeSectionView>
 
</com.android.customization.picker.mode.DarkModeSectionView>

src/com/android/customization/model/CustomizationManager.java

+0 −14
Original line number Diff line number Diff line
@@ -27,20 +27,6 @@ import java.util.List; 
 */

public interface CustomizationManager<T extends CustomizationOption> {



    /**

     * Create a new {@link CustomizationSection} corresponding to this Manager

     */

    default CustomizationSection<T> createSection() {

        return null;

    }



    /**

     * @return the id in the navigation menu for the section this Manager manages.

     */

    default int getNavId() {

        return 0;

    };



    /**

     * Callback for applying a customization option.

     */

src/com/android/customization/model/CustomizationSection.java

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

 * Copyright (C) 2021 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.customization.model;



import android.content.Context;



import androidx.annotation.IdRes;

import androidx.fragment.app.Fragment;



/**

 * Represents a section of the Picker (eg "ThemeBundle", "Clock", etc).

 * There should be a concrete subclass per available section, providing the corresponding

 * Fragment to be displayed when switching to each section.

 * @param <T> CustomizationOption that this section represents.

 */

public abstract class CustomizationSection<T extends CustomizationOption> {



    /**

     * IdRes used to identify this section in the BottomNavigationView menu.

     */

    @IdRes

    public final int id;

    protected final CustomizationManager<T> mCustomizationManager;



    public CustomizationSection(@IdRes int id, CustomizationManager<T> manager) {

        this.id = id;

        mCustomizationManager = manager;

    }



    /**

     * @return the Fragment corresponding to this section.

     */

    public abstract Fragment getFragment(Context c);



    public CustomizationManager<T> getCustomizationManager() {

        return mCustomizationManager;

    }



}

src/com/android/customization/model/grid/GridOptionsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class GridOptionsManager implements CustomizationManager<GridOption> { 
    private final ThemesUserEventLogger mEventLogger;



    /** Returns the {@link GridOptionsManager} instance. */

    public static GridOptionsManager get(Context context) {

    public static GridOptionsManager getInstance(Context context) {

        if (sGridOptionsManager == null) {

            Context appContext = context.getApplicationContext();

            CustomizationInjector injector = (CustomizationInjector) InjectorProvider.getInjector();

src/com/android/customization/model/grid/GridSectionController.java

+7 −7
Original line number Diff line number Diff line
@@ -27,22 +27,22 @@ import com.android.customization.model.CustomizationManager.OptionsFetchedListen 
import com.android.customization.picker.grid.GridFragment;

import com.android.customization.picker.grid.GridSectionView;

import com.android.wallpaper.R;

import com.android.wallpaper.model.HubSectionController;

import com.android.wallpaper.model.CustomizationSectionController;



import java.util.List;



/** A {@link HubSectionController} for app grid. */

public class GridSectionController implements HubSectionController<GridSectionView> {

/** A {@link CustomizationSectionController} for app grid. */

public class GridSectionController implements CustomizationSectionController<GridSectionView> {



    private static final String TAG = "GridSectionController";



    private final GridOptionsManager mGridOptionsManager;

    private final HubSectionNavigationController mHubSectionNavigationController;

    private final CustomizationSectionNavigationController mSectionNavigationController;



    public GridSectionController(GridOptionsManager gridOptionsManager,

            HubSectionNavigationController hubSectionNavigationController) {

            CustomizationSectionNavigationController sectionNavigationController) {

        mGridOptionsManager = gridOptionsManager;

        mHubSectionNavigationController = hubSectionNavigationController;

        mSectionNavigationController = sectionNavigationController;

    }



    @Override
@@ -74,7 +74,7 @@ public class GridSectionController implements HubSectionController<GridSectionVi 
            }

        }, /* reload= */ true);



        gridSectionView.setOnClickListener(v -> mHubSectionNavigationController.navigateTo(

        gridSectionView.setOnClickListener(v -> mSectionNavigationController.navigateTo(

                GridFragment.newInstance(context.getString(R.string.grid_title))));



        return gridSectionView;