Merge "Fix the title not translated when resuming app from overview" into sc-v2-dev (622d32cd) · Commits · e / os / android_packages_apps_ThemePicker

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;
		}

+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);