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

Commit 2421c4e0 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Merging ub-launcher3-master, build 5294095 

Test: Manual

Bug:120559294 Create a Customization section Fragment for Themes
Bug:122524192 Create release process for ThemePicker/WallpaperPicker2/WallpaperPickerGoogle
Bug:123648086 ThemePicker: Grid section flickers when choosing each option
Bug:123904588 Use ContentProvider for clockfaces instead of a stub
Bug:124071372 Respect current theme's rounded corner in ThemePicker

Change-Id: I4d18f2d59f4fc313756e32a7542f0191dc760ac8
parents 1ff147c6 874d8449

res/layout/fragment_clock_picker.xml

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
-->

<LinearLayout

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"
@@ -27,7 +28,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:background="@color/secondary_color"/>

        android:background="@color/secondary_color"

        app:card_style="screen_aspect_ratio"/>



    <LinearLayout

        android:id="@+id/options_section"

res/layout/fragment_grid_picker.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"

    android:orientation="vertical"

    android:background="@color/category_picker_background_color">

    <include layout="@layout/section_header"/>
@@ -27,7 +27,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:background="@color/secondary_color"/>

        android:background="@color/secondary_color"

        app:card_style="screen_aspect_ratio"/>



    <LinearLayout

        android:id="@+id/options_section"

res/values/attrs.xml

0 → 100644
+29 −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.

-->

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

    <!-- PreviewPager specific attributes. -->

    <declare-styleable name="PreviewPager">

        <attr name="card_style" format="integer">

            <!-- The cards are sized so that a small part of the next card in the pager can be seen

                peeking from the side. -->

            <enum name="peeking" value="0" />

            <!-- Cards are sized to match the screen's aspect ratio (based on available height) -->

            <enum name="screen_aspect_ratio" value="1" />

        </attr>

    </declare-styleable>

</resources>
 
 No newline at end of file

res/values/override.xml

+3 −1
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ 
<resources>

    <string name="themes_stub_package" translatable="false"/>

    <string name="clocks_stub_package" translatable="false"/>

    <!-- Authority of a provider in System UI that will provide preview info for available clockfaces. -->

    <string name="clocks_provider_authority" translatable="false">com.android.keyguard.clock</string>



    <!--Name of metadata in the main launcher Activity which values contains the authority

        corresponding to a ContentProvider in launcher to provide available grids and

        allow for changing them -->

    <string name="grid_control_metadata_name" translatable="false">"com.android.launcher3.grid.control"</string>

    <string name="grid_control_metadata_name" translatable="false">com.android.launcher3.grid.control</string>

</resources>
 
 No newline at end of file

res/values/styles.xml

+1 −2
Original line number Diff line number Diff line
@@ -58,14 +58,13 @@ 




    <style name="PreviewCard" parent="CardView.Light">

        <item name="cardCornerRadius">@dimen/preview_card_corner_radius</item>

        <item name="cardCornerRadius">?android:dialogCornerRadius</item>

        <item name="android:clipChildren">true</item>

        <item name="contentPadding">@dimen/preview_card_padding</item>

        <item name="android:background">@color/primary_color</item>

    </style>



    <style name="FullContentPreviewCard" parent="PreviewCard">

        <item name="cardCornerRadius">@dimen/preview_card_corner_radius</item>

        <item name="android:clipChildren">true</item>

        <item name="contentPadding">0dp</item>

        <item name="android:background">@color/primary_color</item>