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

Merge "Adjust task menu text size and colors" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-01 23:50:40 +00:00
committed by Android (Google) Code Review
parent f5af5ce11f 6ea5f721e5
commit 137323c299
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
quickstep/res/layout/task_menu.xml
View File

@@ -25,15 +25,15 @@
<TextView
android:id="@+id/task_name"
android:background="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorPrimaryInverse"
android:background="?android:attr/colorPrimary"
android:textColor="?android:attr/textColorPrimary"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:layout_marginBottom="2dp"
android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
android:textSize="24sp"/>
android:paddingTop="@dimen/task_menu_vertical_padding"
android:paddingBottom="@dimen/task_menu_vertical_padding"
android:textSize="16sp"/>
<LinearLayout
android:id="@+id/menu_option_layout"

6
quickstep/res/layout/task_view_menu_option.xml
View File

@@ -21,7 +21,7 @@
android:orientation="vertical"
android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
android:background="?android:attr/textColorPrimary"
android:background="?android:attr/colorPrimary"
android:theme="@style/PopupItem" >
<View
@@ -30,7 +30,7 @@
android:layout_height="@dimen/system_shortcut_icon_size"
android:layout_marginStart="@dimen/task_menu_option_start_margin"
android:layout_gravity="center_horizontal"
android:backgroundTint="?android:attr/textColorPrimaryInverse"/>
android:backgroundTint="?android:attr/textColorPrimary"/>
<TextView
style="@style/BaseIcon"
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/task_menu_option_start_margin"
android:textSize="14sp"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textColor="?android:attr/textColorPrimary"
android:focusable="false" />
</LinearLayout>

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

@@ -74,7 +74,8 @@
<!-- Total space (start + end) between the task card and the edge of the screen
in various configurations -->
<dimen name="task_card_menu_option_vertical_padding">8dp</dimen>
<dimen name="task_card_menu_option_vertical_padding">16dp</dimen>
<dimen name="task_menu_vertical_padding">8dp</dimen>
<dimen name="task_card_margin">8dp</dimen>
<dimen name="task_card_menu_shadow_height">3dp</dimen>
<dimen name="task_menu_option_start_margin">12dp</dimen>

2
quickstep/src/com/android/quickstep/views/TaskMenuView.java
View File

@@ -234,7 +234,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
Rect insets = mActivity.getDragLayer().getInsets();
BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();
int padding = getResources()
.getDimensionPixelSize(R.dimen.task_card_menu_option_vertical_padding);
.getDimensionPixelSize(R.dimen.task_menu_vertical_padding);
params.width = orientationHandler.getTaskMenuWidth(taskView.getThumbnail()) - (2 * padding);
// Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start
params.gravity = Gravity.LEFT;