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

Commit 147d1e85 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android Git Automerger
Browse files

am 0c0d5463: resolved conflicts for merge of 13ef17a3 to mnc-ub-dev b/22609402 

* commit '0c0d5463': (500 commits)
  Adding minSpanX and minSpanY for all the launcher widgets
  [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
  Query the title and icon for app using correct user handle.
  Fix issue where corp app widget doesn't show correctly on drop targets.
  [DO NOT MERGE] fixing build break
  Fixing AppWidgetInfo not initialized with proper user
  [Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user
  Fix issue with UiThreadReveal on L devices
  Import translations. DO NOT MERGE
  Using highres icons for backup
  Import translations. DO NOT MERGE
  Widget row should not be cut off on the right, when there is an indent
  Fixing shortcuts not getting migrated to app icons
  Fixing regression in calculating workspace padding.
  Hide spammy WidgetModel log behind a DEBUG flag
  Import translations. DO NOT MERGE
  Animation should start and finish on widgets button when opening/closing widget tray.
  Making long-press of AllApps to jump directly to search.
  Computing the visible cell layout area without using the current scroll
  Fixing overscroll not drawn in rtl
  ...
parents 72879d40 0c0d5463

.gitignore

+9 −0
Original line number Diff line number Diff line 
db_files

*.iml

.project

.classpath

.project.properties

gen/

tests/stress/gen/

WallpaperPicker/gen/

WallpaperPicker/.project.properties

bin/

Android.mk

+6 −9
Original line number Diff line number Diff line
@@ -23,28 +23,23 @@ include $(CLEAR_VARS) 


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, WallpaperPicker/src) \

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

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

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



LOCAL_AAPT_FLAGS := --auto-add-overlay

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



LOCAL_SDK_VERSION := current

LOCAL_PACKAGE_NAME := Launcher3

#LOCAL_CERTIFICATE := shared



LOCAL_OVERRIDES_PACKAGES := Home Launcher2



LOCAL_PROGUARD_FLAG_FILES := proguard.flags



include $(BUILD_PACKAGE)
@@ -83,4 +78,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP) 
	$(copy-file-to-new-target)

	$(hide) chmod 755 $@



INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)



include $(call all-makefiles-under,$(LOCAL_PATH))

AndroidManifest.xml

+15 −36
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ 
        android:protectionLevel="dangerous"

        android:label="@string/permlab_install_shortcut"

        android:description="@string/permdesc_install_shortcut" />

    <permission

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

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_uninstall_shortcut"

        android:description="@string/permdesc_uninstall_shortcut"/>

    <permission

        android:name="com.android.launcher3.permission.READ_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
@@ -71,7 +65,6 @@ 
    <uses-permission android:name="com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST" />



    <application

        android:name="com.android.launcher3.LauncherApplication"

        android:allowBackup="@bool/enable_backup"

        android:backupAgent="com.android.launcher3.LauncherBackupAgentHelper"

        android:hardwareAccelerated="true"
@@ -89,6 +82,8 @@ 
            android:theme="@style/Theme"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="nosensor"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

            android:enabled="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -98,8 +93,10 @@ 
            </intent-filter>

        </activity>



        <!-- ENABLE_FOR_TESTING



        <activity

            android:name="com.android.launcher3.LauncherExtension"

            android:name="com.android.launcher3.testing.LauncherExtension"

            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:stateNotNeeded="true"
@@ -115,6 +112,8 @@ 
            </intent-filter>

        </activity>



        -->



        <activity

            android:name="com.android.launcher3.ToggleWeightWatcher"

            android:label="@string/toggle_weight_watcher"
@@ -128,7 +127,7 @@ 
        </activity>



        <activity

            android:name="com.android.launcher3.LauncherWallpaperPickerActivity"

            android:name="com.android.launcher3.WallpaperPickerActivity"

            android:theme="@style/Theme.WallpaperPicker"

            android:label="@string/pick_wallpaper"

            android:icon="@mipmap/ic_launcher_wallpaper"
@@ -154,6 +153,13 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name="com.android.launcher3.SettingsActivity"

            android:label="@string/settings_button_text"

            android:autoRemoveFromRecents="true"

            android:process=":settings_process">

        </activity>



        <!-- Debugging tools -->

        <activity

            android:name="com.android.launcher3.MemoryDumpActivity"
@@ -191,15 +197,6 @@ 
            </intent-filter>

        </receiver>



        <!-- Intent received used to uninstall shortcuts from other applications -->

        <receiver

            android:name="com.android.launcher3.UninstallShortcutReceiver"

            android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT">

            <intent-filter>

                <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" />

            </intent-filter>

        </receiver>



        <!-- Intent received used to initialize a restored widget -->

        <receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver" >

            <intent-filter>
@@ -207,24 +204,6 @@ 
            </intent-filter>

        </receiver>



        <!-- New user initialization; set up initial wallpaper -->

        <receiver

            android:name="com.android.launcher3.UserInitializeReceiver"

            android:exported="false">

            <intent-filter>

                <action android:name="android.intent.action.USER_INITIALIZE" />

            </intent-filter>

        </receiver>



        <receiver android:name="com.android.launcher3.PackageChangedReceiver" >

            <intent-filter>

                <action android:name="android.intent.action.PACKAGE_CHANGED"/>

                <action android:name="android.intent.action.PACKAGE_REPLACED"/>

                <action android:name="android.intent.action.PACKAGE_REMOVED"/>

                <data android:scheme="package"></data>

            </intent-filter>

        </receiver>



        <receiver android:name="com.android.launcher3.StartupReceiver" >

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED" />

WallpaperPicker/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ 
        android:versionName="1.0"

        >



    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" />



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

    <application/>

</manifest>

WallpaperPicker/res/drawable-hdpi/ic_images.png

−1.54 KiB (354 B)
Loading image diff...