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

Merge "Update qs footer to 56dp."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-14 20:29:57 +00:00
committed by Android (Google) Code Review
parent 07b2dbc2c5 4f3f55238b
commit 7f101bdf80
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/res/layout/qs_footer_impl.xml
View File

@@ -71,23 +71,19 @@
android:singleLine="true" />
</LinearLayout>
<FrameLayout
<View
android:id="@+id/qs_drag_handle_view"
android:layout_width="24dp"
android:layout_height="match_parent" >
<View
android:id="@+id/qs_drag_handle_view"
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_marginTop="28dp"
android:background="@drawable/qs_footer_drag_handle" />
</FrameLayout>
android:layout_height="4dp"
android:layout_gravity="center"
android:background="@drawable/qs_footer_drag_handle" />
<LinearLayout
<com.android.keyguard.AlphaOptimizedLinearLayout
android:id="@+id/qs_footer_actions_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="end" >
android:gravity="center_vertical|end" >
<com.android.systemui.statusbar.phone.MultiUserSwitch
android:id="@+id/multi_user_switch"
android:layout_width="48dp"
@@ -113,7 +109,7 @@
android:clipToPadding="false"
android:contentDescription="@string/accessibility_quick_settings_edit"
android:focusable="true"
android:padding="16dp"
android:padding="15dp"
android:src="@drawable/ic_mode_edit"
android:tint="?android:attr/colorForeground"/>
@@ -131,6 +127,7 @@
android:layout_height="match_parent"
android:background="@drawable/ripple_drawable"
android:contentDescription="@string/accessibility_quick_settings_settings"
android:padding="15dp"
android:src="@drawable/ic_settings_16dp"
android:tint="?android:attr/colorForeground"/>
@@ -145,7 +142,7 @@
android:visibility="invisible"/>
</com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
</LinearLayout>
</com.android.keyguard.AlphaOptimizedLinearLayout>
</LinearLayout>
</com.android.systemui.qs.QSFooterImpl>

6
packages/SystemUI/res/values/dimens.xml
View File

@@ -230,7 +230,7 @@
<!-- The height of the quick settings footer that holds the user switcher, settings icon,
etc. -->
<dimen name="qs_footer_height">48dp</dimen>
<dimen name="qs_footer_height">56dp</dimen>
<!-- The padding between the notifications and the quick settings container -->
<dimen name="qs_notification_padding">@dimen/notification_side_paddings</dimen>
@@ -337,7 +337,7 @@
<dimen name="qs_footer_padding_end">24dp</dimen>
<dimen name="qs_footer_icon_size">16dp</dimen>
<!-- Difference between drag handle margin in QQS and expanded QS -->
<dimen name="qs_footer_drag_handle_offset">6dp</dimen>
<dimen name="qs_footer_drag_handle_offset">10dp</dimen>
<dimen name="qs_notif_collapsed_space">64dp</dimen>
@@ -513,7 +513,7 @@
<dimen name="multi_user_avatar_keyguard_size">22dp</dimen>
<!-- The width of user avatar when expanded -->
<dimen name="multi_user_avatar_expanded_size">16dp</dimen>
<dimen name="multi_user_avatar_expanded_size">18dp</dimen>
<!-- The font size of the time when collapsed in QS -->
<dimen name="qs_time_collapsed_size">14sp</dimen>

3
packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java
View File

@@ -174,7 +174,8 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
.addFloat(mDivider, "alpha", 0, 1)
.addFloat(mCarrierText, "alpha", 0, 1)
.addFloat(mActionsContainer, "alpha", 0, 1)
.addFloat(mDragHandle, "translationY", 0, -mDragHandleExpandOffset)
.addFloat(mDragHandle, "translationY", mDragHandleExpandOffset, 0)
.addFloat(mDragHandle, "alpha", 1, 0)
.build();
}