aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove deprecated verticalBar layout in Overview" into tm-qpr-dev

Browse Source
This commit is contained in:
Jeremy Sim
2022-06-01 02:55:47 +00:00
committed by Android (Google) Code Review
parent 0ac64cba0f 3c2c3f1aea
commit 0183476559
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/res/values-land/dimens.xml
View File

@@ -15,7 +15,8 @@
limitations under the License.
-->
<resources>
<dimen name="overview_task_margin">8dp</dimen>
<!-- Overview actions -->
<dimen name="overview_actions_top_margin">12dp</dimen>
<!-- Tips Gesture Tutorial -->
<dimen name="gesture_tutorial_feedback_margin_start_end">126dp</dimen>

12
quickstep/src/com/android/quickstep/views/OverviewActionsView.java
View File

@@ -22,10 +22,8 @@ import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
@@ -233,10 +231,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
return 0;
}
if (mDp.isVerticalBarLayout()) {
return mDp.getInsets().bottom;
}
if (!mDp.isGestureMode && mDp.isTaskbarPresent) {
return mDp.getOverviewActionsClaimedSpaceBelow();
}
@@ -254,12 +248,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
mTaskSize.set(taskSize);
updateVerticalMargin(DisplayController.getNavigationMode(getContext()));
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
dp.isVerticalBarLayout() ? 0 : dp.overviewActionsButtonSpacing,
ViewGroup.LayoutParams.MATCH_PARENT);
params.weight = dp.isVerticalBarLayout() ? 1 : 0;
findViewById(R.id.action_split_space).setLayoutParams(params);
requestLayout();
mSplitButton.setCompoundDrawablesWithIntrinsicBounds(

5
src/com/android/launcher3/DeviceProfile.java
View File

@@ -414,10 +414,7 @@ public class DeviceProfile {
overviewTaskIconDrawableSizeGridPx =
res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_drawable_size_grid);
overviewTaskThumbnailTopMarginPx = overviewTaskIconSizePx + overviewTaskMarginPx * 2;
// In vertical bar, use the smaller task margin for the top regardless of mode.
overviewActionsTopMarginPx = isVerticalBarLayout()
? overviewTaskMarginPx
: res.getDimensionPixelSize(R.dimen.overview_actions_top_margin);
overviewActionsTopMarginPx = res.getDimensionPixelSize(R.dimen.overview_actions_top_margin);
overviewPageSpacing = res.getDimensionPixelSize(R.dimen.overview_page_spacing);
overviewActionsButtonSpacing = res.getDimensionPixelSize(
R.dimen.overview_actions_button_spacing);