| commit | 2f5266346fab0ce95ae0c7984d418fd9b241530f | [log] [tgz] |
|---|---|---|
| author | Chuck Liao <chuckliao@google.com> | Tue Nov 02 04:43:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 02 04:43:27 2021 +0000 |
| tree | a1e673cbb3617b8cbc9ad8f8755d47c225bd3f20 | |
| parent | 99d2cc0674ddc385c1147773a2f31541ec5df144 [diff] | |
| parent | 8669478795db5cf90aaf991dc60481ed0e10158f [diff] |
Merge "Fix the title not translated when resuming app from overview" into sc-v2-dev am: 622d32cd9c am: 8669478795 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/16130848 Change-Id: Ic311ee3084aefc1877fa53f8876bf473a6c47d03
diff --git a/src/com/android/customization/model/grid/GridSectionController.java b/src/com/android/customization/model/grid/GridSectionController.java index 5470d77..64a6cce 100644 --- a/src/com/android/customization/model/grid/GridSectionController.java +++ b/src/com/android/customization/model/grid/GridSectionController.java
@@ -74,8 +74,8 @@ } }, /* reload= */ true); - gridSectionView.setOnClickListener(v -> mSectionNavigationController.navigateTo( - GridFragment.newInstance(context.getString(R.string.grid_title)))); + gridSectionView.setOnClickListener( + v -> mSectionNavigationController.navigateTo(new GridFragment())); return gridSectionView; }
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java index 5e5ee6a..d554f72 100644 --- a/src/com/android/customization/picker/grid/GridFragment.java +++ b/src/com/android/customization/picker/grid/GridFragment.java
@@ -61,12 +61,6 @@ 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; @@ -166,6 +160,11 @@ } @Override + public CharSequence getDefaultTitle() { + return getString(R.string.grid_title); + } + + @Override protected void onBottomActionBarReady(BottomActionBar bottomActionBar) { super.onBottomActionBarReady(bottomActionBar); mBottomActionBar = bottomActionBar;