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

Commit 167f7a4d authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master

Bug: 146167222
Change-Id: I417f1a54dc6cc208e1cd6568d0247f2658522808
parents 0e076e7e 38ea5566
Loading
Loading
Loading
Loading
+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_PRODUCT_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)
+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>

CleanSpec.mk

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

# If you don't need to do a full clean build but would like to touch
# a file or delete some intermediate files, add a clean step to the end
# of the list.  These steps will only be run once, if they haven't been
# run before.
#
# E.g.:
#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
#
# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
# files that are missing or have been moved.
#
# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
# Use $(OUT_DIR) to refer to the "out" directory.
#
# If you need to re-do something that's already mentioned, just copy
# the command and add it to the bottom of the list.  E.g., if a change
# that you made last week required touching a file and a change you
# made today requires touching the same file, just copy the old
# touch step and add it to the end of the list.
#
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

# For example:
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)

# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-apps/ThemePicker)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-apps/ThemePicker)
 No newline at end of file

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>
Loading