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

Commit 544eb089 authored by Jon Miranda's avatar Jon Miranda
Browse files

Merge branch 'ub-launcher3-master' into master 

Test: flashed img
Change-Id: Ida66cfde3952a4a924f38811823474ca448a7dc0
parents 606f54a1 047dea9e

Android.mk

+52 −11
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ 


LOCAL_PATH := $(call my-dir)



#

# Prebuilt Java Libraries

#

include $(CLEAR_VARS)

LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \

    libSharedSystemUI:quickstep/libs/sysui_shared.jar

include $(BUILD_MULTI_PREBUILT)



#

# Build rule for Launcher3 app.

#
@@ -26,12 +34,11 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-v7-palette \

    android-support-dynamic-animation



LOCAL_SRC_FILES := \

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

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

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

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

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

    $(call all-proto-files-under, proto_overrides)
@@ -72,12 +79,11 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-v7-palette \

    android-support-dynamic-animation



LOCAL_SRC_FILES := \

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

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

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

    $(call all-java-files-under, go/src_flags) \

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

    $(call all-proto-files-under, proto_overrides)
@@ -114,22 +120,57 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* 
include $(BUILD_PACKAGE)



#

# Launcher proto buffer jar used for development

# Build rule for Quickstep app.

#

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-proto-files-under, protos) $(call all-proto-files-under, proto_overrides)

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-dynamic-animation \

    libSharedSystemUI



LOCAL_SRC_FILES := \

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

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

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

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

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



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/res \

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



LOCAL_PROGUARD_ENABLED := disabled



LOCAL_PROTOC_OPTIMIZE_TYPE := nano

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

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java



LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := launcher_proto_lib

LOCAL_IS_HOST_MODULE := true

LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-nano

LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

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



LOCAL_SDK_VERSION := system_current

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Launcher3QuickStep

LOCAL_PRIVILEGED_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*



include $(BUILD_PACKAGE)







include $(BUILD_HOST_JAVA_LIBRARY)



# ==================================================

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

AndroidManifest-common.xml

+1 −6
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
    <uses-permission android:name="android.permission.BIND_APPWIDGET" />

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

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

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



    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"
@@ -80,12 +81,6 @@ 
            </intent-filter>

        </receiver>



        <service android:name="com.android.launcher3.dynamicui.ColorExtractionService"

            android:exported="false"

            android:process=":wallpaper_chooser"

            android:permission="android.permission.BIND_JOB_SERVICE">

        </service>



        <service

            android:name="com.android.launcher3.compat.WallpaperManagerCompatVL$ColorExtractionService"

            android:exported="false"

AndroidManifest.xml

+0 −48
Original line number Diff line number Diff line
@@ -112,53 +112,5 @@ 
            android:writePermission="com.android.launcher3.permission.WRITE_SETTINGS"

            android:readPermission="com.android.launcher3.permission.READ_SETTINGS" />



        <!-- ENABLE_FOR_TESTING



        <activity

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

            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:stateNotNeeded="true"

            android:theme="@style/Theme"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="nosensor"

            >

            <intent-filter>

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

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

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

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

            </intent-filter>

        </activity>



        <activity

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

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

            android:label="* HPROF"

            android:excludeFromRecents="true"

            android:icon="@drawable/ic_launcher_home"

            >

            <intent-filter>

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

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

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

            </intent-filter>

        </activity>



        <activity

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

            android:label="Show Mem"

            android:icon="@drawable/ic_launcher_home">

            <intent-filter>

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

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

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

            </intent-filter>

        </activity>



        <service android:name="com.android.launcher3.testing.MemoryTracker" />



        -->



    </application>

</manifest>

build.gradle

+36 −18
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ buildscript { 
        jcenter()

    }

    dependencies {

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

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

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

    }

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



android {

    compileSdkVersion 26

    buildToolsVersion '26.0.0'

    compileSdkVersion 27

    buildToolsVersion '27.0.0'



    defaultConfig {

        minSdkVersion 21

        targetSdkVersion 26

        targetSdkVersion 27

        versionCode 1

        versionName "1.0"
@@ -40,7 +40,20 @@ android { 
            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'

        }



        quickstep {

            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'

        }

    }



    // Disable release builds for now

    android.variantFilter { variant ->

        if (variant.buildType.name.endsWith('release')) {

            variant.setIgnore(true);

        }

    }



    sourceSets {

        main {

            res.srcDirs = ['res']
@@ -52,31 +65,34 @@ android { 
            }

        }



        debug {

            manifest.srcFile "AndroidManifest.xml"

        }



        androidTest {

            res.srcDirs = ['tests/res']

            java.srcDirs = ['tests/src']

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

        }



        aosp {

            java.srcDirs = ['src_flags']

            manifest.srcFile "AndroidManifest.xml"

        androidTestDebug {

            manifest.srcFile "tests/AndroidManifest.xml"

        }



        aospAndroidTest {

            manifest.srcFile "tests/AndroidManifest.xml"

        aosp {

            java.srcDirs = ['src_flags', "src_ui_overrides"]

        }



        l3go {

            res.srcDirs = ['go/res']

            java.srcDirs = ['go/src_flags']

            // Note: we are using the Launcher3 manifest here because the gradle manifest-merger uses

            // different attributes than the build system.

            manifest.srcFile "AndroidManifest.xml"

            java.srcDirs = ['go/src_flags', "src_ui_overrides"]

            manifest.srcFile "go/AndroidManifest.xml"

        }



        l3goAndroidTest {

            manifest.srcFile "tests/AndroidManifest.xml"

        quickstep {

            res.srcDirs = ['quickstep/res']

            java.srcDirs = ['src_flags', 'quickstep/src']

            manifest.srcFile "quickstep/AndroidManifest.xml"

        }

    }

}
@@ -86,19 +102,21 @@ repositories { 
    jcenter()

}



final String SUPPORT_LIBS_VERSION = '26.0.0-SNAPSHOT'

final String SUPPORT_LIBS_VERSION = '27.0.0-SNAPSHOT'

dependencies {

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

    compile "com.android.support:support-dynamic-animation:${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-7'



    quickstepCompile fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')



    testCompile 'junit:junit:4.12'

    androidTestCompile "org.mockito:mockito-core:1.9.5"

    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:runner:1.0.0'

    androidTestCompile 'com.android.support.test:rules:1.0.0'

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

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

}

go/res/values-az-rAZ/strings.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

/*

* Copyright (C) 2017 The Android Open Source Project

*

* Licensed under the Apache License, Version 2.0 (the "License");

* you may not use this file except in compliance with the License.

* You may obtain a copy of the License at

*

*      http://www.apache.org/licenses/LICENSE-2.0

*

* Unless required by applicable law or agreed to in writing, software

* distributed under the License is distributed on an "AS IS" BASIS,

* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

* See the License for the specific language governing permissions and

* limitations under the License.

*/

 -->



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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="long_press_widget_to_add" msgid="4001616142797446267">"Qısayolu seçmək üçün toxunub saxlayın."</string>

    <string name="long_accessible_way_to_add" msgid="2725225828389948328">"Qısayolu seçmək üçün iki dəfə basıb saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>

    <string name="widget_button_text" msgid="4221900832360456858">"Qısayollar"</string>

    <string name="widgets_bottom_sheet_title" msgid="3949835990909395998">"<xliff:g id="NAME">%1$s</xliff:g> qısayolları"</string>

</resources>