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

Commit 2f526634 authored by Chuck Liao's avatar Chuck Liao Committed by Automerger Merge Worker
Browse files

Merge "Fix the title not translated when resuming app from overview" into... 

Merge "Fix the title not translated when resuming app from overview" into sc-v2-dev am: 622d32cd am: 86694787

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/16130848

Change-Id: Ic311ee3084aefc1877fa53f8876bf473a6c47d03
parents 99d2cc06 86694787

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

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ public class GridSectionController implements CustomizationSectionController<Gri 
            }

        }, /* reload= */ true);



        gridSectionView.setOnClickListener(v -> mSectionNavigationController.navigateTo(

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

        gridSectionView.setOnClickListener(

                v -> mSectionNavigationController.navigateTo(new GridFragment()));



        return gridSectionView;

    }

src/com/android/customization/picker/grid/GridFragment.java

+5 −6
Original line number Diff line number Diff line
@@ -61,12 +61,6 @@ public class GridFragment extends AppbarFragment { 
    private static final String KEY_STATE_BOTTOM_ACTION_BAR_VISIBLE =

            "GridFragment.bottomActionBarVisible";



    public static GridFragment newInstance(CharSequence title) {

        GridFragment fragment = new GridFragment();

        fragment.setArguments(AppbarFragment.createArguments(title));

        return fragment;

    }



    private WallpaperInfo mHomeWallpaper;

    private RecyclerView mOptionsContainer;

    private OptionSelectorController<GridOption> mOptionsController;
@@ -165,6 +159,11 @@ public class GridFragment extends AppbarFragment { 
        }

    }



    @Override

    public CharSequence getDefaultTitle() {

        return getString(R.string.grid_title);

    }



    @Override

    protected void onBottomActionBarReady(BottomActionBar bottomActionBar) {

        super.onBottomActionBarReady(bottomActionBar);