Merge "Impl the selecting flow in style picker" into ub-launcher3-master (cb6d3c38) · Commits · e / os / android_packages_apps_ThemePicker

res/layout/custom_theme_option.xml

+11 −4

Original line number	Diff line number	Diff line
		@@ -16,15 +16,22 @@
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:paddingHorizontal="@dimen/option_padding_horizontal"
		android:paddingBottom="@dimen/option_bottom_margin"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical">

		<TextView
		android:id="@+id/option_label"
		android:layout_width="wrap_content"
		android:layout_width="@dimen/option_tile_width"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:layout_marginBottom="@dimen/theme_option_label_margin"
		android:ellipsize="end"
		android:gravity="center_horizontal"
		android:maxLines="1"
		android:textAppearance="@style/OptionTitleTextAppearance"/>
		<FrameLayout
		android:id="@+id/option_tile"
		@@ -35,8 +42,8 @@
		android:paddingVertical="@dimen/option_tile_padding_vertical"
		android:background="@drawable/option_border_custom">
		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_width="@dimen/option_icon_size"
		android:layout_height="@dimen/option_icon_size"
		android:layout_gravity="center"
		android:src="@drawable/ic_add_24px"
		android:tint="?android:attr/colorAccent" />

res/layout/theme_option.xml

+6 −6

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingRight="2dp"
		android:paddingHorizontal="@dimen/option_padding_horizontal"
		android:paddingBottom="@dimen/option_bottom_margin"
		android:clipChildren="false"
		android:clipToPadding="false"
		@@ -47,21 +47,21 @@
		android:layout_height="@dimen/theme_option_icon_sample_height"
		android:layout_alignParentTop="true"
		android:layout_alignParentLeft="true"
		android:layout_margin="@dimen/theme_option_sample_padding"
		android:tint="?android:colorForeground"/>
		<ImageView
		android:id="@+id/theme_option_shape"
		android:layout_width="@dimen/theme_option_shape_sample_width"
		android:layout_height="@dimen/theme_option_shape_sample_height"
		android:layout_alignParentRight="true"
		android:layout_alignBottom="@+id/theme_option_icon"
		android:layout_marginHorizontal="@dimen/theme_option_sample_padding"/>
		android:layout_toEndOf="@id/theme_option_icon"
		android:layout_marginLeft="@dimen/theme_option_sample_margin"/>
		<TextView
		android:id="@+id/theme_option_font"
		android:layout_width="@dimen/theme_option_font_sample_width"
		android:layout_height="@dimen/theme_option_font_sample_height"
		android:layout_alignParentBottom="true"
		android:layout_gravity="center_horizontal"
		android:layout_gravity="center"
		android:layout_below="@id/theme_option_icon"
		android:layout_marginTop="@dimen/option_bottom_margin"
		android:autoSizeMaxTextSize="@dimen/theme_option_font_text_size"
		android:autoSizeMinTextSize="@dimen/theme_option_font_min_text_size"
		android:autoSizeTextType="uniform"

res/values/dimens.xml

+11 −9

Original line number	Diff line number	Diff line
		@@ -30,20 +30,22 @@
		<dimen name="options_container_height">120dp</dimen>
		<dimen name="options_container_width">0dp</dimen>
		<dimen name="option_tile_width">88dp</dimen>
		<dimen name="theme_option_icon_sample_height">18dp</dimen>
		<dimen name="theme_option_icon_sample_width">18dp</dimen>
		<dimen name="theme_option_shape_sample_height">16dp</dimen>
		<dimen name="theme_option_shape_sample_width">16dp</dimen>
		<dimen name="theme_option_font_sample_height">16dp</dimen>
		<dimen name="option_icon_size">16dp</dimen>
		<dimen name="theme_option_icon_sample_height">22dp</dimen>
		<dimen name="theme_option_icon_sample_width">22dp</dimen>
		<dimen name="theme_option_shape_sample_height">20dp</dimen>
		<dimen name="theme_option_shape_sample_width">20dp</dimen>
		<dimen name="theme_option_font_sample_height">20dp</dimen>
		<dimen name="theme_option_font_sample_width">52dp</dimen>
		<dimen name="theme_option_sample_padding">5dp</dimen>
		<dimen name="theme_option_sample_margin">10dp</dimen>
		<!-- Note, using dp instead of sp as this is just the "+" symbol, not text -->
		<dimen name="option_tile_padding_vertical">16dp</dimen>
		<dimen name="option_tile_padding_horizontal">16dp</dimen>
		<dimen name="option_tile_padding_vertical">18dp</dimen>
		<dimen name="option_tile_padding_horizontal">18dp</dimen>

		<dimen name="option_bottom_margin">8dp</dimen>
		<dimen name="option_padding_horizontal">2dp</dimen>
		<!-- Note, using dp instead of sp as this text is more like a "snapshot" of the font -->
		<dimen name="theme_option_font_text_size">16dp</dimen>
		<dimen name="theme_option_font_text_size">20dp</dimen>
		<dimen name="theme_option_font_min_text_size">15dp</dimen>

		<dimen name="option_tile_margin_horizontal">6dp</dimen>

src/com/android/customization/picker/theme/ThemeFragment.java

+16 −3

Original line number	Diff line number	Diff line
		@@ -166,7 +166,10 @@ public class ThemeFragment extends AppbarFragment {
		protected void onBottomActionBarReady(BottomActionBar bottomActionBar) {
		mBottomActionBar = bottomActionBar;
		mBottomActionBar.showActionsOnly(APPLY);
		mBottomActionBar.setActionClickListener(APPLY, v -> applyTheme());
		mBottomActionBar.setActionClickListener(APPLY, v -> {
		mBottomActionBar.disableActions();
		applyTheme();
		});
		}

		@Override
		@@ -181,15 +184,19 @@ public class ThemeFragment extends AppbarFragment {
		mThemeManager.apply(mSelectedTheme, new Callback() {
		@Override
		public void onSuccess() {
		// Since we disabled it when clicked apply button.
		mBottomActionBar.enableActions();
		mBottomActionBar.hide();
		Toast.makeText(getContext(), R.string.applied_theme_msg,
		Toast.LENGTH_LONG).show();
		getActivity().finish();
		getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
		}

		@Override
		public void onError(@Nullable Throwable throwable) {
		Log.w(TAG, "Error applying theme", throwable);
		// Since we disabled it when clicked apply button.
		mBottomActionBar.enableActions();
		mBottomActionBar.hide();
		Toast.makeText(getContext(), R.string.apply_theme_error_msg,
		Toast.LENGTH_LONG).show();
		}
		@@ -237,6 +244,9 @@ public class ThemeFragment extends AppbarFragment {
		} else {
		if (mSelectedTheme != null) {
		mOptionsController.setSelectedOption(mSelectedTheme);
		// Set selected option above will show BottomActionBar,
		// hide BottomActionBar for the mis-trigger.
		mBottomActionBar.hide();
		} else {
		reloadOptions();
		}
		@@ -365,6 +375,9 @@ public class ThemeFragment extends AppbarFragment {
		mOptionsController.setAppliedOption(mSelectedTheme);
		}
		mOptionsController.setSelectedOption(mSelectedTheme);
		// Set selected option above will show BottomActionBar,
		// hide BottomActionBar for the mis-trigger.
		mBottomActionBar.hide();
		}, true);
		}