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

Commit 907ef46b authored by Jon's avatar Jon Committed by android-build-merger
Browse files

Merge branch 'ub-launcher3-edmonton' into pi-dev 

am: d00202ed

Change-Id: I70df8088b66bcfa0085cfe51e244ed22cd83fecb
parents 4f2a5483 d00202ed

AndroidManifest-common.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ 
<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="23" android:minSdkVersion="21"/>





    <!--

    <!--

    The manifest defines the common entries that should be present in any derivative of Launcher3.

    The manifest defines the common entries that should be present in any derivative of Launcher3.
@@ -82,7 +81,7 @@ 
        </receiver>

        </receiver>





        <service

        <service

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

            android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"

            android:exported="false"

            android:exported="false"

            android:process=":wallpaper_chooser"

            android:process=":wallpaper_chooser"

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

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

AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ 
            android:stateNotNeeded="true"

            android:stateNotNeeded="true"

            android:windowSoftInputMode="adjustPan"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="unspecified"

            android:screenOrientation="unspecified"

            android:configChanges="keyboard|keyboardHidden|navigation"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"

            android:resizeableActivity="true"

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

            android:taskAffinity=""

build.gradle

+34 −20
Original line number Original line Diff line number Diff line 
buildscript {

buildscript {

    repositories {

    repositories {

        mavenCentral()

        mavenCentral()

        jcenter()

        google()

    }

    }

    dependencies {

    dependencies {

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

        classpath 'com.android.tools.build:gradle:3.2.0-alpha12'

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

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

    }

    }

}

}





final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT'



apply plugin: 'com.android.application'

apply plugin: 'com.android.application'

apply plugin: 'com.google.protobuf'

apply plugin: 'com.google.protobuf'
@@ -23,6 +25,7 @@ android { 
        versionName "1.0"

        versionName "1.0"





        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        vectorDrawables.useSupportLibrary = true

    }

    }

    buildTypes {

    buildTypes {

        debug {

        debug {
@@ -30,18 +33,28 @@ android { 
        }

        }

    }

    }





    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }



    flavorDimensions "default"



    productFlavors {

    productFlavors {

        aosp {

        aosp {

            dimension "default"

            applicationId 'com.android.launcher3'

            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'

            testApplicationId 'com.android.launcher3.tests'

        }

        }





        l3go {

        l3go {

            dimension "default"

            applicationId 'com.android.launcher3'

            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'

            testApplicationId 'com.android.launcher3.tests'

        }

        }





        quickstep {

        quickstep {

            dimension "default"

            applicationId 'com.android.launcher3'

            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'

            testApplicationId 'com.android.launcher3.tests'

        }

        }
@@ -98,27 +111,28 @@ android { 
}

}





repositories {

repositories {

    maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }

    maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }

    mavenCentral()

    mavenCentral()

    jcenter()

    google()

}

}





final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT'

dependencies {

dependencies {

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

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

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

    implementation "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}"

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

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

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

    implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'





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

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





    testCompile 'junit:junit:4.12'

    testImplementation 'junit:junit:4.12'

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

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

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

    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'

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

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

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

    androidTestImplementation 'com.android.support.test:runner:1.0.0'

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

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

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

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

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

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

}

}





protobuf {

protobuf {

go/res/values-ar/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

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

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

    <string name="long_press_widget_to_add" msgid="4001616142797446267">"المس مع الاستمرار لاختيار اختصار."</string>

    <string name="long_press_widget_to_add" msgid="4001616142797446267">"المس مع الاستمرار لاختيار اختصار."</string>

    <string name="long_accessible_way_to_add" msgid="2725225828389948328">"يمكنك النقر نقرًا مزدوجًا مع الاستمرار لاختيار اختصار أو استخدام الإجراءات المخصصة."</string>

    <string name="long_accessible_way_to_add" msgid="2725225828389948328">"يمكنك النقر مرّتين مع الاستمرار لاختيار اختصار أو استخدام الإجراءات المخصصة."</string>

    <string name="widget_button_text" msgid="4221900832360456858">"الاختصارات"</string>

    <string name="widget_button_text" msgid="4221900832360456858">"الاختصارات"</string>

    <string name="widgets_bottom_sheet_title" msgid="3949835990909395998">"اختصارات <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="widgets_bottom_sheet_title" msgid="3949835990909395998">"اختصارات <xliff:g id="NAME">%1$s</xliff:g>"</string>

</resources>
 
</resources>

go/res/values-as/strings.xml

0 → 100644
+26 −0
Original line number Original line 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">"কোনো শ্বৰ্টকাট বাছনি কৰিবলৈ স্পৰ্শ কৰি ৰাখক।"</string>

    <string name="long_accessible_way_to_add" msgid="2725225828389948328">"কোনো শ্বৰ্টকাট বাছনি কৰিবলৈ দুবাৰ টিপি ৰাখক বা নিজৰ উপযোগিতা অনুসৰি বনোৱা কাৰ্যসমূহ ব্যৱহাৰ কৰক।"</string>

    <string name="widget_button_text" msgid="4221900832360456858">"শ্বৰ্টকাটসমূহ"</string>

    <string name="widgets_bottom_sheet_title" msgid="3949835990909395998">"<xliff:g id="NAME">%1$s</xliff:g> শ্বৰ্টকাটসমূহ"</string>

</resources>