PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update folder preview and folder colors" into udc-dev am: e502136377

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

Change-Id: Ie23cfe2c9511c2f102e5fcfd4ef859bf39860503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-16 20:42:55 +00:00
committed by Automerger Merge Worker
parent c7786d86fc e502136377
commit ae417f2e01
9 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/color-night-v31/folder_background_dark.xml
+2 -2
View File
@@ -15,6 +15,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:color="@android:color/system_neutral2_500"
android:lStar="35" />
android:color="@android:color/system_neutral2_900"
android:lStar="12" />
</selector>
res/color-night-v31/folder_preview_dark.xml
+2 -2
View File
@@ -15,6 +15,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:color="@android:color/system_neutral2_500"
android:lStar="30" />
android:color="@android:color/system_neutral1_900"
android:lStar="17" />
</selector>
res/color-v31/folder_background_light.xml
+2 -2
View File
@@ -15,6 +15,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:color="@android:color/system_neutral1_500"
android:lStar="98" />
android:color="@android:color/system_neutral1_50"
android:lStar="94" />
</selector>
res/color-v31/folder_preview_light.xml
+1 -3
View File
@@ -14,7 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:color="@android:color/system_accent2_500"
android:lStar="80" />
<item android:color="@android:color/system_accent2_200"/>
</selector>
res/layout/user_folder_icon_normalized.xml
+1 -1
View File
@@ -51,7 +51,7 @@
android:singleLine="true"
android:textColor="?attr/folderTextColor"
android:textColorHighlight="?android:attr/colorControlHighlight"
android:textColorHint="?attr/folderHintColor"/>
android:textColorHint="?attr/folderHintTextColor"/>
<com.android.launcher3.pageindicators.PageIndicatorDots
android:id="@+id/folder_page_indicator"
res/values-v31/colors.xml
+5 -3
View File
@@ -34,8 +34,10 @@
<color name="workspace_text_color_light">@android:color/system_neutral1_0</color>
<color name="workspace_text_color_dark">@android:color/system_neutral1_1000</color>
<color name="folder_hint_text_color_light">@android:color/system_neutral1_50</color>
<color name="folder_hint_text_color_dark">@android:color/system_neutral2_700</color>
<color name="folder_text_color_light">@android:color/system_neutral1_900</color>
<color name="folder_text_color_dark">@android:color/system_neutral1_100</color>
<color name="folder_hint_text_color_light">@android:color/system_neutral2_700</color>
<color name="folder_hint_text_color_dark">@android:color/system_neutral2_200</color>
<color name="text_color_primary_dark">@android:color/system_neutral1_50</color>
<color name="text_color_secondary_dark">@android:color/system_neutral2_200</color>
@@ -44,7 +46,7 @@
<color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>
<color name="folder_pagination_color_light">@android:color/system_accent1_600</color>
<color name="folder_pagination_color_dark">@android:color/system_accent2_100</color>
<color name="folder_pagination_color_dark">@android:color/system_accent1_200</color>
<color name="home_settings_header_accent">@android:color/system_accent1_600</color>
<color name="home_settings_header_collapsed">@android:color/system_neutral1_100</color>
res/values/attrs.xml
+1 -1
View File
@@ -48,7 +48,7 @@
<attr name="folderIconRadius" format="float" />
<attr name="folderIconBorderColor" format="color" />
<attr name="folderTextColor" format="color" />
<attr name="folderHintColor" format="color" />
<attr name="folderHintTextColor" format="color" />
<attr name="isFolderDarkText" format="boolean" />
<attr name="workspaceAccentColor" format="color" />
<attr name="dropTargetHoverTextColor" format="color" />
res/values/colors.xml
+10 -8
View File
@@ -60,17 +60,19 @@
<color name="workspace_text_color_light">#FFF</color>
<color name="workspace_text_color_dark">#FF000000</color>
<color name="folder_hint_text_color_light">#FFF</color>
<color name="folder_hint_text_color_dark">#FF000000</color>
<color name="folder_text_color_light">#1F1F1F</color>
<color name="folder_text_color_dark">#E3E3E3</color>
<color name="folder_hint_text_color_light">#444746</color>
<color name="folder_hint_text_color_dark">#C4C7C5</color>
<color name="folder_background_light">#F9F9F9</color>
<color name="folder_background_dark">#464746</color>
<color name="folder_background_light">#EFEDED</color>
<color name="folder_background_dark">#1F2020</color>
<color name="folder_preview_light">#F9F9F9</color>
<color name="folder_preview_dark">#464746</color>
<color name="folder_preview_light">#7FCFFF</color>
<color name="folder_preview_dark">#2A2A2A</color>
<color name="folder_pagination_color_light">#ff006c5f</color>
<color name="folder_pagination_color_dark">#ffbfebe3</color>
<color name="folder_pagination_color_light">#0B57D0</color>
<color name="folder_pagination_color_dark">#A8C7FA</color>
<color name="text_color_primary_dark">#FFFFFFFF</color>
<color name="text_color_secondary_dark">#FFFFFFFF</color>
res/values/styles.xml
+4 -3
View File
@@ -54,9 +54,9 @@
<item name="folderPreviewColor">@color/folder_preview_light</item>
<item name="folderBackgroundColor">@color/folder_background_light</item>
<item name="folderIconBorderColor">?android:attr/colorPrimary</item>
<item name="folderTextColor">?android:attr/textColorPrimary</item>
<item name="isFolderDarkText">true</item>
<item name="folderHintColor">@color/folder_hint_text_color_dark</item>
<item name="folderTextColor">@color/folder_text_color_light</item>
<item name="folderHintTextColor">@color/folder_hint_text_color_light</item>
<item name="loadingIconColor">#CCFFFFFF</item>
<item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
<item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
@@ -116,7 +116,8 @@
<item name="folderBackgroundColor">@color/folder_background_dark</item>
<item name="folderIconBorderColor">?android:attr/colorPrimary</item>
<item name="isFolderDarkText">false</item>
<item name="folderHintColor">@color/folder_hint_text_color_light</item>
<item name="folderTextColor">@color/folder_text_color_dark</item>
<item name="folderHintTextColor">@color/folder_hint_text_color_dark</item>
<item name="isMainColorDark">true</item>
<item name="loadingIconColor">#99FFFFFF</item>
<item name="iconOnlyShortcutColor">#B3FFFFFF</item>