From b5c70863230dcccec8fb74f4ffc70399ac079a85 Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Wed, 31 May 2023 14:57:23 -0700 Subject: [PATCH] Fix layout issues in suw all set page putting contents of the suw all set page in a scroll view to fix layout issues in large display/font sizes Flag: not needed Fixes: 275018092 Test: launched all set page on smallest and largest display/font sizes on handheld, tablet and foldable Change-Id: I921b1becfc0627e9b77e467efe309613aa3ca9d0 --- .../allset_navigation.xml} | 29 +--------- quickstep/res/layout/activity_allset.xml | 58 +++++++++++++------ .../allset_navigation.xml} | 16 ++--- .../quickstep/interaction/AllSetActivity.java | 44 ++------------ 4 files changed, 55 insertions(+), 92 deletions(-) rename quickstep/res/{layout/allset_navigation_and_hint.xml => layout-sw600dp/allset_navigation.xml} (50%) rename quickstep/res/{layout-sw600dp/allset_navigation_and_hint.xml => layout/allset_navigation.xml} (76%) diff --git a/quickstep/res/layout/allset_navigation_and_hint.xml b/quickstep/res/layout-sw600dp/allset_navigation.xml similarity index 50% rename from quickstep/res/layout/allset_navigation_and_hint.xml rename to quickstep/res/layout-sw600dp/allset_navigation.xml index 4d5cf01eaa..a47eef4c00 100644 --- a/quickstep/res/layout/allset_navigation_and_hint.xml +++ b/quickstep/res/layout-sw600dp/allset_navigation.xml @@ -16,41 +16,18 @@ - - + android:gravity="center_horizontal" - - - \ No newline at end of file diff --git a/quickstep/res/layout/activity_allset.xml b/quickstep/res/layout/activity_allset.xml index 7ea92b59d1..2c312a7e33 100644 --- a/quickstep/res/layout/activity_allset.xml +++ b/quickstep/res/layout/activity_allset.xml @@ -14,33 +14,43 @@ See the License for the specific language governing permissions and limitations under the License. --> - + android:fitsSystemWindows="false" + android:background="@color/all_set_page_background"> - + android:gravity="center" + android:scaleType="centerCrop" + app:lottie_autoPlay="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"/> + + - + + + - + - \ No newline at end of file + \ No newline at end of file diff --git a/quickstep/res/layout-sw600dp/allset_navigation_and_hint.xml b/quickstep/res/layout/allset_navigation.xml similarity index 76% rename from quickstep/res/layout-sw600dp/allset_navigation_and_hint.xml rename to quickstep/res/layout/allset_navigation.xml index 44b3ecbd97..76b24af488 100644 --- a/quickstep/res/layout-sw600dp/allset_navigation_and_hint.xml +++ b/quickstep/res/layout/allset_navigation.xml @@ -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" - diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java index 1868463057..2eaff46715 100644 --- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java +++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java @@ -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);