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

Commit 91fbf0a0 authored by Bill Yi's avatar Bill Yi
Browse files

Merge stage-aosp-master to aosp-master - DO NOT MERGE 

Change-Id: I723e082701e1728b3988ca7fb788a446a8710e46
parents 1a1c3c55 84dc850d

Android.mk

+8 −7
Original line number Diff line number Diff line
@@ -26,20 +26,21 @@ LOCAL_USE_AAPT2 := true 
LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib



LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano

LOCAL_PROGUARD_ENABLED := disabled



LOCAL_PACKAGE_NAME := ThemePicker

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := WallpaperPicker2



ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_SDK_VERSION := system_current

  LOCAL_STATIC_JAVA_LIBRARIES += libSharedWallpaper

endif



LOCAL_PACKAGE_NAME := ThemePicker

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := WallpaperPicker2



LOCAL_SRC_FILES := $(call all-java-files-under, $(WALLPAPER_PATH)/src) \

    $(call all-java-files-under, src) \

    $(call all-java-files-under, src_override)

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <activity

            android:name="com.android.customization.picker.CustomizationPickerActivity"

            android:label="@string/app_name"

            android:resizeableActivity="true"

            android:resizeableActivity="false"

            android:theme="@style/CustomizationTheme.NoActionBar">

            <intent-filter>

                <action android:name="android.intent.action.SET_WALLPAPER"/>
@@ -32,7 +32,7 @@ 
            </intent-filter>

        </activity>

        <activity android:name="com.android.customization.picker.theme.CustomThemeActivity"

                  android:resizeableActivity="true"

                  android:resizeableActivity="false"

                  android:theme="@style/CustomizationTheme.NoActionBar"/>

    </application>

PREUPLOAD.cfg

0 → 100644
+2 −0
Original line number Diff line number Diff line 
[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

res/drawable/ic_delete_24px.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

     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.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="@android:color/white"

      android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>

  <path

      android:fillColor="@android:color/white"

      android:pathData="M9,8h2v9h-2z"/>

  <path

      android:fillColor="@android:color/white"

      android:pathData="M13,8h2v9h-2z"/>

</vector>

res/layout/preview_card_cover_content.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_gravity="center"

    android:layout_marginHorizontal="@dimen/preview_theme_cover_content_extra_margin"

    android:gravity="center_horizontal"

    android:clipChildren="false"

    tools:showIn="@layout/theme_preview_card">

    <FrameLayout

        android:layout_width="@dimen/preview_theme_icon_size"