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

Merge "Update work tab colors and fab background color" into udc-dev am: fe3d513650

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23331299

Change-Id: I5d53ac396931ec6be07d87dc671d14e244e4e201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brandon Dayauon
2023-05-25 03:49:24 +00:00
committed by Automerger Merge Worker
parent 97ec1855a0 fe3d513650
commit 98b3fe1aba
20 changed files with 80 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/res/values-night/colors.xml
View File

@@ -26,4 +26,6 @@
<!-- Turn on work apps button -->
<color name="work_turn_on_stroke">?androidprv:attr/colorAccentSecondaryVariant</color>
<color name="work_fab_bg_color">?androidprv:attr/materialColorPrimaryFixedDim</color>
<color name="work_fab_icon_color">?androidprv:attr/materialColorOnPrimaryFixed</color>
</resources>

2
quickstep/res/values/colors.xml
View File

@@ -86,4 +86,6 @@
<!-- Turn on work apps button -->
<color name="work_turn_on_stroke">?androidprv:attr/colorAccentPrimaryVariant</color>
<color name="work_fab_bg_color">?androidprv:attr/materialColorPrimaryFixedDim</color>
<color name="work_fab_icon_color">?androidprv:attr/materialColorOnPrimaryFixed</color>
</resources>

2
res/color-night-v31/all_apps_tab_background_selected.xml
View File

@@ -14,5 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_accent2_100"/>
<item android:color="@android:color/system_accent1_200"/>
</selector>

4
res/color-night-v31/all_apps_tab_text.xml
View File

@@ -14,6 +14,6 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral2_700" android:state_selected="true"/>
<item android:color="@android:color/system_accent2_100"/>
<item android:color="@android:color/system_accent1_800" android:state_selected="true"/>
<item android:color="@android:color/system_neutral1_100"/>
</selector>

4
res/color-night-v31/all_apps_tabs_background.xml
View File

@@ -14,5 +14,7 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_800"/>
<item
android:color="@android:color/system_neutral1_800"
android:lStar="22"/>
</selector>

2
res/color-night/all_apps_tab_background_selected.xml
View File

@@ -14,5 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#BFEBE3"/>
<item android:color="#A8C7FA"/>
</selector>

4
res/color-night/all_apps_tab_text.xml
View File

@@ -14,6 +14,6 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#F0F0F0" android:state_selected="true"/>
<item android:color="#464646"/>
<item android:color="#062E6F" android:state_selected="true"/>
<item android:color="#E3E3E3"/>
</selector>

18
res/color-night/all_apps_tabs_background.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2023 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="#343535"/>
</selector>

2
res/color-v31/all_apps_tab_background_selected.xml
View File

@@ -14,5 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_accent1_100"/>
<item android:color="@android:color/system_accent1_600"/>
</selector>

4
res/color-v31/all_apps_tab_text.xml
View File

@@ -14,6 +14,6 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_900" android:state_selected="true"/>
<item android:color="@android:color/system_neutral2_700"/>
<item android:color="@android:color/system_accent1_200" android:state_selected="true"/>
<item android:color="@android:color/system_neutral1_900"/>
</selector>

2
res/color-v31/all_apps_tabs_background.xml
View File

@@ -14,5 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="97" />
<item android:color="@android:color/system_neutral1_100"/>
</selector>

2
res/color/all_apps_tab_background_selected.xml
View File

@@ -14,5 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#8DF5E3"/>
<item android:color="#0B57D0"/>
</selector>

4
res/color/all_apps_tab_text.xml
View File

@@ -14,6 +14,6 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#1B1B1B" android:state_selected="true"/>
<item android:color="#464646"/>
<item android:color="#FFFFFF" android:state_selected="true"/>
<item android:color="#1F1F1F"/>
</selector>

2
res/color/all_apps_tabs_background.xml
View File

@@ -14,5 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#F6F6F6"/>
<item android:color="#E3E3E3"/>
</selector>

27
res/drawable/work_mode_fab_background.xml Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2023 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="@color/accent_ripple_color">
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/work_fab_radius" />
<solid android:color="@color/work_fab_bg_color" />
<padding
android:left="@dimen/work_profile_footer_padding"
android:right="@dimen/work_profile_footer_padding" />
</shape>
</item>
</ripple>

5
res/layout/work_mode_fab.xml
View File

@@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:minHeight="@dimen/work_fab_height"
android:gravity="center_vertical"
android:background="@drawable/work_apps_toggle_background"
android:background="@drawable/work_mode_fab_background"
android:forceHasOverlappingRendering="false"
android:contentDescription="@string/work_apps_pause_btn_text"
android:animateLayoutChanges="true">
@@ -31,12 +31,13 @@
android:layout_height="@dimen/work_fab_icon_size"
android:importantForAccessibility="no"
android:src="@drawable/ic_corp_off"
android:tint="@color/work_fab_icon_color"
android:scaleType="center"/>
<TextView
android:id="@+id/pause_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/all_apps_tab_text"
android:textColor="@color/work_fab_icon_color"
android:textSize="14sp"
android:includeFontPadding="false"
android:textDirection="locale"

4
res/values-night-v31/colors.xml
View File

@@ -47,4 +47,8 @@
<color name="widget_picker_collapse_handle_color_dark">
@android:color/system_neutral2_700</color>
<color name="work_fab_bg_color">
@android:color/system_accent1_200</color>
<color name="work_fab_icon_color">
@android:color/system_accent1_900</color>
</resources>

5
res/values-v31/colors.xml
View File

@@ -97,4 +97,9 @@
@android:color/system_neutral2_700</color>
<color name="widget_picker_collapse_handle_color_light">
@android:color/system_neutral2_200</color>
<color name="work_fab_bg_color">
@android:color/system_accent1_200</color>
<color name="work_fab_icon_color">
@android:color/system_accent1_900</color>
</resources>

2
res/values/colors.xml
View File

@@ -96,6 +96,8 @@
<color name="preload_icon_background_color_dark">#40484D</color>
<color name="work_turn_on_stroke">?android:attr/colorAccent</color>
<color name="work_fab_bg_color">#A8C7FA</color>
<color name="work_fab_icon_color">#041E49</color>
<color name="widget_picker_primary_surface_color_light">#EFEDED</color>
<color name="widget_picker_secondary_surface_color_light">#FAF9F8</color>

1
src/com/android/launcher3/allapps/WorkModeSwitch.java
View File

@@ -97,7 +97,6 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
mTextView.setText(cache.workProfilePauseButton);
}
mIcon.setColorFilter(mTextView.getCurrentTextColor());
getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
}