mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-27 15:26:58 +00:00
Merge "Fix tutorial menu layout issues" into udc-dev
This commit is contained in:
Schneider Victor-tulias
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
458971616d
@@ -17,11 +17,7 @@
|
||||
android:height="67dp"
|
||||
android:viewportWidth="232"
|
||||
android:viewportHeight="67">
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0h232v67h-232z"/>
|
||||
<path
|
||||
android:pathData="M180.9,0.6H51.1C22.9,0.6 0,23.4 0,51.7V67.6H232V51.7C232,23.4 209.1,0.6 180.9,0.6Z"
|
||||
android:fillColor="#4B67AE"/>
|
||||
</group>
|
||||
<path
|
||||
android:pathData="M180.9,0.6H51.1C22.9,0.6 0,23.4 0,51.7V67.6H232V51.7C232,23.4 209.1,0.6 180.9,0.6Z"
|
||||
android:fillColor="#4B67AE"/>
|
||||
</vector>
|
||||
|
||||
@@ -17,11 +17,7 @@
|
||||
android:height="94dp"
|
||||
android:viewportWidth="194"
|
||||
android:viewportHeight="94">
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0h194v94.09h-194z"/>
|
||||
<path
|
||||
android:pathData="M185.56,76.95C184.79,75.3 184.3,73.56 184.21,71.81L182.85,55.81C182.46,51.34 180.13,47.27 176.45,44.65L163.25,35.44C161.8,34.37 160.54,33.11 159.47,31.65L150.16,18.46C147.54,14.77 143.47,12.45 139,12.06L123,10.6C121.25,10.41 119.51,10.02 117.86,9.24L103.31,2.45C101.27,1.49 99.04,1 96.91,1C94.77,1 92.54,1.49 90.5,2.45L75.95,9.24C74.31,10.02 72.56,10.51 70.81,10.6L54.81,11.96C50.35,12.35 46.27,14.68 43.65,18.36L34.44,31.56C33.37,33.01 32.11,34.27 30.66,35.34L17.27,44.65C13.58,47.27 11.26,51.34 10.87,55.81L9.41,71.81C9.22,73.56 8.83,75.3 8.05,76.95L1.26,91.5C0.78,92.67 0.39,93.83 0.1,94.99H193.52C193.32,93.83 192.94,92.57 192.35,91.5L185.56,76.95Z"
|
||||
android:fillColor="#7E44AD"/>
|
||||
</group>
|
||||
<path
|
||||
android:pathData="M185.56,76.95C184.79,75.3 184.3,73.56 184.21,71.81L182.85,55.81C182.46,51.34 180.13,47.27 176.45,44.65L163.25,35.44C161.8,34.37 160.54,33.11 159.47,31.65L150.16,18.46C147.54,14.77 143.47,12.45 139,12.06L123,10.6C121.25,10.41 119.51,10.02 117.86,9.24L103.31,2.45C101.27,1.49 99.04,1 96.91,1C94.77,1 92.54,1.49 90.5,2.45L75.95,9.24C74.31,10.02 72.56,10.51 70.81,10.6L54.81,11.96C50.35,12.35 46.27,14.68 43.65,18.36L34.44,31.56C33.37,33.01 32.11,34.27 30.66,35.34L17.27,44.65C13.58,47.27 11.26,51.34 10.87,55.81L9.41,71.81C9.22,73.56 8.83,75.3 8.05,76.95L1.26,91.5C0.78,92.67 0.39,93.83 0.1,94.99H193.52C193.32,93.83 192.94,92.57 192.35,91.5L185.56,76.95Z"
|
||||
android:fillColor="#7E44AD"/>
|
||||
</vector>
|
||||
|
||||
@@ -17,11 +17,7 @@
|
||||
android:height="73dp"
|
||||
android:viewportWidth="362"
|
||||
android:viewportHeight="73">
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0h362v73h-362z"/>
|
||||
<path
|
||||
android:pathData="M282.3,0H79.7C38,0 3.7,32.1 0.3,73H361.7C358.3,32.1 324,0 282.3,0Z"
|
||||
android:fillColor="#4B67AE"/>
|
||||
</group>
|
||||
<path
|
||||
android:pathData="M282.3,0H79.7C38,0 3.7,32.1 0.3,73H361.7C358.3,32.1 324,0 282.3,0Z"
|
||||
android:fillColor="#4B67AE"/>
|
||||
</vector>
|
||||
|
||||
@@ -17,11 +17,7 @@
|
||||
android:height="144dp"
|
||||
android:viewportWidth="297"
|
||||
android:viewportHeight="144">
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0h297v144.04h-297z"/>
|
||||
<path
|
||||
android:pathData="M284.38,116.48C283.19,113.95 282.45,111.28 282.3,108.61L280.22,84.1C279.63,77.27 276.06,71.03 270.42,67.03L250.22,52.92C247.99,51.28 246.06,49.35 244.43,47.13L230.18,26.93C226.16,21.29 219.93,17.72 213.1,17.13L188.6,14.9C185.92,14.6 183.25,14.01 180.72,12.82L158.45,2.43C155.33,0.94 151.91,0.2 148.65,0.2C145.38,0.2 141.97,0.94 138.85,2.43L116.57,12.82C114.05,14.01 111.38,14.75 108.7,14.9L84.2,16.98C77.37,17.57 71.13,21.14 67.12,26.78L53.01,46.98C51.38,49.21 49.45,51.14 47.22,52.77L26.73,67.03C21.09,71.03 17.52,77.27 16.93,84.1L14.7,108.61C14.4,111.28 13.81,113.95 12.62,116.48L2.23,138.75C1.48,140.53 0.89,142.32 0.45,144.1H296.55C296.26,142.32 295.66,140.38 294.77,138.75L284.38,116.48Z"
|
||||
android:fillColor="#7E44AD"/>
|
||||
</group>
|
||||
<path
|
||||
android:pathData="M284.38,116.48C283.19,113.95 282.45,111.28 282.3,108.61L280.22,84.1C279.63,77.27 276.06,71.03 270.42,67.03L250.22,52.92C247.99,51.28 246.06,49.35 244.43,47.13L230.18,26.93C226.16,21.29 219.93,17.72 213.1,17.13L188.6,14.9C185.92,14.6 183.25,14.01 180.72,12.82L158.45,2.43C155.33,0.94 151.91,0.2 148.65,0.2C145.38,0.2 141.97,0.94 138.85,2.43L116.57,12.82C114.05,14.01 111.38,14.75 108.7,14.9L84.2,16.98C77.37,17.57 71.13,21.14 67.12,26.78L53.01,46.98C51.38,49.21 49.45,51.14 47.22,52.77L26.73,67.03C21.09,71.03 17.52,77.27 16.93,84.1L14.7,108.61C14.4,111.28 13.81,113.95 12.62,116.48L2.23,138.75C1.48,140.53 0.89,142.32 0.45,144.1H296.55C296.26,142.32 295.66,140.38 294.77,138.75L284.38,116.48Z"
|
||||
android:fillColor="#7E44AD"/>
|
||||
</vector>
|
||||
|
||||
@@ -17,11 +17,7 @@
|
||||
android:height="208dp"
|
||||
android:viewportWidth="83"
|
||||
android:viewportHeight="208">
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0h83.95v208h-83.95z"/>
|
||||
<path
|
||||
android:pathData="M23.53,169.2L31.09,165.56C76.7,143.55 76.7,64.45 31.09,42.35L23.53,38.71C13.55,33.95 5.06,25.56 -1,14.92V193.08C5.06,182.44 13.55,174.05 23.53,169.2Z"
|
||||
android:fillColor="#217500"/>
|
||||
</group>
|
||||
<path
|
||||
android:pathData="M23.53,169.2L31.09,165.56C76.7,143.55 76.7,64.45 31.09,42.35L23.53,38.71C13.55,33.95 5.06,25.56 -1,14.92V193.08C5.06,182.44 13.55,174.05 23.53,169.2Z"
|
||||
android:fillColor="#217500"/>
|
||||
</vector>
|
||||
|
||||
@@ -28,11 +28,13 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/gesture_tutorial_menu_button_height"
|
||||
android:layout_marginEnd="@dimen/gesture_tutorial_menu_button_spacing"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:background="@drawable/gesture_tutorial_menu_button_background"
|
||||
android:clipToOutline="true"
|
||||
android:backgroundTint="@color/gesture_home_tutorial_background"
|
||||
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/guideline"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/gesture_tutorial_menu_back_button">
|
||||
|
||||
@@ -40,6 +42,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/gesture_tutorial_home_step_shape"
|
||||
android:scaleType="fitXY"
|
||||
android:adjustViewBounds="true"
|
||||
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -64,11 +68,13 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/gesture_tutorial_menu_button_height"
|
||||
android:layout_marginEnd="@dimen/gesture_tutorial_menu_button_spacing"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:background="@drawable/gesture_tutorial_menu_button_background"
|
||||
android:clipToOutline="true"
|
||||
android:backgroundTint="@color/gesture_back_tutorial_exiting_app"
|
||||
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/guideline"
|
||||
app:layout_constraintStart_toEndOf="@id/gesture_tutorial_menu_home_button"
|
||||
app:layout_constraintEnd_toStartOf="@id/gesture_tutorial_menu_overview_button">
|
||||
|
||||
@@ -77,6 +83,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/gesture_tutorial_back_step_shape"
|
||||
android:layout_marginBottom="@dimen/gesture_tutorial_menu_back_shape_bottom_margin"
|
||||
android:scaleType="fitXY"
|
||||
android:adjustViewBounds="true"
|
||||
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"/>
|
||||
@@ -99,11 +107,13 @@
|
||||
android:id="@+id/gesture_tutorial_menu_overview_button"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/gesture_tutorial_menu_button_height"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:background="@drawable/gesture_tutorial_menu_button_background"
|
||||
android:clipToOutline="true"
|
||||
android:backgroundTint="@color/gesture_overview_tutorial_background"
|
||||
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/guideline"
|
||||
app:layout_constraintStart_toEndOf="@id/gesture_tutorial_menu_back_button"
|
||||
app:layout_constraintEnd_toEndOf="parent">
|
||||
|
||||
@@ -111,6 +121,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/gesture_tutorial_overview_step_shape"
|
||||
android:scaleType="fitXY"
|
||||
android:adjustViewBounds="true"
|
||||
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -142,10 +154,8 @@
|
||||
style="@style/TextAppearance.GestureTutorial.ButtonLabel"
|
||||
android:id="@+id/gesture_tutorial_menu_done_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingVertical="16dp"
|
||||
android:paddingHorizontal="26dp"
|
||||
android:layout_marginVertical="@dimen/gesture_tutorial_menu_done_button_margin"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginVertical="16dp"
|
||||
android:text="@string/gesture_tutorial_action_button_label"
|
||||
android:background="@drawable/gesture_tutorial_action_button_background"
|
||||
android:stateListAnimator="@null"
|
||||
|
||||
@@ -42,6 +42,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/gesture_tutorial_home_step_shape"
|
||||
android:scaleType="fitXY"
|
||||
android:adjustViewBounds="true"
|
||||
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -79,6 +81,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/gesture_tutorial_back_step_shape"
|
||||
android:scaleType="fitXY"
|
||||
android:adjustViewBounds="true"
|
||||
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
@@ -116,6 +120,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/gesture_tutorial_overview_step_shape"
|
||||
android:scaleType="fitXY"
|
||||
android:adjustViewBounds="true"
|
||||
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -147,9 +153,8 @@
|
||||
style="@style/TextAppearance.GestureTutorial.ButtonLabel"
|
||||
android:id="@+id/gesture_tutorial_menu_done_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingVertical="16dp"
|
||||
android:paddingHorizontal="26dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginVertical="16dp"
|
||||
android:text="@string/gesture_tutorial_action_button_label"
|
||||
android:background="@drawable/gesture_tutorial_action_button_background"
|
||||
android:stateListAnimator="@null"
|
||||
|
||||
@@ -26,6 +26,5 @@
|
||||
<dimen name="gesture_tutorial_menu_button_spacing">24dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_done_button_top_spacing">40dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_back_shape_bottom_margin">49dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_done_button_margin">16dp</dimen>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -21,7 +21,5 @@
|
||||
<dimen name="gesture_tutorial_menu_button_spacing">49dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_done_button_top_spacing">24dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_back_shape_bottom_margin">21dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_done_button_spacing">80dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_done_button_margin">0dp</dimen>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -134,7 +134,6 @@
|
||||
<dimen name="gesture_tutorial_menu_done_button_top_spacing">0dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_back_shape_bottom_margin">0dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_done_button_spacing">72dp</dimen>
|
||||
<dimen name="gesture_tutorial_menu_done_button_margin">0dp</dimen>
|
||||
|
||||
<!-- Gesture Tutorial mock conversations -->
|
||||
<dimen name="gesture_tutorial_message_icon_size">44dp</dimen>
|
||||
|
||||
@@ -186,7 +186,8 @@ public class GestureSandboxActivity extends FragmentActivity {
|
||||
public void launchTutorialMenu() {
|
||||
mFragment = new MenuFragment();
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.add(R.id.gesture_tutorial_fragment_container, mFragment)
|
||||
.replace(R.id.gesture_tutorial_fragment_container, mFragment)
|
||||
.runOnCommit(() -> mFragment.onAttachedToWindow())
|
||||
.commit();
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_GESTU
|
||||
import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_TUTORIAL_TYPE;
|
||||
import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_USE_TUTORIAL_MENU;
|
||||
|
||||
import android.graphics.Rect;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
@@ -27,17 +28,33 @@ import android.view.ViewGroup;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.launcher3.InvariantDeviceProfile;
|
||||
import com.android.launcher3.R;
|
||||
|
||||
/** Displays the gesture nav tutorial menu. */
|
||||
public final class MenuFragment extends GestureSandboxFragment {
|
||||
|
||||
@NonNull private Rect mInsets = new Rect();
|
||||
|
||||
@Override
|
||||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
mInsets = InvariantDeviceProfile.INSTANCE.get(getContext())
|
||||
.getDeviceProfile(getContext()).getInsets();
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
|
||||
@Nullable Bundle savedInstanceState) {
|
||||
View root = inflater.inflate(
|
||||
R.layout.gesture_tutorial_step_menu, container, false);
|
||||
|
||||
root.setPadding(
|
||||
root.getPaddingLeft() + mInsets.left,
|
||||
root.getPaddingTop() + mInsets.top,
|
||||
root.getPaddingRight() + mInsets.right,
|
||||
root.getPaddingBottom() + mInsets.bottom);
|
||||
|
||||
root.findViewById(R.id.gesture_tutorial_menu_home_button).setOnClickListener(
|
||||
v -> launchTutorialStep(TutorialController.TutorialType.HOME_NAVIGATION));
|
||||
root.findViewById(R.id.gesture_tutorial_menu_back_button).setOnClickListener(
|
||||
|
||||
Reference in New Issue
Block a user