Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "split-shade-cherry-pick-v2" into sc-v2-dev

Browse Source 
* changes:
  Always have QS expanded on split shade
  Remove split shade drag handle
  Always show collapsed media on split shade
  Split shade should always have 6 tiles
This commit is contained in:
TreeHugger Robot
2021-12-06 22:28:19 +00:00
committed by Android (Google) Code Review
parent c4392736ae 294f8c51ea
commit 52bbb0feb1
12 changed files with 60 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/SystemUI/res/drawable/ic_qs_drag_handle.xml
View File

@@ -1,24 +0,0 @@
<!--
~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?android:attr/textColorPrimary"
android:pathData="M5.41,7.59L4,9l8,8 8,-8 -1.41,-1.41L12,14.17" />
</vector>

13
packages/SystemUI/res/layout/qs_panel.xml
View File

@@ -56,17 +56,4 @@
layout="@layout/qs_customize_panel"
android:visibility="gone" />
<ImageView
android:id="@+id/qs_drag_handle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
android:elevation="4dp"
android:importantForAccessibility="no"
android:scaleType="center"
android:src="@drawable/ic_qs_drag_handle"
android:tint="@color/qs_detail_button_white"
tools:ignore="UseAppTint" />
</com.android.systemui.qs.QSContainerImpl>

7
packages/SystemUI/res/values-sw600dp-land/config.xml
View File

@@ -18,11 +18,14 @@
<!-- Max number of columns for quick controls area -->
<integer name="controls_max_columns">2</integer>
<!-- The maximum number of rows in the QSPanel -->
<integer name="quick_settings_max_rows">3</integer>
<!-- The maximum number of rows in the QuickQSPanel -->
<integer name="quick_qs_panel_max_rows">4</integer>
<integer name="quick_qs_panel_max_rows">3</integer>
<!-- The maximum number of tiles in the QuickQSPanel -->
<integer name="quick_qs_panel_max_tiles">8</integer>
<integer name="quick_qs_panel_max_tiles">6</integer>
<!-- Whether to use the split 2-column notification shade -->
<bool name="config_use_split_notification_shade">true</bool>

7
packages/SystemUI/res/values-sw720dp-land/config.xml
View File

@@ -18,11 +18,14 @@
<!-- Max number of columns for quick controls area -->
<integer name="controls_max_columns">2</integer>
<!-- The maximum number of rows in the QSPanel -->
<integer name="quick_settings_max_rows">3</integer>
<!-- The maximum number of rows in the QuickQSPanel -->
<integer name="quick_qs_panel_max_rows">4</integer>
<integer name="quick_qs_panel_max_rows">3</integer>
<!-- The maximum number of tiles in the QuickQSPanel -->
<integer name="quick_qs_panel_max_tiles">8</integer>
<integer name="quick_qs_panel_max_tiles">6</integer>
<!-- Whether to use the split 2-column notification shade -->
<bool name="config_use_split_notification_shade">true</bool>

10
packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
View File

@@ -109,6 +109,16 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
mPageToRestore = savedInstanceState.getInt(CURRENT_PAGE, -1);
}
@Override
public int getTilesHeight() {
// Use the first page as that is the maximum height we need to show.
TileLayout tileLayout = mPages.get(0);
if (tileLayout == null) {
return 0;
}
return tileLayout.getTilesHeight();
}
@Override
protected void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);

16
packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
View File

@@ -27,7 +27,6 @@ import android.graphics.PointF;
import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import com.android.systemui.Dumpable;
import com.android.systemui.R;
@@ -53,7 +52,6 @@ public class QSContainerImpl extends FrameLayout implements Dumpable {
private float mQsExpansion;
private QSCustomizer mQSCustomizer;
private NonInterceptingScrollView mQSPanelContainer;
private ImageView mDragHandle;
private int mSideMargins;
private boolean mQsDisabled;
@@ -71,7 +69,6 @@ public class QSContainerImpl extends FrameLayout implements Dumpable {
mQSDetail = findViewById(R.id.qs_detail);
mHeader = findViewById(R.id.header);
mQSCustomizer = findViewById(R.id.qs_customize);
mDragHandle = findViewById(R.id.qs_drag_handle);
setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
}
@@ -190,23 +187,14 @@ public class QSContainerImpl extends FrameLayout implements Dumpable {
mQSDetail.setBottom(getTop() + scrollBottom);
int qsDetailBottomMargin = ((MarginLayoutParams) mQSDetail.getLayoutParams()).bottomMargin;
mQSDetail.setBottom(getTop() + scrollBottom - qsDetailBottomMargin);
// Pin the drag handle to the bottom of the panel.
mDragHandle.setTranslationY(scrollBottom - mDragHandle.getHeight());
}
protected int calculateContainerHeight() {
int heightOverride = mHeightOverride != -1 ? mHeightOverride : getMeasuredHeight();
// Need to add the dragHandle height so touches will be intercepted by it.
int dragHandleHeight;
if (mDragHandle.getVisibility() == VISIBLE) {
dragHandleHeight = Math.round((1 - mQsExpansion) * mDragHandle.getHeight());
} else {
dragHandleHeight = 0;
}
return mQSCustomizer.isCustomizing() ? mQSCustomizer.getHeight()
: Math.round(mQsExpansion * (heightOverride - mHeader.getHeight()))
+ mHeader.getHeight()
+ dragHandleHeight;
+ mHeader.getHeight();
}
int calculateContainerBottom() {
@@ -221,8 +209,6 @@ public class QSContainerImpl extends FrameLayout implements Dumpable {
public void setExpansion(float expansion) {
mQsExpansion = expansion;
mQSPanelContainer.setScrollingEnabled(expansion > 0f);
mDragHandle.setAlpha(1.0f - expansion);
mDragHandle.setClickable(expansion == 0f); // Only clickable when fully collapsed
updateExpansion();
}

36
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -33,7 +33,6 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.FrameLayout.LayoutParams;
import android.widget.ImageView;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
@@ -94,7 +93,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
private float mLastPanelFraction;
private float mSquishinessFraction = 1;
private boolean mQsDisabled;
private ImageView mQsDragHandler;
private final RemoteInputQuickSettingsDisabler mRemoteInputQuickSettingsDisabler;
private final CommandQueue mCommandQueue;
@@ -205,7 +203,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
mHeader = view.findViewById(R.id.header);
mQSPanelController.setHeaderContainer(view.findViewById(R.id.header_text_container));
mFooter = qsFragmentComponent.getQSFooter();
mQsDragHandler = view.findViewById(R.id.qs_drag_handle);
mQsDetailDisplayer.setQsPanelController(mQSPanelController);
@@ -249,11 +246,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
mQSPanelController.getMediaHost().getHostView().setAlpha(1.0f);
mQSAnimator.requestAnimatorUpdate();
});
mQsDragHandler.setOnClickListener(v -> {
Log.d(TAG, "drag handler clicked");
mCommandQueue.animateExpandSettingsPanel(null);
});
}
@Override
@@ -385,30 +377,26 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
}
private void updateQsState() {
final boolean expandVisually = mQsExpanded || mStackScrollerOverscrolling
final boolean expanded = mQsExpanded || mInSplitShade;
final boolean expandVisually = expanded || mStackScrollerOverscrolling
|| mHeaderAnimating;
mQSPanelController.setExpanded(mQsExpanded);
mQSDetail.setExpanded(mQsExpanded);
mQSPanelController.setExpanded(expanded);
mQSDetail.setExpanded(expanded);
boolean keyguardShowing = isKeyguardState();
mHeader.setVisibility((mQsExpanded || !keyguardShowing || mHeaderAnimating
mHeader.setVisibility((expanded || !keyguardShowing || mHeaderAnimating
|| mShowCollapsedOnKeyguard)
? View.VISIBLE
: View.INVISIBLE);
mHeader.setExpanded((keyguardShowing && !mHeaderAnimating && !mShowCollapsedOnKeyguard)
|| (mQsExpanded && !mStackScrollerOverscrolling), mQuickQSPanelController);
mFooter.setVisibility(!mQsDisabled && (mQsExpanded || !keyguardShowing || mHeaderAnimating
|| (expanded && !mStackScrollerOverscrolling), mQuickQSPanelController);
mFooter.setVisibility(!mQsDisabled && (expanded || !keyguardShowing || mHeaderAnimating
|| mShowCollapsedOnKeyguard)
? View.VISIBLE
: View.INVISIBLE);
mFooter.setExpanded((keyguardShowing && !mHeaderAnimating && !mShowCollapsedOnKeyguard)
|| (mQsExpanded && !mStackScrollerOverscrolling));
|| (expanded && !mStackScrollerOverscrolling));
mQSPanelController.setVisibility(
!mQsDisabled && expandVisually ? View.VISIBLE : View.INVISIBLE);
mQsDragHandler.setVisibility((mQsExpanded || !keyguardShowing || mHeaderAnimating
|| mShowCollapsedOnKeyguard)
&& Utils.shouldUseSplitNotificationShade(getResources())
? View.VISIBLE
: View.GONE);
}
private boolean isKeyguardState() {
@@ -418,7 +406,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
}
private void updateShowCollapsedOnKeyguard() {
boolean showCollapsed = mBypassController.getBypassEnabled() || mTransitioningToFullShade;
boolean showCollapsed = mBypassController.getBypassEnabled()
|| (mTransitioningToFullShade && !mInSplitShade);
if (showCollapsed != mShowCollapsedOnKeyguard) {
mShowCollapsedOnKeyguard = showCollapsed;
updateQsState();
@@ -498,6 +487,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
public void setInSplitShade(boolean inSplitShade) {
mInSplitShade = inSplitShade;
mQSAnimator.setTranslateWhileExpanding(inSplitShade);
updateShowCollapsedOnKeyguard();
updateQsState();
}
@Override
@@ -516,7 +507,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
public void setQsExpansion(float expansion, float panelExpansionFraction,
float proposedTranslation, float squishinessFraction) {
float headerTranslation = mTransitioningToFullShade ? 0 : proposedTranslation;
float progress = mTransitioningToFullShade ? mFullShadeProgress : panelExpansionFraction;
float progress = mTransitioningToFullShade || mState == StatusBarState.KEYGUARD
? mFullShadeProgress : panelExpansionFraction;
setAlphaAnimationProgress(mInSplitShade ? progress : 1);
mContainer.setExpansion(expansion);
final float translationScaleY = (mInSplitShade

13
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

@@ -258,13 +258,8 @@ public class QSPanel extends LinearLayout implements Tunable {
}
private void updateViewPositions() {
if (!(mTileLayout instanceof TileLayout)) {
return;
}
TileLayout layout = (TileLayout) mTileLayout;
// Adjust view positions based on tile squishing
int tileHeightOffset = layout.getTilesHeight() - layout.getHeight();
int tileHeightOffset = mTileLayout.getTilesHeight() - mTileLayout.getHeight();
boolean move = false;
for (int i = 0; i < getChildCount(); i++) {
@@ -787,6 +782,12 @@ public class QSPanel extends LinearLayout implements Tunable {
/** */
void setListening(boolean listening, UiEventLogger uiEventLogger);
/** */
int getHeight();
/** */
int getTilesHeight();
/**
* Sets a size modifier for the tile. Where 0 means collapsed, and 1 expanded.
*/

8
packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java
View File

@@ -45,6 +45,7 @@ import com.android.systemui.settings.brightness.BrightnessSliderController;
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.policy.BrightnessMirrorController;
import com.android.systemui.tuner.TunerService;
import com.android.systemui.util.Utils;
import javax.inject.Inject;
import javax.inject.Named;
@@ -72,6 +73,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> {
new QSPanel.OnConfigurationChangedListener() {
@Override
public void onConfigurationChange(Configuration newConfig) {
updateMediaExpansion();
mView.updateResources();
mQsSecurityFooter.onConfigurationChanged();
if (mView.isListening()) {
@@ -121,13 +123,17 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> {
@Override
public void onInit() {
super.onInit();
mMediaHost.setExpansion(1);
updateMediaExpansion();
mMediaHost.setShowsOnlyActiveMedia(false);
mMediaHost.init(MediaHierarchyManager.LOCATION_QS);
mQsCustomizerController.init();
mBrightnessSliderController.init();
}
private void updateMediaExpansion() {
mMediaHost.setExpansion(Utils.shouldUseSplitNotificationShade(getResources()) ? 0 : 1);
}
@Override
protected void onViewAttached() {
super.onViewAttached();

1
packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
View File

@@ -275,6 +275,7 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
return Math.max(mColumns * mRows, 1);
}
@Override
public int getTilesHeight() {
return mLastTileBottom + getPaddingBottom();
}

4
packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
View File

@@ -174,7 +174,7 @@ class LockscreenShadeTransitionController @Inject constructor(
internal fun canDragDown(): Boolean {
return (statusBarStateController.state == StatusBarState.KEYGUARD ||
nsslController.isInLockedDownShade()) &&
qS.isFullyCollapsed
(qS.isFullyCollapsed || useSplitShade)
}
/**
@@ -285,7 +285,7 @@ class LockscreenShadeTransitionController @Inject constructor(
internal val isDragDownAnywhereEnabled: Boolean
get() = (statusBarStateController.getState() == StatusBarState.KEYGUARD &&
!keyguardBypassController.bypassEnabled &&
qS.isFullyCollapsed)
(qS.isFullyCollapsed || useSplitShade))
/**
* The amount in pixels that the user has dragged down.

13
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -2246,11 +2246,14 @@ public class NotificationPanelViewController extends PanelViewController {
private void updateQsExpansion() {
if (mQs == null) return;
float qsExpansionFraction = computeQsExpansionFraction();
float squishiness = mNotificationStackScrollLayoutController
.getNotificationSquishinessFraction();
mQs.setQsExpansion(qsExpansionFraction, getExpandedFraction(), getHeaderTranslation(),
mQsExpandImmediate || mQsExpanded ? 1f : squishiness);
final float squishiness =
mQsExpandImmediate || mQsExpanded ? 1f : mNotificationStackScrollLayoutController
.getNotificationSquishinessFraction();
final float qsExpansionFraction = computeQsExpansionFraction();
final float adjustedExpansionFraction = mShouldUseSplitNotificationShade
? 1f : computeQsExpansionFraction();
mQs.setQsExpansion(adjustedExpansionFraction, getExpandedFraction(), getHeaderTranslation(),
squishiness);
mSplitShadeHeaderController.setQsExpandedFraction(qsExpansionFraction);
mMediaHierarchyManager.setQsExpansion(qsExpansionFraction);
int qsPanelBottomY = calculateQsBottomPosition(qsExpansionFraction);