Snap for 7277590 from 38ece772c2ce11fd5ece9950f3e87909de65560c to sc-v2-release (3adb011c) · Commits · e / os / android_packages_apps_ThemePicker

res/menu/custom_theme_editor_menu.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -14,11 +14,10 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<menu xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto">
		<menu xmlns:android="http://schemas.android.com/apk/res/android">
		<item
		android:id="@+id/custom_theme_delete"
		android:title="@string/custom_theme_delete"
		android:icon="@drawable/ic_delete_24px"
		app:showAsAction="always"/>
		android:showAsAction="always"/>
		</menu>
		No newline at end of file

+22 −1

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ import com.android.wallpaper.picker.MyPhotosStarter.PermissionChangedListener;
		import com.android.wallpaper.picker.TopLevelPickerActivity;
		import com.android.wallpaper.picker.WallpaperPickerDelegate;
		import com.android.wallpaper.picker.WallpapersUiContainer;
		import com.android.wallpaper.util.ActivityUtils;
		import com.android.wallpaper.util.DeepLinkUtils;
		import com.android.wallpaper.widget.BottomActionBar;
		import com.android.wallpaper.widget.BottomActionBar.BottomActionBarHost;
		@@ -505,7 +506,27 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal

		@Override
		public void onUpArrowPressed() {
		onBackPressed();
		Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
		if (fragment instanceof BottomActionBarFragment
		&& ((BottomActionBarFragment) fragment).onBackPressed()) {
		return;
		}

		// For wallpaper tab, since it had child fragment.
		if (mWallpaperCategoryFragment != null && mWallpaperCategoryFragment.popChildFragment()) {
		return;
		}

		if (getSupportFragmentManager().popBackStackImmediate()) {
		return;
		}

		if (!ActivityUtils.isLaunchedFromSettings(getIntent())) {
		Intent intent = new Intent(Settings.ACTION_SETTINGS);
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_ACTIVITY_CLEAR_TASK);
		startActivity(intent);
		}
		finish();
		}

		@Override

+1 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import com.android.wallpaper.model.WallpaperInfo;
		import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
		import com.android.wallpaper.module.InjectorProvider;
		import com.android.wallpaper.picker.AppbarFragment;
		import com.android.wallpaper.util.ActivityUtils;
		import com.android.wallpaper.widget.BottomActionBar;

		import com.bumptech.glide.Glide;
		@@ -111,7 +110,7 @@ public class GridFragment extends AppbarFragment {
		@Nullable Bundle savedInstanceState) {
		View view = inflater.inflate(
		R.layout.fragment_grid_picker, container, /* attachToRoot */ false);
		setUpToolbar(view, ActivityUtils.isLaunchedFromSettings(getActivity().getIntent()));
		setUpToolbar(view);
		mContent = view.findViewById(R.id.content_section);
		mOptionsContainer = view.findViewById(R.id.options_container);
		mLoading = view.findViewById(R.id.loading_indicator);

+1 −2

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import com.android.wallpaper.model.WallpaperInfo;
		import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
		import com.android.wallpaper.module.InjectorProvider;
		import com.android.wallpaper.picker.AppbarFragment;
		import com.android.wallpaper.util.ActivityUtils;
		import com.android.wallpaper.widget.BottomActionBar;
		import com.android.wallpaper.widget.BottomActionBar.AccessibilityCallback;

		@@ -116,7 +115,7 @@ public class ThemeFragment extends AppbarFragment {
		@Nullable Bundle savedInstanceState) {
		View view = inflater.inflate(
		R.layout.fragment_theme_picker, container, /* attachToRoot */ false);
		setUpToolbar(view, ActivityUtils.isLaunchedFromSettings(getActivity().getIntent()));
		setUpToolbar(view);

		mContent = view.findViewById(R.id.content_section);
		mLoading = view.findViewById(R.id.loading_indicator);