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

Fix

Browse Source
This commit is contained in:
MrSluffy
2024-09-15 08:50:28 +08:00
parent eeb7416bfe
commit 77e0a795b5
15 changed files with 1072 additions and 1806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest-common.xml
View File

@@ -71,7 +71,7 @@
<application
android:backupAgent="com.android.launcher3.LauncherBackupAgent"
android:name="com.android.launcher3.LauncherApplication"
android:name="app.lawnchair.LawnchairApp"
android:fullBackupOnly="true"
android:backupInForeground="true"
android:fullBackupContent="@xml/backupscheme"

2
AndroidManifest.xml
View File

@@ -47,7 +47,7 @@
attributes and intent filters the same
-->
<activity
android:name="com.android.launcher3.Launcher"
android:name="app.lawnchair.LawnchairLauncher"
android:launchMode="singleTask"
android:clearTaskOnLaunch="true"
android:stateNotNeeded="true"

2
quickstep/AndroidManifest-launcher.xml
View File

@@ -72,7 +72,7 @@
</intent-filter>
<meta-data
android:name="com.android.launcher3.grid.control"
android:value="${packageName}.grid_control" />
android:value="${applicationId}.grid_control" />
</activity>
</application>

2
quickstep/res/color/bubblebar_drop_target_bg_color.xml
View File

@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:alpha="0.35" android:color="?androidprv:attr/materialColorPrimaryContainer" />
<item android:alpha="0.35" android:color="?attr/materialColorPrimaryContainer" />
</selector>

2
quickstep/res/drawable/bg_bubble_bar_drop_target.xml
View File

@@ -20,5 +20,5 @@
<solid android:color="@color/bubblebar_drop_target_bg_color" />
<stroke
android:width="1dp"
android:color="?androidprv:attr/materialColorPrimaryContainer" />
android:color="?attr/materialColorPrimaryContainer" />
</shape>

2
quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml
View File

@@ -22,6 +22,6 @@
<solid android:color="@color/bubblebar_drop_target_bg_color" />
<stroke
android:width="1dp"
android:color="?androidprv:attr/materialColorPrimaryContainer" />
android:color="?attr/materialColorPrimaryContainer" />
</shape>
</inset>

2
quickstep/res/drawable/ic_chevron_down.xml
View File

@@ -19,7 +19,7 @@
android:width="48dp"
android:height="48dp"
android:autoMirrored="true"
android:tint="?androidprv:attr/materialColorOnSurface"
android:tint="?attr/materialColorOnSurface"
android:viewportHeight="48"
android:viewportWidth="48">
<group

2
quickstep/res/layout/icon_app_chip_view.xml
View File

@@ -26,7 +26,7 @@
android:importantForAccessibility="no"
android:autoMirrored="true"
android:elevation="@dimen/task_thumbnail_icon_menu_elevation"
android:background="?androidprv:attr/materialColorSurfaceBright">
android:background="?attr/materialColorSurfaceBright">
<!-- ignoring warning because the user of the anchor is a Rect where RTL is not needed -->
<!-- This anchor's bounds is in the expected location after rotations and translations are

2
quickstep/res/layout/taskbar_divider_popup_menu.xml
View File

@@ -47,7 +47,7 @@
android:backgroundTint="?android:attr/textColorPrimary" />
<Switch
style="@style/Switch.SettingsLib"
style="@android:style/Widget.Material.CompoundButton.Switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/taskbar_pinning_switch"

30
quickstep/res/values/styles.xml
View File

@@ -124,7 +124,7 @@
<style name="TextAppearance.GestureTutorial.ButtonLabel"
parent="TextAppearance.GestureTutorial.CallToAction">
<item name="android:gravity">center</item>
<item name="android:textColor">?androidprv:attr/materialColorOnPrimary</item>
<item name="android:textColor">?attr/materialColorOnPrimary</item>
<item name="android:letterSpacing">0.02</item>
<item name="android:textSize">16sp</item>
<item name="android:textAllCaps">false</item>
@@ -268,46 +268,46 @@
<style name="KeyboardQuickSwitchText">
<item name="fontFamily">google-sans-text</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
<item name="android:textColor">?attr/materialColorOnSurface</item>
<item name="lineHeight">20sp</item>
</style>
<style name="KeyboardQuickSwitchText.OnBackground" parent="KeyboardQuickSwitchText">
<item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
<item name="android:textColor">?attr/materialColorOnSurface</item>
</style>
<style name="GestureTutorialActivity" parent="@style/AppTheme">
<item name="background">@android:color/transparent</item>
<item name="tutorialSubtitle">@android:color/black</item>
<item name="surfaceContainer">?androidprv:attr/materialColorSurfaceContainer</item>
<item name="onSurfaceHome">?androidprv:attr/materialColorPrimaryFixed</item>
<item name="surfaceContainer">?attr/materialColorSurfaceContainer</item>
<item name="onSurfaceHome">?attr/materialColorPrimaryFixed</item>
<item name="surfaceHome">@android:color/system_accent1_300</item>
<item name="secondaryHome">?androidprv:attr/materialColorOnPrimaryFixedVariant</item>
<item name="onSurfaceBack">?androidprv:attr/materialColorTertiaryFixed</item>
<item name="secondaryHome">?attr/materialColorOnPrimaryFixedVariant</item>
<item name="onSurfaceBack">?attr/materialColorTertiaryFixed</item>
<item name="surfaceBack">@android:color/system_accent3_300</item>
<item name="secondaryBack">?androidprv:attr/materialColorOnTertiaryFixedVariant</item>
<item name="onSurfaceOverview">?androidprv:attr/materialColorPrimaryFixed</item>
<item name="secondaryBack">?attr/materialColorOnTertiaryFixedVariant</item>
<item name="onSurfaceOverview">?attr/materialColorPrimaryFixed</item>
<item name="surfaceOverview">@android:color/system_accent2_300</item>
<item name="secondaryOverview">?androidprv:attr/materialColorOnSecondaryFixedVariant</item>
<item name="secondaryOverview">?attr/materialColorOnSecondaryFixedVariant</item>
</style>
<style name="rotate_prompt_title" parent="TextAppearance.GestureTutorial.Dialog.Title">
<item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
<item name="android:textColor">?attr/materialColorOnSurface</item>
</style>
<style name="rotate_prompt_subtitle" parent="TextAppearance.GestureTutorial.Dialog.Subtitle">
<item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>
<item name="android:textColor">?attr/materialColorOnSurfaceVariant</item>
</style>
<style name="ArrowTipTaskbarStyle">
<item name="arrowTipBackground">?androidprv:attr/materialColorSurfaceContainer</item>
<item name="arrowTipTextColor">?androidprv:attr/materialColorOnSurface</item>
<item name="arrowTipBackground">?attr/materialColorSurfaceContainer</item>
<item name="arrowTipTextColor">?attr/materialColorOnSurface</item>
</style>
<style name="IconAppChipMenuTextStyle">
<item name="android:fontFamily">google-sans-text-medium</item>
<item name="android:textSize">@dimen/task_thumbnail_icon_menu_text_size</item>
<item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
<item name="android:textColor">?attr/materialColorOnSurface</item>
<item name="android:letterSpacing">0.025</item>
<item name="android:lineHeight">20sp</item>
</style>

2
res/drawable/bg_rounded_corner_bottom_sheet_handle.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="?androidprv:attr/materialColorOutlineVariant"/>
<solid android:color="?attr/materialColorOutlineVariant"/>
<corners android:radius="@dimen/bottom_sheet_handle_corner_radius" />
</shape>

2
res/drawable/ic_private_space_with_background.xml
View File

@@ -20,7 +20,7 @@
android:height="48dp">
<path
android:pathData="M48 24A24 24 0 0 1 0 24A24 24 0 0 1 48 24Z"
android:fillColor="?androidprv:attr/materialColorSurfaceContainerLowest" />
android:fillColor="?attr/materialColorSurfaceContainerLowest" />
<path
android:pathData="M24.0021 10.6641L13.3354 14.6641V22.7841C13.3354 29.5174 17.8821 35.7974 24.0021 37.3307C30.1221 35.7974 34.6688 29.5174 34.6688 22.7841V14.6641L24.0021 10.6641ZM32.0021 22.7841C32.0021 28.1174 28.6021 33.0507 24.0021 34.5574C19.4021 33.0507 16.0021 28.1307 16.0021 22.7841V16.5174L24.0021 13.5174L32.0021 16.5174V22.7841Z"
android:fillType="evenOdd"

4
res/drawable/icon_menu_arrow_background.xml
View File

@@ -22,7 +22,7 @@
android:angle="0"
android:startColor="#00000000"
android:centerX="0.25"
android:centerColor="?androidprv:attr/materialColorSurfaceBright"
android:endColor="?androidprv:attr/materialColorSurfaceBright" />
android:centerColor="?attr/materialColorSurfaceBright"
android:endColor="?attr/materialColorSurfaceBright" />
<corners android:radius="@dimen/dialogCornerRadius" />
</shape>

1105
src/com/android/launcher3/InvariantDeviceProfile.java
View File

File diff suppressed because it is too large Load Diff

85
src/com/android/launcher3/testing/shared/ResourceUtils.java Normal file
View File

@@ -0,0 +1,85 @@
/*
* Copyright (C) 2019 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.
*/
package com.android.launcher3.testing.shared;
import android.content.res.Resources;
import android.util.DisplayMetrics;
import android.util.TypedValue;
public class ResourceUtils {
private static final float EPSILON = 0.0001f;
public static final int DEFAULT_NAVBAR_VALUE = 48;
public static final int INVALID_RESOURCE_HANDLE = -1;
public static final String NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE = "navigation_bar_width";
public static final String NAVBAR_BOTTOM_GESTURE_SIZE = "navigation_bar_gesture_height";
public static final String NAVBAR_BOTTOM_GESTURE_LARGER_SIZE =
"navigation_bar_gesture_larger_height";
public static final String NAVBAR_HEIGHT = "navigation_bar_height";
public static final String NAVBAR_HEIGHT_LANDSCAPE = "navigation_bar_height_landscape";
public static final String STATUS_BAR_HEIGHT = "status_bar_height";
public static final String STATUS_BAR_HEIGHT_LANDSCAPE = "status_bar_height_landscape";
public static final String STATUS_BAR_HEIGHT_PORTRAIT = "status_bar_height_portrait";
public static final String NAV_BAR_INTERACTION_MODE_RES_NAME = "config_navBarInteractionMode";
public static int getNavbarSize(String resName, Resources res) {
return getDimenByName(resName, res, DEFAULT_NAVBAR_VALUE);
}
public static int getDimenByName(String resName, Resources res, int defaultValue) {
final int frameSize;
final int frameSizeResID = res.getIdentifier(resName, "dimen", "android");
if (frameSizeResID != 0) {
frameSize = res.getDimensionPixelSize(frameSizeResID);
} else {
frameSize = pxFromDp(defaultValue, res.getDisplayMetrics());
}
return frameSize;
}
public static boolean getBoolByName(String resName, Resources res, boolean defaultValue) {
final boolean val;
final int resId = res.getIdentifier(resName, "bool", "android");
if (resId != 0) {
val = res.getBoolean(resId);
} else {
val = defaultValue;
}
return val;
}
public static int getIntegerByName(String resName, Resources res, int defaultValue) {
int resId = res.getIdentifier(resName, "integer", "android");
return resId != 0 ? res.getInteger(resId) : defaultValue;
}
public static int pxFromDp(float size, DisplayMetrics metrics) {
return pxFromDp(size, metrics, 1f);
}
public static int pxFromDp(float size, DisplayMetrics metrics, float scale) {
float value = scale * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics);
return size < 0 ? INVALID_RESOURCE_HANDLE : roundPxValueFromFloat(value);
}
/**
* Rounds a pixel value, taking into account floating point errors.
*
* <p>If a dp (or sp) value typically returns a half pixel, such as 20dp at a 2.625 density
* returning 52.5px, there is a small chance that due to floating-point errors, the value will
* be stored as 52.499999. As we round to the nearest pixel, this could cause a 1px difference
* in final values, which we correct for in this method.
*/
public static int roundPxValueFromFloat(float value) {
float fraction = (float) (value - Math.floor(value));
if (Math.abs(0.5f - fraction) < EPSILON) {
// Note: we add for negative values as well, as Math.round brings -.5 to the next
// "highest" value, e.g. Math.round(-2.5) == -2 [i.e. (int)Math.floor(a + 0.5d)]
value += EPSILON;
}
return Math.round(value);
}
}