Merge "Fix layout issues in suw all set page" into udc-dev (8ee4ad66) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/layout/allset_navigation_and_hint.xml→quickstep/res/layout-sw600dp/allset_navigation.xml

+3 −26

Original line number	Diff line number	Diff line
		@@ -16,41 +16,18 @@
		<merge xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto">

		<androidx.constraintlayout.widget.Guideline
		android:id="@+id/navigation_settings_guideline_bottom"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		app:layout_constraintGuide_percent="0.83" />

		<TextView
		android:id="@+id/navigation_settings"
		style="@style/TextAppearance.GestureTutorial.LinkText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="24dp"
		android:background="?android:attr/selectableItemBackground"
		android:minHeight="48dp"
		android:text="@string/allset_navigation_settings"
		app:layout_constraintBottom_toBottomOf="@id/navigation_settings_guideline_bottom"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent" />

		<androidx.constraintlayout.widget.Guideline
		android:id="@+id/hint_guideline_bottom"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		app:layout_constraintGuide_percent="0.94" />
		android:gravity="center_horizontal"

		<TextView
		android:id="@+id/hint"
		style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/allset_hint"
		android:textSize="@dimen/allset_page_swipe_up_text_size"
		app:layout_constraintBottom_toBottomOf="@id/hint_guideline_bottom"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toBottomOf="@id/subtitle"
		app:layout_constraintStart_toStartOf="parent" />

		</merge>
		No newline at end of file

quickstep/res/layout/activity_allset.xml

+41 −17

Original line number	Diff line number	Diff line
		@@ -14,20 +14,15 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<FrameLayout
		<androidx.constraintlayout.widget.ConstraintLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:id="@+id/root_view"
		android:fitsSystemWindows="false"
		android:background="@color/all_set_page_background">

		<androidx.constraintlayout.widget.ConstraintLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:id="@+id/content_view"
		android:fitsSystemWindows="false">

		<com.airbnb.lottie.LottieAnimationView
		android:id="@+id/animated_background"
		android:layout_width="match_parent"
		@@ -35,12 +30,27 @@
		android:gravity="center"
		android:scaleType="centerCrop"
		app:lottie_autoPlay="true"
		app:lottie_loop="true" />
		app:lottie_loop="true"

		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"/>

		<ScrollView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fillViewport="true"

		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent">

		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/text_content_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="@dimen/allset_page_margin_horizontal"
		android:layout_marginEnd="@dimen/allset_page_margin_horizontal"
		android:layoutDirection="locale"
		@@ -78,10 +88,24 @@
		app:layout_constraintStart_toStartOf="parent"
		android:gravity="start"/>

		<include layout="@layout/allset_navigation_and_hint"/>
		<include layout="@layout/allset_navigation"/>

		</androidx.constraintlayout.widget.ConstraintLayout>
		<TextView
		android:id="@+id/hint"
		style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginBottom="24dp"
		android:text="@string/allset_hint"
		android:textSize="@dimen/allset_page_swipe_up_text_size"
		android:gravity="center_horizontal"

		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent" />

		</androidx.constraintlayout.widget.ConstraintLayout>

		</FrameLayout>
		No newline at end of file
		</ScrollView>

		</androidx.constraintlayout.widget.ConstraintLayout>
		No newline at end of file

quickstep/res/layout-sw600dp/allset_navigation_and_hint.xml→quickstep/res/layout/allset_navigation.xml

+5 −11

Original line number	Diff line number	Diff line
		@@ -22,21 +22,15 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="24dp"
		android:layout_marginBottom="24dp"
		android:background="?android:attr/selectableItemBackground"
		android:minHeight="48dp"
		android:text="@string/allset_navigation_settings"
		app:layout_constraintTop_toBottomOf="@id/subtitle"
		app:layout_constraintStart_toStartOf="parent" />
		android:gravity="center_horizontal"

		<TextView
		android:id="@+id/hint"
		style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginBottom="24dp"
		android:text="@string/allset_hint"
		android:textSize="@dimen/allset_page_swipe_up_text_size"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintVertical_bias="1.0"
		app:layout_constraintTop_toBottomOf="@id/subtitle"
		app:layout_constraintBottom_toTopOf="@id/hint"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent" />

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

+6 −38

Original line number	Diff line number	Diff line
		@@ -95,17 +95,13 @@ public class AllSetActivity extends Activity {

		private static final float ANIMATION_PAUSE_ALPHA_THRESHOLD = 0.1f;

		private final Rect mTempSettingsBounds = new Rect();
		private final Rect mTempInclusionBounds = new Rect();
		private final Rect mTempExclusionBounds = new Rect();

		private TISBindHelper mTISBindHelper;
		private TISBinder mBinder;
		@Nullable private TaskbarManager mTaskbarManager = null;

		private final AnimatedFloat mSwipeProgress = new AnimatedFloat(this::onSwipeProgressUpdate);
		private BgDrawable mBackground;
		private View mContentView;
		private View mRootView;
		private float mSwipeUpShift;

		@Nullable private Vibrator mVibrator;
		@@ -118,7 +114,8 @@ public class AllSetActivity extends Activity {
		protected void onCreate(@Nullable Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.activity_allset);
		findViewById(R.id.root_view).setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
		mRootView = findViewById(R.id.root_view);
		mRootView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
		\| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
		\| View.SYSTEM_UI_FLAG_LAYOUT_STABLE);

		@@ -133,8 +130,7 @@ public class AllSetActivity extends Activity {
		((ImageView) findViewById(R.id.icon)).getDrawable().mutate().setTint(accentColor);

		mBackground = new BgDrawable(this);
		findViewById(R.id.root_view).setBackground(mBackground);
		mContentView = findViewById(R.id.content_view);
		mRootView.setBackground(mBackground);
		mSwipeUpShift = resources.getDimension(R.dimen.allset_swipe_up_shift);

		TextView subtitle = findViewById(R.id.subtitle);
		@@ -162,34 +158,6 @@ public class AllSetActivity extends Activity {
		}
		hint.setAccessibilityDelegate(new SkipButtonAccessibilityDelegate());

		View textContent = findViewById(R.id.text_content_view);
		textContent.addOnLayoutChangeListener(
		(v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
		mTempSettingsBounds.set(
		settings.getLeft(),
		settings.getTop(),
		settings.getRight(),
		settings.getBottom());
		mTempInclusionBounds.set(
		0,
		// Do not allow overlapping with the subtitle text
		subtitle.getBottom(),
		textContent.getWidth(),
		textContent.getHeight());
		mTempExclusionBounds.set(
		hint.getLeft(),
		hint.getTop(),
		hint.getRight(),
		hint.getBottom());

		Utilities.translateOverlappingView(
		settings,
		mTempSettingsBounds,
		mTempInclusionBounds,
		mTempExclusionBounds,
		Utilities.TRANSLATE_UP);
		});

		mTISBindHelper = new TISBindHelper(this, this::onTISConnected);

		mVibrator = getSystemService(Vibrator.class);
		@@ -357,8 +325,8 @@ public class AllSetActivity extends Activity {
		private void onSwipeProgressUpdate() {
		mBackground.setProgress(mSwipeProgress.value);
		float alpha = getContentViewAlphaForSwipeProgress();
		mContentView.setAlpha(alpha);
		mContentView.setTranslationY((alpha - 1) * mSwipeUpShift);
		mRootView.setAlpha(alpha);
		mRootView.setTranslationY((alpha - 1) * mSwipeUpShift);

		if (mLauncherStartAnim == null && mTaskbarManager != null) {
		mLauncherStartAnim = mTaskbarManager.createLauncherStartFromSuwAnim(MAX_SWIPE_DURATION);