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

Commit 93d0b871 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

merged ub-launcher3-dorval, and resolved conflicts 

Bug: 36904684
Bug: 37929893
Bug: 36068989

Merged-In: I3da7113926cdcb933707b3864c4334223c11e25b
Merged-In: If9b11b212852cb1048d54db2224dab4acf2d93e0

Test: make -j 32 dist checkbuild

Change-Id: I7e12afdf66a892654a06b77f7fc625a93554d1e7
parents 1e92b1fd 8dd56b7e

Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -35,12 +35,14 @@ LOCAL_SRC_FILES := \ 


LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/res \

    frameworks/support/v7/recyclerview/res

    prebuilts/sdk/current/support/v7/recyclerview/res \



LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_PROTOC_OPTIMIZE_TYPE := nano

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

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages android.support.v7.recyclerview \
@@ -48,6 +50,7 @@ LOCAL_AAPT_FLAGS := \ 
LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_PACKAGE_NAME := Launcher3

LOCAL_PRIVILEGED_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2



LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
@@ -65,6 +68,7 @@ LOCAL_SRC_FILES := $(call all-proto-files-under, protos) 


LOCAL_PROTOC_OPTIMIZE_TYPE := nano

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

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java



LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := launcher_proto_lib

AndroidManifest-common.xml

+38 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
        android:fullBackupOnly="true"

        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:icon="@mipmap/ic_launcher_home"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"
@@ -58,12 +58,21 @@ 
        <!-- Intent received used to install shortcuts from other applications -->

        <receiver

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

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

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

            android:enabled="@bool/enable_install_shortcut_api" >

            <intent-filter>

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

            </intent-filter>

        </receiver>



        <!-- Intent received when a session is committed -->

        <receiver

            android:name="com.android.launcher3.SessionCommitReceiver" >

            <intent-filter>

                <action android:name="android.content.pm.action.SESSION_COMMITTED" />

            </intent-filter>

        </receiver>



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

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

            <intent-filter>
@@ -76,8 +85,35 @@ 
            android:process=":wallpaper_chooser">

        </service>



        <service android:name="com.android.launcher3.notification.NotificationListener"

                 android:enabled="@bool/notification_badging_enabled"

                 android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">

            <intent-filter>

                <action android:name="android.service.notification.NotificationListenerService" />

            </intent-filter>

        </service>



        <meta-data android:name="android.nfc.disable_beam_default"

                       android:value="true" />



        <activity android:name="com.android.launcher3.dragndrop.AddItemActivity"

            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"

            android:excludeFromRecents="true"

            android:autoRemoveFromRecents="true"

            android:label="@string/action_add_to_workspace" >

            <intent-filter>

                <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />

                <action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET" />

            </intent-filter>

        </activity>



        <!--

        Should point to the content provider which can be used to dump Launcher3 compatible

        worspace configuration to the dump's file descriptor by using launcher_dump.proto

        -->

        <meta-data

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

            android:value="com.android.launcher3.LauncherProvider" />



    </application>

</manifest>

AndroidManifest.xml

+7 −5
Original line number Diff line number Diff line
@@ -54,8 +54,9 @@ 
        android:fullBackupOnly="true"

        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:icon="@mipmap/ic_launcher_home"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:theme="@style/LauncherTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >
@@ -69,10 +70,10 @@ 
            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:stateNotNeeded="true"

            android:theme="@style/LauncherTheme"

            android:windowSoftInputMode="adjustPan"

            android:windowSoftInputMode="adjustPan|stateUnchanged"

            android:screenOrientation="nosensor"

            android:configChanges="keyboard|keyboardHidden|navigation"

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

            android:enabled="true">
@@ -90,6 +91,7 @@ 
        <activity

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

            android:label="@string/settings_button_text"

            android:theme="@android:style/Theme.DeviceDefault.Settings"

            android:autoRemoveFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
@@ -133,7 +135,7 @@ 
            android:theme="@android:style/Theme.NoDisplay"

            android:label="* HPROF"

            android:excludeFromRecents="true"

            android:icon="@mipmap/ic_launcher_home"

            android:icon="@drawable/ic_launcher_home"

            >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -145,7 +147,7 @@ 
        <activity

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

            android:label="Show Mem"

            android:icon="@mipmap/ic_launcher_home">

            android:icon="@drawable/ic_launcher_home">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />

build.gradle

+22 −10
Original line number Diff line number Diff line 
buildscript {

    repositories {

        mavenCentral()

        jcenter()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:2.1.3'

        classpath 'com.android.tools.build:gradle:2.3.1'

        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'

    }

}
@@ -12,12 +13,12 @@ apply plugin: 'com.android.application' 
apply plugin: 'com.google.protobuf'



android {

    compileSdkVersion 25

    buildToolsVersion '24.0.0'

    compileSdkVersion 26

    buildToolsVersion '26.0.0'



    defaultConfig {

        minSdkVersion 21

        targetSdkVersion 25

        targetSdkVersion 26

        versionCode 1

        versionName "1.0"
@@ -45,29 +46,39 @@ android { 


        androidTest {

            java.srcDirs = ['tests/src']

            manifest.srcFile "tests/AndroidManifest.xml"

            res.srcDirs = ['tests/res']

            manifest.srcFile "tests/AndroidManifest-common.xml"

        }



        aosp {

            manifest.srcFile "AndroidManifest.xml"

        }



        aospAndroidTest {

            manifest.srcFile "tests/AndroidManifest.xml"

        }

    }

}



repositories {

    mavenCentral()

    jcenter()

}



final String SUPPORT_LIBS_VERSION = '26.0.0-SNAPSHOT'

dependencies {

    compile 'com.android.support:support-v4:23.1.1'

    compile 'com.android.support:recyclerview-v7:23.1.1'

    compile 'com.android.support:palette-v7:23.2.0'

    compile "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"

    compile "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"

    compile "com.android.support:palette-v7:${SUPPORT_LIBS_VERSION}"

    compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2'



    testCompile 'junit:junit:4.12'

    androidTestCompile "org.mockito:mockito-core:1.+"

    androidTestCompile 'com.google.dexmaker:dexmaker:1.2'

    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'

    androidTestCompile 'com.android.support.test:runner:0.5'

    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'

    androidTestCompile 'com.android.support:support-annotations:23.2.0'

    androidTestCompile "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}"

}



protobuf {
@@ -80,7 +91,8 @@ protobuf { 
                task.builtins {

                    remove java

                    javanano {

                        option 'ignore_services=false'

                        option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano"

                        option "enum_style=java"

                    }

                }

            }

proguard.flags

+12 −0
Original line number Diff line number Diff line
@@ -82,3 +82,15 @@ 
  *;

}



# Proguard will strip methods required for talkback to properly scroll to

# next row when focus is on the last item of last row when using a RecyclerView

# Keep optimized and shrunk proguard to prevent issues like this when using

# support jar.

#-keep,allowoptimization,allowshrinking class android.support.** {

#  *;

#}

-keep class android.support.v7.widget.RecyclerView { *; }



-keep interface com.android.launcher3.userevent.nano.LauncherLogProto.** {

  *;

}