mirror of
https://github.com/alesimula/Murine-launcher.git
synced 2026-10-28 09:43:42 +00:00
Fix static resource linking for quickstep
This commit is contained in:
1 parent
8501145cb5
commit
0a489a175f
16 files changed
+250
-11
No files matched your search
@@ -30,7 +30,7 @@
|
|||||||
android:fullBackupOnly="true"
|
android:fullBackupOnly="true"
|
||||||
android:fullBackupContent="@xml/backupscheme"
|
android:fullBackupContent="@xml/backupscheme"
|
||||||
android:hardwareAccelerated="true"
|
android:hardwareAccelerated="true"
|
||||||
android:icon="@drawable/ic_launcher_home"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/derived_app_name"
|
android:label="@string/derived_app_name"
|
||||||
android:theme="@style/AppTheme"
|
android:theme="@style/AppTheme"
|
||||||
android:largeHeap="@bool/config_largeHeap"
|
android:largeHeap="@bool/config_largeHeap"
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
android:fullBackupOnly="true"
|
android:fullBackupOnly="true"
|
||||||
android:fullBackupContent="@xml/backupscheme"
|
android:fullBackupContent="@xml/backupscheme"
|
||||||
android:hardwareAccelerated="true"
|
android:hardwareAccelerated="true"
|
||||||
android:icon="@drawable/ic_launcher_home"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/derived_app_name"
|
android:label="@string/derived_app_name"
|
||||||
android:theme="@style/AppTheme"
|
android:theme="@style/AppTheme"
|
||||||
android:largeHeap="@bool/config_largeHeap"
|
android:largeHeap="@bool/config_largeHeap"
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:color="@android:color/system_accent1_100"/>
|
||||||
|
</selector>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
~ Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:color="#404040"
|
||||||
|
android:alpha="0.40"/>
|
||||||
|
</selector>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
~ Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:color="@android:color/system_accent1_100"
|
||||||
|
android:alpha="0.5"/>
|
||||||
|
</selector>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
~ Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:color="@android:color/system_neutral1_500"
|
||||||
|
android:lStar="98" android:alpha="0.54"/>
|
||||||
|
</selector>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
~ Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:color="@android:color/system_accent1_0"
|
||||||
|
android:alpha="0.32"/>
|
||||||
|
</selector>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
~ Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:color="@android:color/system_accent1_600"
|
||||||
|
android:alpha="0.15"/>
|
||||||
|
</selector>
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<inset
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<ripple
|
||||||
|
android:color="?android:attr/colorControlHighlight">
|
||||||
|
<item>
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
<corners android:radius="28dp"/>
|
||||||
|
<solid android:color="@color/nudge_button_color"/>
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
</ripple>
|
||||||
|
</inset>
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:color="?android:attr/colorControlHighlight">
|
||||||
|
<item>
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
<corners android:radius="@dimen/overview_actions_button_radius" />
|
||||||
|
<solid android:color="@color/materialColorSurfaceBright"/>
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
</ripple>
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
Copyright (C) 2025 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.
|
||||||
|
-->
|
||||||
|
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:color="?android:attr/colorControlHighlight">
|
||||||
|
<item>
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
<corners android:radius="@dimen/overview_actions_button_radius" />
|
||||||
|
<solid android:color="@color/surface_effect_1" />
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
</ripple>
|
||||||
@@ -98,6 +98,9 @@
|
|||||||
<dimen name="overview_actions_top_margin">24dp</dimen>
|
<dimen name="overview_actions_top_margin">24dp</dimen>
|
||||||
<dimen name="overview_actions_height">48dp</dimen>
|
<dimen name="overview_actions_height">48dp</dimen>
|
||||||
<dimen name="overview_actions_button_spacing">36dp</dimen>
|
<dimen name="overview_actions_button_spacing">36dp</dimen>
|
||||||
|
<dimen name="overview_actions_button_radius">28dp</dimen>
|
||||||
|
<dimen name="overview_actions_button_vertical_padding">10dp</dimen>
|
||||||
|
<dimen name="overview_actions_button_horizontal_padding">16dp</dimen>
|
||||||
|
|
||||||
<!-- These speeds are in dp/s -->
|
<!-- These speeds are in dp/s -->
|
||||||
<dimen name="max_task_dismiss_drag_velocity">2.25dp</dimen>
|
<dimen name="max_task_dismiss_drag_velocity">2.25dp</dimen>
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<resources
|
<resources
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
|
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
|
||||||
|
|
||||||
<style name="TextAppearance.GestureTutorial"
|
<style name="TextAppearance.GestureTutorial"
|
||||||
@@ -254,6 +255,15 @@
|
|||||||
<item name="android:background">@drawable/overview_action_button_background</item>
|
<item name="android:background">@drawable/overview_action_button_background</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="OverviewClearAllButton" parent="@android:style/Widget.DeviceDefault.Button">
|
||||||
|
<item name="android:background">@drawable/bg_overview_clear_all_button</item>
|
||||||
|
<item name="android:minWidth">96dp</item>
|
||||||
|
<item name="android:minHeight">48dp</item>
|
||||||
|
<item name="android:paddingStart">12dp</item>
|
||||||
|
<item name="android:paddingEnd">12dp</item>
|
||||||
|
<item name="android:stateListAnimator">@null</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="OverviewActionButton.Blur">
|
<style name="OverviewActionButton.Blur">
|
||||||
<item name="android:background">@drawable/overview_action_button_background_blur</item>
|
<item name="android:background">@drawable/overview_action_button_background_blur</item>
|
||||||
</style>
|
</style>
|
||||||
@@ -369,15 +379,15 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AllAppsBlurStyle">
|
<style name="AllAppsBlurStyle">
|
||||||
<item name="allAppsScrimColor">@androidprv:color/shade_panel_scrim_color</item>
|
<item name="allAppsScrimColor">@color/shade_panel_scrim_color</item>
|
||||||
<item name="groupHighlight">@androidprv:color/surface_effect_1</item>
|
<item name="groupHighlight">@color/surface_effect_1</item>
|
||||||
<item name="focusHighlight">@androidprv:color/surface_effect_2</item>
|
<item name="focusHighlight">@color/surface_effect_2</item>
|
||||||
<item name="allAppsSurfaceLow">@androidprv:color/surface_effect_0</item>
|
<item name="allAppsSurfaceLow">@color/surface_effect_0</item>
|
||||||
<item name="allAppsSurfaceHighest">@androidprv:color/surface_effect_2</item>
|
<item name="allAppsSurfaceHighest">@color/surface_effect_2</item>
|
||||||
<item name="allAppsUnselectedTab">@androidprv:color/surface_effect_2</item>
|
<item name="allAppsUnselectedTab">@color/surface_effect_2</item>
|
||||||
<item name="allappsHeaderProtectionColor">@androidprv:color/surface_effect_1</item>
|
<item name="allappsHeaderProtectionColor">@color/surface_effect_1</item>
|
||||||
<item name="privateSpaceSettingsColor">@androidprv:color/surface_effect_2</item>
|
<item name="privateSpaceSettingsColor">@color/surface_effect_2</item>
|
||||||
<item name="privateSpaceDividerColor">@androidprv:color/surface_effect_3</item>
|
<item name="privateSpaceDividerColor">@color/surface_effect_3</item>
|
||||||
<item name="bottomSheetDragHandleColor">@color/materialColorOnSurface</item>
|
<item name="bottomSheetDragHandleColor">@color/materialColorOnSurface</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2025 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.util
|
||||||
|
|
||||||
|
import com.android.launcher3.Flags
|
||||||
|
|
||||||
|
object OverviewReleaseFlags {
|
||||||
|
private fun enableOverviewNewLayout() =
|
||||||
|
Flags.enableRefactorTaskThumbnail() &&
|
||||||
|
Flags.enableOverviewIconMenu() &&
|
||||||
|
Flags.enableGridOnlyOverview()
|
||||||
|
|
||||||
|
@JvmStatic fun enableOverviewIconMenu() = enableOverviewNewLayout()
|
||||||
|
|
||||||
|
@JvmStatic fun enableGridOnlyOverview() = enableOverviewNewLayout()
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@
|
|||||||
<!-- Attributes used for launcher theme -->
|
<!-- Attributes used for launcher theme -->
|
||||||
<attr name="allAppsScrimColor" format="color" />
|
<attr name="allAppsScrimColor" format="color" />
|
||||||
<attr name="groupHighlight" format="color" />
|
<attr name="groupHighlight" format="color" />
|
||||||
|
<attr name="focusHighlight" format="color" />
|
||||||
<attr name="pageIndicatorArrowBgColor" format="color" />
|
<attr name="pageIndicatorArrowBgColor" format="color" />
|
||||||
<attr name="allAppsScrimColorOverBlur" format="color" />
|
<attr name="allAppsScrimColorOverBlur" format="color" />
|
||||||
<attr name="allappsHeaderProtectionColor" format="color" />
|
<attr name="allappsHeaderProtectionColor" format="color" />
|
||||||
|
|||||||
@@ -305,4 +305,5 @@
|
|||||||
<color name="materialColorSecondary">@color/system_secondary_light</color>
|
<color name="materialColorSecondary">@color/system_secondary_light</color>
|
||||||
<color name="materialColorTertiary">@color/system_tertiary_light</color>
|
<color name="materialColorTertiary">@color/system_tertiary_light</color>
|
||||||
<color name="materialColorError">@color/system_error_light</color>
|
<color name="materialColorError">@color/system_error_light</color>
|
||||||
|
<color name="all_apps_blur_overlay_color">#80FFFFFF</color>
|
||||||
</resources>
|
</resources>
|
||||||
Reference in new issue
Block a user