Merge "Removes more Back references for generic tutorial styles." into ub-launcher3-rvc-dev (08c6c943) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/layout/gesture_tutorial_fragment.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@
		android:layout_gravity="center_horizontal"
		android:layout_marginStart="@dimen/gesture_tutorial_title_margin_start_end"
		android:layout_marginEnd="@dimen/gesture_tutorial_title_margin_start_end"
		style="@style/TextAppearance.BackGestureTutorial.Title"/>
		style="@style/TextAppearance.GestureTutorial.Title"/>

		<TextView
		android:id="@+id/gesture_tutorial_fragment_subtitle_view"
		@@ -68,7 +68,7 @@
		android:layout_marginTop="10dp"
		android:layout_marginStart="@dimen/gesture_tutorial_subtitle_margin_start_end"
		android:layout_marginEnd="@dimen/gesture_tutorial_subtitle_margin_start_end"
		style="@style/TextAppearance.BackGestureTutorial.Subtitle"/>
		style="@style/TextAppearance.GestureTutorial.Subtitle"/>

		</LinearLayout>

		@@ -99,7 +99,7 @@
		android:stateListAnimator="@null"
		android:background="@drawable/gesture_tutorial_action_button_background"
		android:foreground="?android:attr/selectableItemBackgroundBorderless"
		style="@style/TextAppearance.BackGestureTutorial.ButtonLabel"/>
		style="@style/TextAppearance.GestureTutorial.ButtonLabel"/>

		<Button
		android:id="@+id/gesture_tutorial_fragment_action_text_button"
		@@ -110,7 +110,7 @@
		android:stateListAnimator="@null"
		android:background="@null"
		android:foreground="?android:attr/selectableItemBackgroundBorderless"
		style="@style/TextAppearance.BackGestureTutorial.TextButtonLabel"/>
		style="@style/TextAppearance.GestureTutorial.TextButtonLabel"/>

		</RelativeLayout>
		</LinearLayout>

quickstep/res/values/styles.xml

+10 −10

Original line number	Diff line number	Diff line
		@@ -26,29 +26,29 @@
		<item name="android:layout_height">wrap_content</item>
		</style>

		<style name="TextAppearance.BackGestureTutorial"
		<style name="TextAppearance.GestureTutorial"
		parent="android:TextAppearance.Material.Body1" />

		<style name="TextAppearance.BackGestureTutorial.CallToAction"
		<style name="TextAppearance.GestureTutorial.CallToAction"
		parent="android:TextAppearance.Material.Body2" />

		<style name="TextAppearance.BackGestureTutorial.Title"
		parent="TextAppearance.BackGestureTutorial">
		<style name="TextAppearance.GestureTutorial.Title"
		parent="TextAppearance.GestureTutorial">
		<item name="android:gravity">center</item>
		<item name="android:textColor">@color/gesture_tutorial_title_color</item>
		<item name="android:textSize">28sp</item>
		</style>

		<style name="TextAppearance.BackGestureTutorial.Subtitle"
		parent="TextAppearance.BackGestureTutorial">
		<style name="TextAppearance.GestureTutorial.Subtitle"
		parent="TextAppearance.GestureTutorial">
		<item name="android:gravity">center</item>
		<item name="android:textColor">@color/gesture_tutorial_subtitle_color</item>
		<item name="android:letterSpacing">0.03</item>
		<item name="android:textSize">21sp</item>
		</style>

		<style name="TextAppearance.BackGestureTutorial.ButtonLabel"
		parent="TextAppearance.BackGestureTutorial.CallToAction">
		<style name="TextAppearance.GestureTutorial.ButtonLabel"
		parent="TextAppearance.GestureTutorial.CallToAction">
		<item name="android:gravity">center</item>
		<item name="android:textColor">@color/gesture_tutorial_action_button_label_color</item>
		<item name="android:letterSpacing">0.02</item>
		@@ -56,8 +56,8 @@
		<item name="android:textAllCaps">false</item>
		</style>

		<style name="TextAppearance.BackGestureTutorial.TextButtonLabel"
		parent="TextAppearance.BackGestureTutorial.ButtonLabel">
		<style name="TextAppearance.GestureTutorial.TextButtonLabel"
		parent="TextAppearance.GestureTutorial.ButtonLabel">
		<item name="android:textColor">@color/gesture_tutorial_primary_color</item>
		</style>

quickstep/src/com/android/quickstep/interaction/TutorialController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -96,9 +96,9 @@ abstract class TutorialController {

		private void updateTitles() {
		updateTitleView(mTitleTextView, getTitleStringId(),
		R.style.TextAppearance_BackGestureTutorial_Title);
		R.style.TextAppearance_GestureTutorial_Title);
		updateTitleView(mSubtitleTextView, getSubtitleStringId(),
		R.style.TextAppearance_BackGestureTutorial_Subtitle);
		R.style.TextAppearance_GestureTutorial_Subtitle);
		}

		private void updateTitleView(TextView textView, @Nullable Integer stringId, int styleId) {

quickstep/src/com/android/quickstep/interaction/TutorialFragment.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -105,8 +105,7 @@ abstract class TutorialFragment extends Fragment implements BackGestureAttemptCa
		@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
		super.onCreateView(inflater, container, savedInstanceState);

		mRootView = inflater.inflate(R.layout.gesture_tutorial_fragment,
		container, /* attachToRoot= */ false);
		mRootView = inflater.inflate(R.layout.gesture_tutorial_fragment, container, false);
		mRootView.setOnApplyWindowInsetsListener((view, insets) -> {
		Insets systemInsets = insets.getInsets(WindowInsets.Type.systemBars());
		mEdgeBackGestureHandler.setInsets(systemInsets.left, systemInsets.right);