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

Commit 1216ed94 authored by Winson Chung's avatar Winson Chung
Browse files

Merge branch 'ub-launcher3-master' into launcher3merge2018-10-29 

Test: Presubmit
Change-Id: Ib885ad03c7612747672ca1b2f4b1ea38910fdabc
parents 65c9da39 f107c9ef

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ java_library_static { 
    name: "launcher-aosp-tapl",

    static_libs: [

        "androidx.annotation_annotation",

        "androidx-test",

        "androidx.test.runner",

        "androidx.test.rules",

        "androidx.test.uiautomator_uiautomator",

        "SystemUISharedLib",

    ],

AndroidManifest-common.xml

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ 
                       android:value="true" />



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

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

            android:theme="@style/AppItemActivityTheme"

            android:excludeFromRecents="true"

            android:autoRemoveFromRecents="true"

            android:label="@string/action_add_to_workspace" >

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ buildscript { 
        google()

    }

    dependencies {

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

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

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

    }

}
@@ -16,7 +16,7 @@ apply plugin: 'com.google.protobuf' 


android {

    compileSdkVersion 28

    buildToolsVersion '28.0.2'

    buildToolsVersion '28.0.3'



    defaultConfig {

        minSdkVersion 21

protos/launcher_log.proto

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ enum ControlType { 
  TASK_PREVIEW = 15;

  SPLIT_SCREEN_TARGET = 16;

  REMOTE_ACTION_SHORTCUT = 17;

  APP_USAGE_SETTINGS = 18;

}



enum TipType {

quickstep/libs/sysui_shared.jar

−1.33 MiB (181 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file