Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a80eb20 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Change unnamed folder hint and style" into ub-launcher3-master

parents 70607cfe 7315bdd2
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
            style="@style/TextHeadline"
            android:layout_weight="1"
            android:background="@android:color/transparent"
            android:fontFamily="sans-serif-condensed"
            android:textStyle="bold"
            android:gravity="center_horizontal"
            android:hint="@string/folder_hint_text"
@@ -58,7 +58,7 @@
            android:singleLine="true"
            android:textColor="?attr/folderTextColor"
            android:textColorHighlight="?android:attr/colorControlHighlight"
            android:textColorHint="?attr/folderTextColor"
            android:textColorHint="?attr/folderHintColor"
            android:textSize="@dimen/folder_label_text_size" />

        <com.android.launcher3.pageindicators.PageIndicatorDots
+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@
    <attr name="folderIconRadius" format="float" />
    <attr name="folderIconBorderColor" format="color" />
    <attr name="folderTextColor" format="color" />
    <attr name="folderHintColor" format="color" />

    <!-- BubbleTextView specific attributes. -->
    <declare-styleable name="BubbleTextView">
+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@
    <string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string>

    <!-- Default folder title -->
    <string name="folder_hint_text">Unnamed Folder</string>
    <string name="folder_hint_text">Tap to edit</string>

    <!-- Accessibility -->
    <!-- The format string for when an app is temporarily disabled. -->
+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@
        <item name="folderFillColor">#CDFFFFFF</item>
        <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
        <item name="folderTextColor">#FF212121</item>
        <item name="folderHintColor">#FF616161</item>
        <item name="loadingIconColor">#CCFFFFFF</item>

        <item name="android:windowTranslucentStatus">false</item>
@@ -96,6 +97,7 @@
        <item name="folderFillColor">#DD3C4043</item> <!-- 87% GM2 800 -->
        <item name="folderIconBorderColor">#FF80868B</item>
        <item name="folderTextColor">@android:color/white</item>
        <item name="folderHintColor">#FFCCCCCC</item>
        <item name="isMainColorDark">true</item>
        <item name="loadingIconColor">#99FFFFFF</item>
    </style>