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

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

Merging ub-launcher3-master, build 5324959 

Test: Manual

Bug: 120559294 Bug: 122524192 Bug: 123432343 Bug: 124400926 Bug: 124542302
Change-Id: Idd1b3759077b5acfdb30aaf43776725d840e276e
parents 2421c4e0 78acbb67

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.wallpaper">



    <uses-sdk android:targetSdkVersion="Q" android:minSdkVersion="Q"/>

    <uses-sdk android:targetSdkVersion="Q" android:minSdkVersion="28"/>



    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

res/layout/fragment_clock_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:background="@color/category_picker_background_color">

    android:background="?android:colorPrimary">

    <include layout="@layout/section_header"/>



    <com.android.customization.widget.PreviewPager

res/layout/fragment_grid_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:layout_width="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">

    android:background="?android:colorPrimary">

    <include layout="@layout/section_header"/>



    <com.android.customization.widget.PreviewPager

res/layout/fragment_theme_picker.xml

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,13 @@ 
        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content">

            <CheckBox

                android:id="@+id/use_my_wallpaper"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentStart="true"

                android:layout_centerVertical="true"

                android:text="@string/keep_my_wallpaper"/>

            <Button

                android:id="@+id/apply_button"

                style="@style/ActionPrimaryButton"

res/layout/preview_card_wallpaper_content.xml

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

-->

<FrameLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/preview_static_image"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="bottom"

    tools:showIn="@layout/theme_preview_card">

    <TextView

        style="@style/CardTitleTextAppearance"

        android:id="@+id/wallpaper_description"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal|bottom"/>

</FrameLayout>
 
 No newline at end of file