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

Commit baededcb authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Merging ub-launcher3-qt-dev, build 5570425 

Test: Manual

Bug:128986173 Not sure why the text for the at a glance widget is in Roboto instead of Google Sans.
Bug:129154138 In paged views inside ThemePicker, difficult to swipe left and right due to gesture nav
Bug:130400266 [a11y][Qt] The selected style shouldn't only rely on color to indicate which style is selected.
Bug:130763683 No preview cards on Custom theme, just full white ui with divider
Bug:131293339 [a11y][Qt] Talkback should speak "Checked/Not checked" status for the style options.
Bug:131768541 ✔️ [Q-Finalization] Prebuilt respin needed for WallpaperPickerGoogleRelease.apk for Android Q SDK Finalization
Bug:131811513 Rotate the device, Wallpaper category list will disappear
Bug:131819599 ml - Babel_LQA - Other: lqa8c44c1b9 [OVLP]
Bug:132013584 I cannot tell any difference between the first and second system icon set
Bug:132257073 Theme picker should support multiple custom themes
Bug:132282403 Confirmation Toast is missing when applying Clock
Bug:132282415 Remove "Previous" button for the first step of custom
Bug:132282437 Issue on using back with gesture
Bug:132291556 Crash when clicking a color option for custom themes
Bug:132340681 [Clarification] Not seeing Style and Clock under Styles & wallpapers screen
Bug:64712476 Import translations for dev branches

Change-Id: I23bf9eb7ff0c023ec9fa5402e0181c7a839416d4
parents 16d949b5 80309f15

res/color/edittext_background_color.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:alpha="0.16" android:color="@color/edit_background_base" android:state_hovered="true"/>

    <item android:alpha="0.04" android:color="@color/edit_background_base" android:state_enabled="false"/>

    <item android:alpha="0.05" android:color="@color/edit_background_base"/>

</selector>
 
 No newline at end of file

res/color/edittext_text_color.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="?android:textColorPrimaryNoDisable" android:state_focused="true"/>

    <item android:alpha="0.4" android:color="?android:textColorPrimaryNoDisable"/>

</selector>
 
 No newline at end of file

res/drawable/edittext_background.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--



     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.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="rectangle">

            <solid android:color="@color/edittext_background_color"/>

            <corners android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" android:topLeftRadius="4dp" android:topRightRadius="4dp"/>

        </shape>

    </item>

    <item android:gravity="bottom">

        <shape android:shape="rectangle">

            <solid android:color="?android:colorAccent"/>

            <size android:height="1dp"/>

        </shape>

    </item>

</layer-list>

res/drawable/option_border.xml

+1 −6
Original line number Diff line number Diff line
@@ -21,10 +21,5 @@ 
            <corners android:radius="4dp" />

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

            <stroke android:color="@color/option_border_color" android:width="@dimen/option_border_width" />

            <corners android:radius="4dp" />

        </shape>

    </item>

    <item android:drawable="@drawable/option_border_edge" />

</ripple>

res/drawable/option_border_edge.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_activated="true">

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/option_border_color"

                android:width="@dimen/option_selected_border_width" />

            <corners android:radius="4dp" />

        </shape>

    </item>

    <item android:state_activated="false">

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/option_border_color"

                android:width="@dimen/option_border_width" />

            <corners android:radius="4dp" />

        </shape>

    </item>

</selector>