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

Commit 00e827c7 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android Git Automerger
Browse files

am 5fcaab43: am ea9ad5ce: Merge remote-tracking branch \'origin/ub-launcher3-burnaby\' into mnc-dev 

* commit '5fcaab43': (76 commits)
  Restoring provider behavior for reloading app on old devices   > For older devices, launcher will only reload in case of inserts with specific query parameters   > For older devices, launcehr will notify content observers of any internal inserts   > Chaning TAG for Launcher provider as max logging tag is only 23 characters
  Removing items which are on invalid screen
  Preventing null pointer crash when opening a folder
  Revert workaround for move to default screen on home intent.
  Fixing NPE in recycler view scroll bar.
  Adding workaround for regression caused by ag/752175
  Adding gradle script for Android Studio
  Override the overscroll color for the widget rows.
  Adding graphic for all apps empty search screen.
  Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app
  Revert "Adding viewId for the QSB"
  Adding viewId for the QSB
  Fixing issue with missing scroll bar after fast-scrolling and searching.
  Fixing an issue where you would inadvertently start fastscrolling.
  Pending bind callbacks should be cleared before starting the loader, similar to startBinding
  Fixing widgets container inactive scroll bar color.
  Making the detached scrollbar catch up faster to the actual scroll position.
  Updating theme to use the light theme by default, instead of wallpaper theme   > This allows us to use all the goodness of material theme   > Cursor in folder edit text is no longer 1px wide
  Updating the target sdk to launcher
  Using the usermanager api to get creation time
  ...
parents c0d915de 5fcaab43

.gitignore

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

WallpaperPicker/gen/

WallpaperPicker/.project.properties

WallpaperPicker/.project.properties

bin/

bin/

.idea/

.gradle/

local.properties

gradle/

build/

gradlew*
 
 No newline at end of file

Android.mk

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




LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview



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

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

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

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

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

    $(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_PROGUARD_FLAG_FILES := proguard.flags

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





LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_OPTIMIZE_TYPE := nano

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

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_SDK_VERSION := current

LOCAL_PACKAGE_NAME := Launcher3

LOCAL_PACKAGE_NAME := Launcher3

AndroidManifest.xml

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

<manifest

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

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

    package="com.android.launcher3">

    package="com.android.launcher3">

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

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





    <permission

    <permission

        android:name="com.android.launcher.permission.INSTALL_SHORTCUT"

        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.SET_WALLPAPER_HINTS" />

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

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

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

    <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.READ_EXTERNAL_STORAGE" />

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

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

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

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

WallpaperPicker/res/values-v19/styles.xml

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

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

    </style>

    </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:windowTranslucentStatus">true</item>

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

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

    </style>

    </style>

WallpaperPicker/res/values-v21/styles.xml

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

        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>

    </style>

    </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>
 
</resources>
 
 No newline at end of file