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

Commit 8e88cb84 authored by Michael Jurka's avatar Michael Jurka
Browse files

Move wallpaper picker code to a separate directory 

Change-Id: Id79d11ed08085c4fe356739498a8b77952e30392
parent 33231f58

Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -26,8 +26,12 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13



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

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

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

    $(call all-proto-files-under, protos)

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res



LOCAL_AAPT_FLAGS := --auto-add-overlay



LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)



# ************************************************

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

res/values-sw720dp/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
    <dimen name="toolbar_button_vertical_padding">8dip</dimen>

    <dimen name="toolbar_button_horizontal_padding">8dip</dimen>



    <!-- dimensions for the wallpaper picker wallpaper thumbnail width -->

    <dimen name="wallpaper_chooser_grid_width">196dp</dimen>

    <dimen name="wallpaper_chooser_grid_height">140dp</dimen>



    <!-- When dragging items on the workspace, the number of dps by which the position of

     the drag view should be offset from the position of the original view. -->

    <dimen name="dragViewOffsetX">0dp</dimen>

res/values-sw720dp/styles.xml

+0 −6
Original line number Diff line number Diff line
@@ -51,12 +51,6 @@ 
    </style>



<!-- Workspace -->

    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">

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

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

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

    </style>



    <style name="TabIndicator.AppsCustomize">

        <item name="android:paddingStart">32dp</item>

        <item name="android:paddingEnd">32dp</item>

res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
    <color name="workspace_icon_text_color">#FFF</color>



    <color name="apps_customize_icon_text_color">#FFF</color>

    <color name="wallpaper_picker_translucent_gray">#66000000</color>

    <color name="folder_items_text_color">#FF333333</color>

    <color name="folder_items_glow_color">#FFCCCCCC</color>

    <color name="outline_color">#FFFFFFFF</color>