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

Commit ea9ad5ce authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev 

Conflicts:
	Android.mk

Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e
parents 5845d3db 4abaf133

.gitignore

+6 −0
Original line number Diff line number Diff line
@@ -8,3 +8,9 @@ tests/stress/gen/ 
WallpaperPicker/gen/

WallpaperPicker/.project.properties

bin/

.idea/

.gradle/

local.properties

gradle/

build/

gradlew*
 
 No newline at end of file

Android.mk

+12 −3
Original line number Diff line number Diff line
@@ -23,16 +23,25 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview



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

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

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

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



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res \

    $(LOCAL_PATH)/res \

    $(LOCAL_PATH)/../../../prebuilts/sdk/current/support/v7/recyclerview/res



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview



LOCAL_PROTOC_OPTIMIZE_TYPE := nano

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

LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages android.support.v7.recyclerview



LOCAL_SDK_VERSION := current

LOCAL_PACKAGE_NAME := Launcher3

AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

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

    package="com.android.launcher3">

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

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



    <permission

        android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
@@ -53,7 +53,6 @@ 
    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />

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

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

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

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

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

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

WallpaperPicker/res/values-v19/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        <item name="android:windowTranslucentNavigation">true</item>

    </style>



    <style name="Theme" parent="@android:style/Theme.DeviceDefault.Wallpaper.NoTitleBar">

    <style name="Theme" parent="@style/BaseWallpaperTheme">

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

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

    </style>

WallpaperPicker/res/values-v21/styles.xml

+7 −0
Original line number Diff line number Diff line
@@ -33,4 +33,11 @@ 
        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>

    </style>



    <style name="Theme" parent="@style/BaseWallpaperTheme">

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

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

        <item name="android:colorControlActivated">@color/launcher_accent_color</item>

        <item name="android:colorAccent">@color/launcher_accent_color</item>

        <item name="android:colorPrimary">@color/launcher_accent_color</item>

    </style>

</resources>
 
 No newline at end of file